From 0ea7c35912840fddbe98b5081a861a63643705f1 Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Mon, 14 Oct 2024 13:56:36 +0100 Subject: [PATCH 01/18] feat: Combine Social Web Archives to one single social.war - Meeds-io/MIPs#150 (#4114) Social Module has two Web Archives, social-extension.war and social-portlet.war. both Web Archives can be combined into a single one social.war which will be the main Spring context of Social Module and at the same time, used for extension configuration and the Web Archive to use for Portlet Definitions. The webapp module name has to be social.war in order to have clean URLs for REST Endpoints which will be implemented through Spring, with format /social/rest/ instead of /social-portlet/rest. --- ...xo.social.component.core-configuration.xml | 6 +- ...ial.component.core-local-configuration.xml | 4 +- .../portal/template/pages/space/page.xml | 2 +- .../template/pages/spaceHomePage/page.xml | 10 +- extension/pom.xml | 36 -- extension/war/pom.xml | 422 ------------------ .../ckeditor/attach-image-plugin.js | 1 - extension/war/src/main/webapp/WEB-INF/web.xml | 69 --- pom.xml | 31 +- webapp/{portlet => }/.eslintrc.json | 0 webapp/{portlet => }/package-lock.json | 4 +- webapp/{portlet => }/package.json | 2 +- webapp/pom.xml | 207 ++++++++- webapp/portlet/pom.xml | 151 ------- .../io/meeds/social/portlet/ImagePortlet.java | 0 .../io/meeds/social/portlet/LinkPortlet.java | 0 .../social/portlet/SpaceHeaderPortlet.java | 0 .../social/portlet/SpaceMenuPortlet.java | 0 .../template/Notification_ar.properties | 0 .../template/Notification_aro.properties | 0 .../template/Notification_az.properties | 0 .../template/Notification_ca.properties | 0 .../template/Notification_ceb.properties | 0 .../template/Notification_co.properties | 0 .../template/Notification_cs.properties | 0 .../template/Notification_de.properties | 0 .../template/Notification_el.properties | 0 .../template/Notification_en.properties | 0 .../template/Notification_es_ES.properties | 0 .../template/Notification_eu.properties | 0 .../template/Notification_fa.properties | 0 .../template/Notification_fi.properties | 0 .../template/Notification_fil.properties | 0 .../template/Notification_fr.properties | 0 .../template/Notification_he.properties | 0 .../template/Notification_hi.properties | 0 .../template/Notification_hu.properties | 0 .../template/Notification_id.properties | 0 .../template/Notification_in.properties | 0 .../template/Notification_it.properties | 0 .../template/Notification_ja.properties | 0 .../template/Notification_kab.properties | 0 .../template/Notification_ko.properties | 0 .../template/Notification_lt.properties | 0 .../template/Notification_ms.properties | 0 .../template/Notification_nl.properties | 0 .../template/Notification_no.properties | 0 .../template/Notification_pcm.properties | 0 .../template/Notification_pl.properties | 0 .../template/Notification_pt_BR.properties | 0 .../template/Notification_pt_PT.properties | 0 .../template/Notification_ro.properties | 0 .../template/Notification_ru.properties | 0 .../template/Notification_sk.properties | 0 .../template/Notification_sl.properties | 0 .../template/Notification_sq.properties | 0 .../template/Notification_sv_SE.properties | 0 .../template/Notification_th.properties | 0 .../template/Notification_tl.properties | 0 .../template/Notification_tr.properties | 0 .../template/Notification_uk.properties | 0 .../template/Notification_ur_IN.properties | 0 .../template/Notification_vi.properties | 0 .../template/Notification_zh_CN.properties | 0 .../template/Notification_zh_TW.properties | 0 .../locale/portal/HamburgerMenu_ar.properties | 0 .../portal/HamburgerMenu_aro.properties | 0 .../locale/portal/HamburgerMenu_az.properties | 0 .../locale/portal/HamburgerMenu_ca.properties | 0 .../portal/HamburgerMenu_ceb.properties | 0 .../locale/portal/HamburgerMenu_co.properties | 0 .../locale/portal/HamburgerMenu_cs.properties | 0 .../locale/portal/HamburgerMenu_de.properties | 0 .../locale/portal/HamburgerMenu_el.properties | 0 .../locale/portal/HamburgerMenu_en.properties | 0 .../portal/HamburgerMenu_es_ES.properties | 0 .../locale/portal/HamburgerMenu_eu.properties | 0 .../locale/portal/HamburgerMenu_fa.properties | 0 .../locale/portal/HamburgerMenu_fi.properties | 0 .../portal/HamburgerMenu_fil.properties | 0 .../locale/portal/HamburgerMenu_fr.properties | 0 .../locale/portal/HamburgerMenu_hi.properties | 0 .../locale/portal/HamburgerMenu_hu.properties | 0 .../locale/portal/HamburgerMenu_id.properties | 0 .../locale/portal/HamburgerMenu_in.properties | 0 .../locale/portal/HamburgerMenu_it.properties | 0 .../locale/portal/HamburgerMenu_ja.properties | 0 .../portal/HamburgerMenu_kab.properties | 0 .../locale/portal/HamburgerMenu_ko.properties | 0 .../locale/portal/HamburgerMenu_lt.properties | 0 .../locale/portal/HamburgerMenu_ms.properties | 0 .../locale/portal/HamburgerMenu_nl.properties | 0 .../locale/portal/HamburgerMenu_no.properties | 0 .../portal/HamburgerMenu_pcm.properties | 0 .../locale/portal/HamburgerMenu_pl.properties | 0 .../portal/HamburgerMenu_pt_BR.properties | 0 .../portal/HamburgerMenu_pt_PT.properties | 0 .../locale/portal/HamburgerMenu_ro.properties | 0 .../locale/portal/HamburgerMenu_ru.properties | 0 .../locale/portal/HamburgerMenu_sk.properties | 0 .../locale/portal/HamburgerMenu_sl.properties | 0 .../locale/portal/HamburgerMenu_sq.properties | 0 .../portal/HamburgerMenu_sv_SE.properties | 0 .../locale/portal/HamburgerMenu_th.properties | 0 .../locale/portal/HamburgerMenu_tl.properties | 0 .../locale/portal/HamburgerMenu_tr.properties | 0 .../locale/portal/HamburgerMenu_uk.properties | 0 .../portal/HamburgerMenu_ur_IN.properties | 0 .../locale/portal/HamburgerMenu_vi.properties | 0 .../portal/HamburgerMenu_zh_CN.properties | 0 .../portal/HamburgerMenu_zh_TW.properties | 0 .../resources/locale/portal_ar.properties | 0 .../resources/locale/portal_aro.properties | 0 .../resources/locale/portal_az.properties | 0 .../resources/locale/portal_ca.properties | 0 .../resources/locale/portal_ceb.properties | 0 .../resources/locale/portal_co.properties | 0 .../resources/locale/portal_cs.properties | 0 .../resources/locale/portal_de.properties | 0 .../resources/locale/portal_el.properties | 0 .../resources/locale/portal_en.properties | 0 .../resources/locale/portal_es_ES.properties | 0 .../resources/locale/portal_eu.properties | 0 .../resources/locale/portal_fa.properties | 0 .../resources/locale/portal_fi.properties | 0 .../resources/locale/portal_fil.properties | 0 .../resources/locale/portal_fr.properties | 0 .../resources/locale/portal_he.properties | 0 .../resources/locale/portal_hi.properties | 0 .../resources/locale/portal_hu.properties | 0 .../resources/locale/portal_id.properties | 0 .../resources/locale/portal_in.properties | 0 .../resources/locale/portal_it.properties | 0 .../resources/locale/portal_ja.properties | 0 .../resources/locale/portal_kab.properties | 0 .../resources/locale/portal_ko.properties | 0 .../resources/locale/portal_lt.properties | 0 .../resources/locale/portal_ms.properties | 0 .../resources/locale/portal_nl.properties | 0 .../resources/locale/portal_no.properties | 0 .../resources/locale/portal_pcm.properties | 0 .../resources/locale/portal_pl.properties | 0 .../resources/locale/portal_pt_BR.properties | 0 .../resources/locale/portal_pt_PT.properties | 0 .../resources/locale/portal_ro.properties | 0 .../resources/locale/portal_ru.properties | 0 .../resources/locale/portal_sk.properties | 0 .../resources/locale/portal_sl.properties | 0 .../resources/locale/portal_sq.properties | 0 .../resources/locale/portal_sv_SE.properties | 0 .../resources/locale/portal_th.properties | 0 .../resources/locale/portal_tl.properties | 0 .../resources/locale/portal_tr.properties | 0 .../resources/locale/portal_uk.properties | 0 .../resources/locale/portal_ur_IN.properties | 0 .../resources/locale/portal_vi.properties | 0 .../resources/locale/portal_zh_CN.properties | 0 .../resources/locale/portal_zh_TW.properties | 0 .../portlet/GeneralSettings_ar.properties | 0 .../portlet/GeneralSettings_aro.properties | 0 .../portlet/GeneralSettings_az.properties | 0 .../portlet/GeneralSettings_ca.properties | 0 .../portlet/GeneralSettings_ceb.properties | 0 .../portlet/GeneralSettings_co.properties | 0 .../portlet/GeneralSettings_cs.properties | 0 .../portlet/GeneralSettings_de.properties | 0 .../portlet/GeneralSettings_el.properties | 0 .../portlet/GeneralSettings_en.properties | 0 .../portlet/GeneralSettings_es_ES.properties | 0 .../portlet/GeneralSettings_eu.properties | 0 .../portlet/GeneralSettings_fa.properties | 0 .../portlet/GeneralSettings_fi.properties | 0 .../portlet/GeneralSettings_fil.properties | 0 .../portlet/GeneralSettings_fr.properties | 0 .../portlet/GeneralSettings_hi.properties | 0 .../portlet/GeneralSettings_hu.properties | 0 .../portlet/GeneralSettings_id.properties | 0 .../portlet/GeneralSettings_in.properties | 0 .../portlet/GeneralSettings_it.properties | 0 .../portlet/GeneralSettings_ja.properties | 0 .../portlet/GeneralSettings_ko.properties | 0 .../portlet/GeneralSettings_lt.properties | 0 .../portlet/GeneralSettings_ms.properties | 0 .../portlet/GeneralSettings_nl.properties | 0 .../portlet/GeneralSettings_no.properties | 0 .../portlet/GeneralSettings_pcm.properties | 0 .../portlet/GeneralSettings_pl.properties | 0 .../portlet/GeneralSettings_pt_BR.properties | 0 .../portlet/GeneralSettings_pt_PT.properties | 0 .../portlet/GeneralSettings_ro.properties | 0 .../portlet/GeneralSettings_ru.properties | 0 .../portlet/GeneralSettings_sk.properties | 0 .../portlet/GeneralSettings_sl.properties | 0 .../portlet/GeneralSettings_sq.properties | 0 .../portlet/GeneralSettings_sv_SE.properties | 0 .../portlet/GeneralSettings_th.properties | 0 .../portlet/GeneralSettings_tl.properties | 0 .../portlet/GeneralSettings_tr.properties | 0 .../portlet/GeneralSettings_uk.properties | 0 .../portlet/GeneralSettings_ur_IN.properties | 0 .../portlet/GeneralSettings_vi.properties | 0 .../portlet/GeneralSettings_zh_CN.properties | 0 .../portlet/GeneralSettings_zh_TW.properties | 0 .../locale/portlet/Image_ar.properties | 0 .../locale/portlet/Image_aro.properties | 0 .../locale/portlet/Image_az.properties | 0 .../locale/portlet/Image_ca.properties | 0 .../locale/portlet/Image_ceb.properties | 0 .../locale/portlet/Image_co.properties | 0 .../locale/portlet/Image_cs.properties | 0 .../locale/portlet/Image_de.properties | 0 .../locale/portlet/Image_el.properties | 0 .../locale/portlet/Image_en.properties | 0 .../locale/portlet/Image_es_ES.properties | 0 .../locale/portlet/Image_eu.properties | 0 .../locale/portlet/Image_fa.properties | 0 .../locale/portlet/Image_fi.properties | 0 .../locale/portlet/Image_fil.properties | 0 .../locale/portlet/Image_fr.properties | 0 .../locale/portlet/Image_hi.properties | 0 .../locale/portlet/Image_hu.properties | 0 .../locale/portlet/Image_id.properties | 0 .../locale/portlet/Image_it.properties | 0 .../locale/portlet/Image_ja.properties | 0 .../locale/portlet/Image_ko.properties | 0 .../locale/portlet/Image_lt.properties | 0 .../locale/portlet/Image_ms.properties | 0 .../locale/portlet/Image_nl.properties | 0 .../locale/portlet/Image_no.properties | 0 .../locale/portlet/Image_pcm.properties | 0 .../locale/portlet/Image_pl.properties | 0 .../locale/portlet/Image_pt_BR.properties | 0 .../locale/portlet/Image_pt_PT.properties | 0 .../locale/portlet/Image_ro.properties | 0 .../locale/portlet/Image_ru.properties | 0 .../locale/portlet/Image_sk.properties | 0 .../locale/portlet/Image_sl.properties | 0 .../locale/portlet/Image_sq.properties | 0 .../locale/portlet/Image_sv_SE.properties | 0 .../locale/portlet/Image_th.properties | 0 .../locale/portlet/Image_tl.properties | 0 .../locale/portlet/Image_tr.properties | 0 .../locale/portlet/Image_uk.properties | 0 .../locale/portlet/Image_ur_IN.properties | 0 .../locale/portlet/Image_vi.properties | 0 .../locale/portlet/Image_zh_CN.properties | 0 .../locale/portlet/Image_zh_TW.properties | 0 .../locale/portlet/Links_ar.properties | 0 .../locale/portlet/Links_aro.properties | 0 .../locale/portlet/Links_az.properties | 0 .../locale/portlet/Links_ca.properties | 0 .../locale/portlet/Links_ceb.properties | 0 .../locale/portlet/Links_co.properties | 0 .../locale/portlet/Links_cs.properties | 0 .../locale/portlet/Links_de.properties | 0 .../locale/portlet/Links_el.properties | 0 .../locale/portlet/Links_en.properties | 0 .../locale/portlet/Links_es_ES.properties | 0 .../locale/portlet/Links_eu.properties | 0 .../locale/portlet/Links_fa.properties | 0 .../locale/portlet/Links_fi.properties | 0 .../locale/portlet/Links_fil.properties | 0 .../locale/portlet/Links_fr.properties | 0 .../locale/portlet/Links_hi.properties | 0 .../locale/portlet/Links_hu.properties | 0 .../locale/portlet/Links_id.properties | 0 .../locale/portlet/Links_in.properties | 0 .../locale/portlet/Links_it.properties | 0 .../locale/portlet/Links_ja.properties | 0 .../locale/portlet/Links_ko.properties | 0 .../locale/portlet/Links_lt.properties | 0 .../locale/portlet/Links_ms.properties | 0 .../locale/portlet/Links_nl.properties | 0 .../locale/portlet/Links_no.properties | 0 .../locale/portlet/Links_pcm.properties | 0 .../locale/portlet/Links_pl.properties | 0 .../locale/portlet/Links_pt_BR.properties | 0 .../locale/portlet/Links_pt_PT.properties | 0 .../locale/portlet/Links_ro.properties | 0 .../locale/portlet/Links_ru.properties | 0 .../locale/portlet/Links_sk.properties | 0 .../locale/portlet/Links_sl.properties | 0 .../locale/portlet/Links_sq.properties | 0 .../locale/portlet/Links_sv_SE.properties | 0 .../locale/portlet/Links_th.properties | 0 .../locale/portlet/Links_tl.properties | 0 .../locale/portlet/Links_tr.properties | 0 .../locale/portlet/Links_uk.properties | 0 .../locale/portlet/Links_ur_IN.properties | 0 .../locale/portlet/Links_vi.properties | 0 .../locale/portlet/Links_zh_CN.properties | 0 .../locale/portlet/Links_zh_TW.properties | 0 .../locale/portlet/Login_ar.properties | 0 .../locale/portlet/Login_aro.properties | 0 .../locale/portlet/Login_az.properties | 0 .../locale/portlet/Login_ca.properties | 0 .../locale/portlet/Login_ceb.properties | 0 .../locale/portlet/Login_co.properties | 0 .../locale/portlet/Login_cs.properties | 0 .../locale/portlet/Login_de.properties | 0 .../locale/portlet/Login_el.properties | 0 .../locale/portlet/Login_en.properties | 0 .../locale/portlet/Login_es_ES.properties | 0 .../locale/portlet/Login_eu.properties | 0 .../locale/portlet/Login_fa.properties | 0 .../locale/portlet/Login_fi.properties | 0 .../locale/portlet/Login_fil.properties | 0 .../locale/portlet/Login_fr.properties | 0 .../locale/portlet/Login_hi.properties | 0 .../locale/portlet/Login_hu.properties | 0 .../locale/portlet/Login_id.properties | 0 .../locale/portlet/Login_in.properties | 0 .../locale/portlet/Login_it.properties | 0 .../locale/portlet/Login_ja.properties | 0 .../locale/portlet/Login_ko.properties | 0 .../locale/portlet/Login_lt.properties | 0 .../locale/portlet/Login_ms.properties | 0 .../locale/portlet/Login_nl.properties | 0 .../locale/portlet/Login_no.properties | 0 .../locale/portlet/Login_pcm.properties | 0 .../locale/portlet/Login_pl.properties | 0 .../locale/portlet/Login_pt_BR.properties | 0 .../locale/portlet/Login_pt_PT.properties | 0 .../locale/portlet/Login_ro.properties | 0 .../locale/portlet/Login_ru.properties | 0 .../locale/portlet/Login_sk.properties | 0 .../locale/portlet/Login_sl.properties | 0 .../locale/portlet/Login_sq.properties | 0 .../locale/portlet/Login_sv_SE.properties | 0 .../locale/portlet/Login_th.properties | 0 .../locale/portlet/Login_tl.properties | 0 .../locale/portlet/Login_tr.properties | 0 .../locale/portlet/Login_uk.properties | 0 .../locale/portlet/Login_ur_IN.properties | 0 .../locale/portlet/Login_vi.properties | 0 .../locale/portlet/Login_zh_CN.properties | 0 .../locale/portlet/Login_zh_TW.properties | 0 .../NotificationAdministration_ar.properties | 0 .../NotificationAdministration_aro.properties | 0 .../NotificationAdministration_az.properties | 0 .../NotificationAdministration_ca.properties | 0 .../NotificationAdministration_ceb.properties | 0 .../NotificationAdministration_co.properties | 0 .../NotificationAdministration_cs.properties | 0 .../NotificationAdministration_de.properties | 0 .../NotificationAdministration_el.properties | 0 .../NotificationAdministration_en.properties | 0 ...otificationAdministration_es_ES.properties | 0 .../NotificationAdministration_eu.properties | 0 .../NotificationAdministration_fa.properties | 0 .../NotificationAdministration_fi.properties | 0 .../NotificationAdministration_fil.properties | 0 .../NotificationAdministration_fr.properties | 0 .../NotificationAdministration_hi.properties | 0 .../NotificationAdministration_hu.properties | 0 .../NotificationAdministration_id.properties | 0 .../NotificationAdministration_in.properties | 0 .../NotificationAdministration_it.properties | 0 .../NotificationAdministration_ja.properties | 0 .../NotificationAdministration_ko.properties | 0 .../NotificationAdministration_lt.properties | 0 .../NotificationAdministration_ms.properties | 0 .../NotificationAdministration_nl.properties | 0 .../NotificationAdministration_no.properties | 0 .../NotificationAdministration_pcm.properties | 0 .../NotificationAdministration_pl.properties | 0 ...otificationAdministration_pt_BR.properties | 0 ...otificationAdministration_pt_PT.properties | 0 .../NotificationAdministration_ro.properties | 0 .../NotificationAdministration_ru.properties | 0 .../NotificationAdministration_sk.properties | 0 .../NotificationAdministration_sl.properties | 0 .../NotificationAdministration_sq.properties | 0 ...otificationAdministration_sv_SE.properties | 0 .../NotificationAdministration_th.properties | 0 .../NotificationAdministration_tl.properties | 0 .../NotificationAdministration_tr.properties | 0 .../NotificationAdministration_uk.properties | 0 ...otificationAdministration_ur_IN.properties | 0 .../NotificationAdministration_vi.properties | 0 ...otificationAdministration_zh_CN.properties | 0 ...otificationAdministration_zh_TW.properties | 0 .../portlet/PlatformSettings_ar.properties | 0 .../portlet/PlatformSettings_aro.properties | 0 .../portlet/PlatformSettings_az.properties | 0 .../portlet/PlatformSettings_ca.properties | 0 .../portlet/PlatformSettings_ceb.properties | 0 .../portlet/PlatformSettings_co.properties | 0 .../portlet/PlatformSettings_cs.properties | 0 .../portlet/PlatformSettings_de.properties | 0 .../portlet/PlatformSettings_el.properties | 0 .../portlet/PlatformSettings_en.properties | 0 .../portlet/PlatformSettings_es_ES.properties | 0 .../portlet/PlatformSettings_eu.properties | 0 .../portlet/PlatformSettings_fa.properties | 0 .../portlet/PlatformSettings_fi.properties | 0 .../portlet/PlatformSettings_fil.properties | 0 .../portlet/PlatformSettings_fr.properties | 0 .../portlet/PlatformSettings_hi.properties | 0 .../portlet/PlatformSettings_hu.properties | 0 .../portlet/PlatformSettings_id.properties | 0 .../portlet/PlatformSettings_it.properties | 0 .../portlet/PlatformSettings_ja.properties | 0 .../portlet/PlatformSettings_ko.properties | 0 .../portlet/PlatformSettings_lt.properties | 0 .../portlet/PlatformSettings_ms.properties | 0 .../portlet/PlatformSettings_nl.properties | 0 .../portlet/PlatformSettings_no.properties | 0 .../portlet/PlatformSettings_pcm.properties | 0 .../portlet/PlatformSettings_pl.properties | 0 .../portlet/PlatformSettings_pt_BR.properties | 0 .../portlet/PlatformSettings_pt_PT.properties | 0 .../portlet/PlatformSettings_ro.properties | 0 .../portlet/PlatformSettings_ru.properties | 0 .../portlet/PlatformSettings_sk.properties | 0 .../portlet/PlatformSettings_sl.properties | 0 .../portlet/PlatformSettings_sq.properties | 0 .../portlet/PlatformSettings_sv_SE.properties | 0 .../portlet/PlatformSettings_th.properties | 0 .../portlet/PlatformSettings_tl.properties | 0 .../portlet/PlatformSettings_tr.properties | 0 .../portlet/PlatformSettings_uk.properties | 0 .../portlet/PlatformSettings_ur_IN.properties | 0 .../portlet/PlatformSettings_vi.properties | 0 .../portlet/PlatformSettings_zh_CN.properties | 0 .../portlet/PlatformSettings_zh_TW.properties | 0 .../locale/portlet/Portlets_ar.properties | 0 .../locale/portlet/Portlets_aro.properties | 0 .../locale/portlet/Portlets_az.properties | 0 .../locale/portlet/Portlets_ca.properties | 0 .../locale/portlet/Portlets_ceb.properties | 0 .../locale/portlet/Portlets_co.properties | 0 .../locale/portlet/Portlets_cs.properties | 0 .../locale/portlet/Portlets_de.properties | 0 .../locale/portlet/Portlets_el.properties | 0 .../locale/portlet/Portlets_en.properties | 0 .../locale/portlet/Portlets_es_ES.properties | 0 .../locale/portlet/Portlets_eu.properties | 0 .../locale/portlet/Portlets_fa.properties | 0 .../locale/portlet/Portlets_fi.properties | 0 .../locale/portlet/Portlets_fil.properties | 0 .../locale/portlet/Portlets_fr.properties | 0 .../locale/portlet/Portlets_he.properties | 0 .../locale/portlet/Portlets_hi.properties | 0 .../locale/portlet/Portlets_hu.properties | 0 .../locale/portlet/Portlets_id.properties | 0 .../locale/portlet/Portlets_in.properties | 0 .../locale/portlet/Portlets_it.properties | 0 .../locale/portlet/Portlets_ja.properties | 0 .../locale/portlet/Portlets_kab.properties | 0 .../locale/portlet/Portlets_ko.properties | 0 .../locale/portlet/Portlets_lt.properties | 0 .../locale/portlet/Portlets_ms.properties | 0 .../locale/portlet/Portlets_nl.properties | 0 .../locale/portlet/Portlets_no.properties | 0 .../locale/portlet/Portlets_pcm.properties | 0 .../locale/portlet/Portlets_pl.properties | 0 .../locale/portlet/Portlets_pt_BR.properties | 0 .../locale/portlet/Portlets_pt_PT.properties | 0 .../locale/portlet/Portlets_ro.properties | 0 .../locale/portlet/Portlets_ru.properties | 0 .../locale/portlet/Portlets_sk.properties | 0 .../locale/portlet/Portlets_sl.properties | 0 .../locale/portlet/Portlets_sq.properties | 0 .../locale/portlet/Portlets_sv_SE.properties | 0 .../locale/portlet/Portlets_th.properties | 0 .../locale/portlet/Portlets_tl.properties | 0 .../locale/portlet/Portlets_tr.properties | 0 .../locale/portlet/Portlets_uk.properties | 0 .../locale/portlet/Portlets_ur_IN.properties | 0 .../locale/portlet/Portlets_vi.properties | 0 .../locale/portlet/Portlets_zh_CN.properties | 0 .../locale/portlet/Portlets_zh_TW.properties | 0 .../UserNotificationPortlet_ar.properties | 0 .../UserNotificationPortlet_aro.properties | 0 .../UserNotificationPortlet_az.properties | 0 .../UserNotificationPortlet_ca.properties | 0 .../UserNotificationPortlet_ceb.properties | 0 .../UserNotificationPortlet_co.properties | 0 .../UserNotificationPortlet_cs.properties | 0 .../UserNotificationPortlet_de.properties | 0 .../UserNotificationPortlet_el.properties | 0 .../UserNotificationPortlet_en.properties | 0 .../UserNotificationPortlet_es_ES.properties | 0 .../UserNotificationPortlet_eu.properties | 0 .../UserNotificationPortlet_fa.properties | 0 .../UserNotificationPortlet_fi.properties | 0 .../UserNotificationPortlet_fil.properties | 0 .../UserNotificationPortlet_fr.properties | 0 .../UserNotificationPortlet_hi.properties | 0 .../UserNotificationPortlet_hu.properties | 0 .../UserNotificationPortlet_id.properties | 0 .../UserNotificationPortlet_in.properties | 0 .../UserNotificationPortlet_it.properties | 0 .../UserNotificationPortlet_ja.properties | 0 .../UserNotificationPortlet_ko.properties | 0 .../UserNotificationPortlet_lt.properties | 0 .../UserNotificationPortlet_ms.properties | 0 .../UserNotificationPortlet_nl.properties | 0 .../UserNotificationPortlet_no.properties | 0 .../UserNotificationPortlet_pcm.properties | 0 .../UserNotificationPortlet_pl.properties | 0 .../UserNotificationPortlet_pt_BR.properties | 0 .../UserNotificationPortlet_pt_PT.properties | 0 .../UserNotificationPortlet_ro.properties | 0 .../UserNotificationPortlet_ru.properties | 0 .../UserNotificationPortlet_sk.properties | 0 .../UserNotificationPortlet_sl.properties | 0 .../UserNotificationPortlet_sq.properties | 0 .../UserNotificationPortlet_sv_SE.properties | 0 .../UserNotificationPortlet_th.properties | 0 .../UserNotificationPortlet_tl.properties | 0 .../UserNotificationPortlet_tr.properties | 0 .../UserNotificationPortlet_uk.properties | 0 .../UserNotificationPortlet_ur_IN.properties | 0 .../UserNotificationPortlet_vi.properties | 0 .../UserNotificationPortlet_zh_CN.properties | 0 .../UserNotificationPortlet_zh_TW.properties | 0 .../social/ComplementaryFilter_ar.properties | 0 .../social/ComplementaryFilter_aro.properties | 0 .../social/ComplementaryFilter_az.properties | 0 .../social/ComplementaryFilter_ca.properties | 0 .../social/ComplementaryFilter_ceb.properties | 0 .../social/ComplementaryFilter_co.properties | 0 .../social/ComplementaryFilter_cs.properties | 0 .../social/ComplementaryFilter_de.properties | 0 .../social/ComplementaryFilter_el.properties | 0 .../social/ComplementaryFilter_en.properties | 0 .../ComplementaryFilter_es_ES.properties | 0 .../social/ComplementaryFilter_eu.properties | 0 .../social/ComplementaryFilter_fa.properties | 0 .../social/ComplementaryFilter_fi.properties | 0 .../social/ComplementaryFilter_fil.properties | 0 .../social/ComplementaryFilter_fr.properties | 0 .../social/ComplementaryFilter_hi.properties | 0 .../social/ComplementaryFilter_hu.properties | 0 .../social/ComplementaryFilter_id.properties | 0 .../social/ComplementaryFilter_it.properties | 0 .../social/ComplementaryFilter_ja.properties | 0 .../social/ComplementaryFilter_ko.properties | 0 .../social/ComplementaryFilter_lt.properties | 0 .../social/ComplementaryFilter_ms.properties | 0 .../social/ComplementaryFilter_nl.properties | 0 .../social/ComplementaryFilter_no.properties | 0 .../social/ComplementaryFilter_pcm.properties | 0 .../social/ComplementaryFilter_pl.properties | 0 .../ComplementaryFilter_pt_BR.properties | 0 .../ComplementaryFilter_pt_PT.properties | 0 .../social/ComplementaryFilter_ro.properties | 0 .../social/ComplementaryFilter_ru.properties | 0 .../social/ComplementaryFilter_sk.properties | 0 .../social/ComplementaryFilter_sl.properties | 0 .../social/ComplementaryFilter_sq.properties | 0 .../ComplementaryFilter_sv_SE.properties | 0 .../social/ComplementaryFilter_th.properties | 0 .../social/ComplementaryFilter_tl.properties | 0 .../social/ComplementaryFilter_tr.properties | 0 .../social/ComplementaryFilter_uk.properties | 0 .../ComplementaryFilter_ur_IN.properties | 0 .../social/ComplementaryFilter_vi.properties | 0 .../ComplementaryFilter_zh_CN.properties | 0 .../ComplementaryFilter_zh_TW.properties | 0 ...xternalSpacesListApplication_ar.properties | 0 ...ternalSpacesListApplication_aro.properties | 0 ...xternalSpacesListApplication_az.properties | 0 ...xternalSpacesListApplication_ca.properties | 0 ...ternalSpacesListApplication_ceb.properties | 0 ...xternalSpacesListApplication_co.properties | 0 ...xternalSpacesListApplication_cs.properties | 0 ...xternalSpacesListApplication_de.properties | 0 ...xternalSpacesListApplication_el.properties | 0 ...xternalSpacesListApplication_en.properties | 0 ...rnalSpacesListApplication_es_ES.properties | 0 ...xternalSpacesListApplication_eu.properties | 0 ...xternalSpacesListApplication_fa.properties | 0 ...xternalSpacesListApplication_fi.properties | 0 ...ternalSpacesListApplication_fil.properties | 0 ...xternalSpacesListApplication_fr.properties | 0 ...xternalSpacesListApplication_hi.properties | 0 ...xternalSpacesListApplication_hu.properties | 0 ...xternalSpacesListApplication_id.properties | 0 ...xternalSpacesListApplication_in.properties | 0 ...xternalSpacesListApplication_it.properties | 0 ...xternalSpacesListApplication_ja.properties | 0 ...ternalSpacesListApplication_kab.properties | 0 ...xternalSpacesListApplication_ko.properties | 0 ...xternalSpacesListApplication_lt.properties | 0 ...xternalSpacesListApplication_ms.properties | 0 ...xternalSpacesListApplication_nl.properties | 0 ...xternalSpacesListApplication_no.properties | 0 ...ternalSpacesListApplication_pcm.properties | 0 ...xternalSpacesListApplication_pl.properties | 0 ...rnalSpacesListApplication_pt_BR.properties | 0 ...rnalSpacesListApplication_pt_PT.properties | 0 ...xternalSpacesListApplication_ro.properties | 0 ...xternalSpacesListApplication_ru.properties | 0 ...xternalSpacesListApplication_sk.properties | 0 ...xternalSpacesListApplication_sl.properties | 0 ...xternalSpacesListApplication_sq.properties | 0 ...rnalSpacesListApplication_sv_SE.properties | 0 ...xternalSpacesListApplication_th.properties | 0 ...xternalSpacesListApplication_tl.properties | 0 ...xternalSpacesListApplication_tr.properties | 0 ...xternalSpacesListApplication_uk.properties | 0 ...rnalSpacesListApplication_ur_IN.properties | 0 ...xternalSpacesListApplication_vi.properties | 0 ...rnalSpacesListApplication_zh_CN.properties | 0 ...rnalSpacesListApplication_zh_TW.properties | 0 .../GettingStartedPortlet_ar.properties | 0 .../GettingStartedPortlet_aro.properties | 0 .../GettingStartedPortlet_az.properties | 0 .../GettingStartedPortlet_ca.properties | 0 .../GettingStartedPortlet_ceb.properties | 0 .../GettingStartedPortlet_co.properties | 0 .../GettingStartedPortlet_cs.properties | 0 .../GettingStartedPortlet_de.properties | 0 .../GettingStartedPortlet_el.properties | 0 .../GettingStartedPortlet_en.properties | 0 .../GettingStartedPortlet_es_ES.properties | 0 .../GettingStartedPortlet_eu.properties | 0 .../GettingStartedPortlet_fa.properties | 0 .../GettingStartedPortlet_fi.properties | 0 .../GettingStartedPortlet_fil.properties | 0 .../GettingStartedPortlet_fr.properties | 0 .../GettingStartedPortlet_hi.properties | 0 .../GettingStartedPortlet_hu.properties | 0 .../GettingStartedPortlet_id.properties | 0 .../GettingStartedPortlet_in.properties | 0 .../GettingStartedPortlet_it.properties | 0 .../GettingStartedPortlet_ja.properties | 0 .../GettingStartedPortlet_kab.properties | 0 .../GettingStartedPortlet_ko.properties | 0 .../GettingStartedPortlet_lt.properties | 0 .../GettingStartedPortlet_ms.properties | 0 .../GettingStartedPortlet_nl.properties | 0 .../GettingStartedPortlet_no.properties | 0 .../GettingStartedPortlet_pcm.properties | 0 .../GettingStartedPortlet_pl.properties | 0 .../GettingStartedPortlet_pt_BR.properties | 0 .../GettingStartedPortlet_pt_PT.properties | 0 .../GettingStartedPortlet_ro.properties | 0 .../GettingStartedPortlet_ru.properties | 0 .../GettingStartedPortlet_sk.properties | 0 .../GettingStartedPortlet_sl.properties | 0 .../GettingStartedPortlet_sq.properties | 0 .../GettingStartedPortlet_sv_SE.properties | 0 .../GettingStartedPortlet_th.properties | 0 .../GettingStartedPortlet_tl.properties | 0 .../GettingStartedPortlet_tr.properties | 0 .../GettingStartedPortlet_uk.properties | 0 .../GettingStartedPortlet_ur_IN.properties | 0 .../GettingStartedPortlet_vi.properties | 0 .../GettingStartedPortlet_zh_CN.properties | 0 .../GettingStartedPortlet_zh_TW.properties | 0 .../PeopleListApplication_ar.properties | 0 .../PeopleListApplication_aro.properties | 0 .../PeopleListApplication_az.properties | 0 .../PeopleListApplication_ca.properties | 0 .../PeopleListApplication_ceb.properties | 0 .../PeopleListApplication_co.properties | 0 .../PeopleListApplication_cs.properties | 0 .../PeopleListApplication_de.properties | 0 .../PeopleListApplication_el.properties | 0 .../PeopleListApplication_en.properties | 0 .../PeopleListApplication_es_ES.properties | 0 .../PeopleListApplication_eu.properties | 0 .../PeopleListApplication_fa.properties | 0 .../PeopleListApplication_fi.properties | 0 .../PeopleListApplication_fil.properties | 0 .../PeopleListApplication_fr.properties | 0 .../PeopleListApplication_hi.properties | 0 .../PeopleListApplication_hu.properties | 0 .../PeopleListApplication_id.properties | 0 .../PeopleListApplication_in.properties | 0 .../PeopleListApplication_it.properties | 0 .../PeopleListApplication_ja.properties | 0 .../PeopleListApplication_kab.properties | 0 .../PeopleListApplication_ko.properties | 0 .../PeopleListApplication_lt.properties | 0 .../PeopleListApplication_ms.properties | 0 .../PeopleListApplication_nl.properties | 0 .../PeopleListApplication_no.properties | 0 .../PeopleListApplication_pcm.properties | 0 .../PeopleListApplication_pl.properties | 0 .../PeopleListApplication_pt_BR.properties | 0 .../PeopleListApplication_pt_PT.properties | 0 .../PeopleListApplication_ro.properties | 0 .../PeopleListApplication_ru.properties | 0 .../PeopleListApplication_sk.properties | 0 .../PeopleListApplication_sl.properties | 0 .../PeopleListApplication_sq.properties | 0 .../PeopleListApplication_sv_SE.properties | 0 .../PeopleListApplication_th.properties | 0 .../PeopleListApplication_tl.properties | 0 .../PeopleListApplication_tr.properties | 0 .../PeopleListApplication_uk.properties | 0 .../PeopleListApplication_ur_IN.properties | 0 .../PeopleListApplication_vi.properties | 0 .../PeopleListApplication_zh_CN.properties | 0 .../PeopleListApplication_zh_TW.properties | 0 .../social/PeopleOverview_ar.properties | 0 .../social/PeopleOverview_aro.properties | 0 .../social/PeopleOverview_az.properties | 0 .../social/PeopleOverview_ca.properties | 0 .../social/PeopleOverview_ceb.properties | 0 .../social/PeopleOverview_co.properties | 0 .../social/PeopleOverview_cs.properties | 0 .../social/PeopleOverview_de.properties | 0 .../social/PeopleOverview_el.properties | 0 .../social/PeopleOverview_en.properties | 0 .../social/PeopleOverview_es_ES.properties | 0 .../social/PeopleOverview_eu.properties | 0 .../social/PeopleOverview_fa.properties | 0 .../social/PeopleOverview_fi.properties | 0 .../social/PeopleOverview_fil.properties | 0 .../social/PeopleOverview_fr.properties | 0 .../social/PeopleOverview_hi.properties | 0 .../social/PeopleOverview_hu.properties | 0 .../social/PeopleOverview_id.properties | 0 .../social/PeopleOverview_in.properties | 0 .../social/PeopleOverview_it.properties | 0 .../social/PeopleOverview_ja.properties | 0 .../social/PeopleOverview_kab.properties | 0 .../social/PeopleOverview_ko.properties | 0 .../social/PeopleOverview_lt.properties | 0 .../social/PeopleOverview_ms.properties | 0 .../social/PeopleOverview_nl.properties | 0 .../social/PeopleOverview_no.properties | 0 .../social/PeopleOverview_pcm.properties | 0 .../social/PeopleOverview_pl.properties | 0 .../social/PeopleOverview_pt_BR.properties | 0 .../social/PeopleOverview_pt_PT.properties | 0 .../social/PeopleOverview_ro.properties | 0 .../social/PeopleOverview_ru.properties | 0 .../social/PeopleOverview_sk.properties | 0 .../social/PeopleOverview_sl.properties | 0 .../social/PeopleOverview_sq.properties | 0 .../social/PeopleOverview_sv_SE.properties | 0 .../social/PeopleOverview_th.properties | 0 .../social/PeopleOverview_tl.properties | 0 .../social/PeopleOverview_tr.properties | 0 .../social/PeopleOverview_uk.properties | 0 .../social/PeopleOverview_ur_IN.properties | 0 .../social/PeopleOverview_vi.properties | 0 .../social/PeopleOverview_zh_CN.properties | 0 .../social/PeopleOverview_zh_TW.properties | 0 .../social/ProfileAboutMe_ar.properties | 0 .../social/ProfileAboutMe_aro.properties | 0 .../social/ProfileAboutMe_az.properties | 0 .../social/ProfileAboutMe_ca.properties | 0 .../social/ProfileAboutMe_ceb.properties | 0 .../social/ProfileAboutMe_co.properties | 0 .../social/ProfileAboutMe_cs.properties | 0 .../social/ProfileAboutMe_de.properties | 0 .../social/ProfileAboutMe_el.properties | 0 .../social/ProfileAboutMe_en.properties | 0 .../social/ProfileAboutMe_es_ES.properties | 0 .../social/ProfileAboutMe_eu.properties | 0 .../social/ProfileAboutMe_fa.properties | 0 .../social/ProfileAboutMe_fi.properties | 0 .../social/ProfileAboutMe_fil.properties | 0 .../social/ProfileAboutMe_fr.properties | 0 .../social/ProfileAboutMe_hi.properties | 0 .../social/ProfileAboutMe_hu.properties | 0 .../social/ProfileAboutMe_id.properties | 0 .../social/ProfileAboutMe_in.properties | 0 .../social/ProfileAboutMe_it.properties | 0 .../social/ProfileAboutMe_ja.properties | 0 .../social/ProfileAboutMe_kab.properties | 0 .../social/ProfileAboutMe_ko.properties | 0 .../social/ProfileAboutMe_lt.properties | 0 .../social/ProfileAboutMe_ms.properties | 0 .../social/ProfileAboutMe_nl.properties | 0 .../social/ProfileAboutMe_no.properties | 0 .../social/ProfileAboutMe_pcm.properties | 0 .../social/ProfileAboutMe_pl.properties | 0 .../social/ProfileAboutMe_pt_BR.properties | 0 .../social/ProfileAboutMe_pt_PT.properties | 0 .../social/ProfileAboutMe_ro.properties | 0 .../social/ProfileAboutMe_ru.properties | 0 .../social/ProfileAboutMe_sk.properties | 0 .../social/ProfileAboutMe_sl.properties | 0 .../social/ProfileAboutMe_sq.properties | 0 .../social/ProfileAboutMe_sv_SE.properties | 0 .../social/ProfileAboutMe_th.properties | 0 .../social/ProfileAboutMe_tl.properties | 0 .../social/ProfileAboutMe_tr.properties | 0 .../social/ProfileAboutMe_uk.properties | 0 .../social/ProfileAboutMe_ur_IN.properties | 0 .../social/ProfileAboutMe_vi.properties | 0 .../social/ProfileAboutMe_zh_CN.properties | 0 .../social/ProfileAboutMe_zh_TW.properties | 0 .../ProfileContactInformation_ar.properties | 0 .../ProfileContactInformation_aro.properties | 0 .../ProfileContactInformation_az.properties | 0 .../ProfileContactInformation_ca.properties | 0 .../ProfileContactInformation_ceb.properties | 0 .../ProfileContactInformation_co.properties | 0 .../ProfileContactInformation_cs.properties | 0 .../ProfileContactInformation_de.properties | 0 .../ProfileContactInformation_el.properties | 0 .../ProfileContactInformation_en.properties | 0 ...ProfileContactInformation_es_ES.properties | 0 .../ProfileContactInformation_eu.properties | 0 .../ProfileContactInformation_fa.properties | 0 .../ProfileContactInformation_fi.properties | 0 .../ProfileContactInformation_fil.properties | 0 .../ProfileContactInformation_fr.properties | 0 .../ProfileContactInformation_hi.properties | 0 .../ProfileContactInformation_hu.properties | 0 .../ProfileContactInformation_id.properties | 0 .../ProfileContactInformation_in.properties | 0 .../ProfileContactInformation_it.properties | 0 .../ProfileContactInformation_ja.properties | 0 .../ProfileContactInformation_kab.properties | 0 .../ProfileContactInformation_ko.properties | 0 .../ProfileContactInformation_lt.properties | 0 .../ProfileContactInformation_ms.properties | 0 .../ProfileContactInformation_nl.properties | 0 .../ProfileContactInformation_no.properties | 0 .../ProfileContactInformation_pcm.properties | 0 .../ProfileContactInformation_pl.properties | 0 ...ProfileContactInformation_pt_BR.properties | 0 ...ProfileContactInformation_pt_PT.properties | 0 .../ProfileContactInformation_ro.properties | 0 .../ProfileContactInformation_ru.properties | 0 .../ProfileContactInformation_sk.properties | 0 .../ProfileContactInformation_sl.properties | 0 .../ProfileContactInformation_sq.properties | 0 ...ProfileContactInformation_sv_SE.properties | 0 .../ProfileContactInformation_th.properties | 0 .../ProfileContactInformation_tl.properties | 0 .../ProfileContactInformation_tr.properties | 0 .../ProfileContactInformation_uk.properties | 0 ...ProfileContactInformation_ur_IN.properties | 0 .../ProfileContactInformation_vi.properties | 0 ...ProfileContactInformation_zh_CN.properties | 0 ...ProfileContactInformation_zh_TW.properties | 0 .../social/ProfileHeader_ar.properties | 0 .../social/ProfileHeader_aro.properties | 0 .../social/ProfileHeader_az.properties | 0 .../social/ProfileHeader_ca.properties | 0 .../social/ProfileHeader_ceb.properties | 0 .../social/ProfileHeader_co.properties | 0 .../social/ProfileHeader_cs.properties | 0 .../social/ProfileHeader_de.properties | 0 .../social/ProfileHeader_el.properties | 0 .../social/ProfileHeader_en.properties | 0 .../social/ProfileHeader_es_ES.properties | 0 .../social/ProfileHeader_eu.properties | 0 .../social/ProfileHeader_fa.properties | 0 .../social/ProfileHeader_fi.properties | 0 .../social/ProfileHeader_fil.properties | 0 .../social/ProfileHeader_fr.properties | 0 .../social/ProfileHeader_hi.properties | 0 .../social/ProfileHeader_hu.properties | 0 .../social/ProfileHeader_id.properties | 0 .../social/ProfileHeader_in.properties | 0 .../social/ProfileHeader_it.properties | 0 .../social/ProfileHeader_ja.properties | 0 .../social/ProfileHeader_kab.properties | 0 .../social/ProfileHeader_ko.properties | 0 .../social/ProfileHeader_lt.properties | 0 .../social/ProfileHeader_ms.properties | 0 .../social/ProfileHeader_nl.properties | 0 .../social/ProfileHeader_no.properties | 0 .../social/ProfileHeader_pcm.properties | 0 .../social/ProfileHeader_pl.properties | 0 .../social/ProfileHeader_pt_BR.properties | 0 .../social/ProfileHeader_pt_PT.properties | 0 .../social/ProfileHeader_ro.properties | 0 .../social/ProfileHeader_ru.properties | 0 .../social/ProfileHeader_sk.properties | 0 .../social/ProfileHeader_sl.properties | 0 .../social/ProfileHeader_sq.properties | 0 .../social/ProfileHeader_sv_SE.properties | 0 .../social/ProfileHeader_th.properties | 0 .../social/ProfileHeader_tl.properties | 0 .../social/ProfileHeader_tr.properties | 0 .../social/ProfileHeader_uk.properties | 0 .../social/ProfileHeader_ur_IN.properties | 0 .../social/ProfileHeader_vi.properties | 0 .../social/ProfileHeader_zh_CN.properties | 0 .../social/ProfileHeader_zh_TW.properties | 0 .../ProfileWorkExperience_ar.properties | 0 .../ProfileWorkExperience_aro.properties | 0 .../ProfileWorkExperience_az.properties | 0 .../ProfileWorkExperience_ca.properties | 0 .../ProfileWorkExperience_ceb.properties | 0 .../ProfileWorkExperience_co.properties | 0 .../ProfileWorkExperience_cs.properties | 0 .../ProfileWorkExperience_de.properties | 0 .../ProfileWorkExperience_el.properties | 0 .../ProfileWorkExperience_en.properties | 0 .../ProfileWorkExperience_es_ES.properties | 0 .../ProfileWorkExperience_eu.properties | 0 .../ProfileWorkExperience_fa.properties | 0 .../ProfileWorkExperience_fi.properties | 0 .../ProfileWorkExperience_fil.properties | 0 .../ProfileWorkExperience_fr.properties | 0 .../ProfileWorkExperience_hi.properties | 0 .../ProfileWorkExperience_hu.properties | 0 .../ProfileWorkExperience_id.properties | 0 .../ProfileWorkExperience_in.properties | 0 .../ProfileWorkExperience_it.properties | 0 .../ProfileWorkExperience_ja.properties | 0 .../ProfileWorkExperience_kab.properties | 0 .../ProfileWorkExperience_ko.properties | 0 .../ProfileWorkExperience_lt.properties | 0 .../ProfileWorkExperience_ms.properties | 0 .../ProfileWorkExperience_nl.properties | 0 .../ProfileWorkExperience_no.properties | 0 .../ProfileWorkExperience_pcm.properties | 0 .../ProfileWorkExperience_pl.properties | 0 .../ProfileWorkExperience_pt_BR.properties | 0 .../ProfileWorkExperience_pt_PT.properties | 0 .../ProfileWorkExperience_ro.properties | 0 .../ProfileWorkExperience_ru.properties | 0 .../ProfileWorkExperience_sk.properties | 0 .../ProfileWorkExperience_sl.properties | 0 .../ProfileWorkExperience_sq.properties | 0 .../ProfileWorkExperience_sv_SE.properties | 0 .../ProfileWorkExperience_th.properties | 0 .../ProfileWorkExperience_tl.properties | 0 .../ProfileWorkExperience_tr.properties | 0 .../ProfileWorkExperience_uk.properties | 0 .../ProfileWorkExperience_ur_IN.properties | 0 .../ProfileWorkExperience_vi.properties | 0 .../ProfileWorkExperience_zh_CN.properties | 0 .../ProfileWorkExperience_zh_TW.properties | 0 .../social/SpaceInfosPortlet_ar.properties | 0 .../social/SpaceInfosPortlet_aro.properties | 0 .../social/SpaceInfosPortlet_az.properties | 0 .../social/SpaceInfosPortlet_ca.properties | 0 .../social/SpaceInfosPortlet_ceb.properties | 0 .../social/SpaceInfosPortlet_co.properties | 0 .../social/SpaceInfosPortlet_cs.properties | 0 .../social/SpaceInfosPortlet_de.properties | 0 .../social/SpaceInfosPortlet_el.properties | 0 .../social/SpaceInfosPortlet_en.properties | 0 .../social/SpaceInfosPortlet_es_ES.properties | 0 .../social/SpaceInfosPortlet_eu.properties | 0 .../social/SpaceInfosPortlet_fa.properties | 0 .../social/SpaceInfosPortlet_fi.properties | 0 .../social/SpaceInfosPortlet_fil.properties | 0 .../social/SpaceInfosPortlet_fr.properties | 0 .../social/SpaceInfosPortlet_hi.properties | 0 .../social/SpaceInfosPortlet_hu.properties | 0 .../social/SpaceInfosPortlet_id.properties | 0 .../social/SpaceInfosPortlet_in.properties | 0 .../social/SpaceInfosPortlet_it.properties | 0 .../social/SpaceInfosPortlet_ja.properties | 0 .../social/SpaceInfosPortlet_kab.properties | 0 .../social/SpaceInfosPortlet_ko.properties | 0 .../social/SpaceInfosPortlet_lt.properties | 0 .../social/SpaceInfosPortlet_ms.properties | 0 .../social/SpaceInfosPortlet_nl.properties | 0 .../social/SpaceInfosPortlet_no.properties | 0 .../social/SpaceInfosPortlet_pcm.properties | 0 .../social/SpaceInfosPortlet_pl.properties | 0 .../social/SpaceInfosPortlet_pt_BR.properties | 0 .../social/SpaceInfosPortlet_pt_PT.properties | 0 .../social/SpaceInfosPortlet_ro.properties | 0 .../social/SpaceInfosPortlet_ru.properties | 0 .../social/SpaceInfosPortlet_sk.properties | 0 .../social/SpaceInfosPortlet_sl.properties | 0 .../social/SpaceInfosPortlet_sq.properties | 0 .../social/SpaceInfosPortlet_sv_SE.properties | 0 .../social/SpaceInfosPortlet_th.properties | 0 .../social/SpaceInfosPortlet_tl.properties | 0 .../social/SpaceInfosPortlet_tr.properties | 0 .../social/SpaceInfosPortlet_uk.properties | 0 .../social/SpaceInfosPortlet_ur_IN.properties | 0 .../social/SpaceInfosPortlet_vi.properties | 0 .../social/SpaceInfosPortlet_zh_CN.properties | 0 .../social/SpaceInfosPortlet_zh_TW.properties | 0 .../SpacesAdministrationPortlet_ar.properties | 0 ...SpacesAdministrationPortlet_aro.properties | 0 .../SpacesAdministrationPortlet_az.properties | 0 .../SpacesAdministrationPortlet_ca.properties | 0 ...SpacesAdministrationPortlet_ceb.properties | 0 .../SpacesAdministrationPortlet_co.properties | 0 .../SpacesAdministrationPortlet_cs.properties | 0 .../SpacesAdministrationPortlet_de.properties | 0 .../SpacesAdministrationPortlet_el.properties | 0 .../SpacesAdministrationPortlet_en.properties | 0 ...acesAdministrationPortlet_es_ES.properties | 0 .../SpacesAdministrationPortlet_eu.properties | 0 .../SpacesAdministrationPortlet_fa.properties | 0 .../SpacesAdministrationPortlet_fi.properties | 0 ...SpacesAdministrationPortlet_fil.properties | 0 .../SpacesAdministrationPortlet_fr.properties | 0 .../SpacesAdministrationPortlet_hi.properties | 0 .../SpacesAdministrationPortlet_hu.properties | 0 .../SpacesAdministrationPortlet_id.properties | 0 .../SpacesAdministrationPortlet_in.properties | 0 .../SpacesAdministrationPortlet_it.properties | 0 .../SpacesAdministrationPortlet_ja.properties | 0 ...SpacesAdministrationPortlet_kab.properties | 0 .../SpacesAdministrationPortlet_ko.properties | 0 .../SpacesAdministrationPortlet_lt.properties | 0 .../SpacesAdministrationPortlet_ms.properties | 0 .../SpacesAdministrationPortlet_nl.properties | 0 .../SpacesAdministrationPortlet_no.properties | 0 ...SpacesAdministrationPortlet_pcm.properties | 0 .../SpacesAdministrationPortlet_pl.properties | 0 ...acesAdministrationPortlet_pt_BR.properties | 0 ...acesAdministrationPortlet_pt_PT.properties | 0 .../SpacesAdministrationPortlet_ro.properties | 0 .../SpacesAdministrationPortlet_ru.properties | 0 .../SpacesAdministrationPortlet_sk.properties | 0 .../SpacesAdministrationPortlet_sl.properties | 0 .../SpacesAdministrationPortlet_sq.properties | 0 ...acesAdministrationPortlet_sv_SE.properties | 0 .../SpacesAdministrationPortlet_th.properties | 0 .../SpacesAdministrationPortlet_tl.properties | 0 .../SpacesAdministrationPortlet_tr.properties | 0 .../SpacesAdministrationPortlet_uk.properties | 0 ...acesAdministrationPortlet_ur_IN.properties | 0 .../SpacesAdministrationPortlet_vi.properties | 0 ...acesAdministrationPortlet_zh_CN.properties | 0 ...acesAdministrationPortlet_zh_TW.properties | 0 .../SpacesListApplication_ar.properties | 0 .../SpacesListApplication_aro.properties | 0 .../SpacesListApplication_az.properties | 0 .../SpacesListApplication_ca.properties | 0 .../SpacesListApplication_ceb.properties | 0 .../SpacesListApplication_co.properties | 0 .../SpacesListApplication_cs.properties | 0 .../SpacesListApplication_de.properties | 0 .../SpacesListApplication_el.properties | 0 .../SpacesListApplication_en.properties | 0 .../SpacesListApplication_es_ES.properties | 0 .../SpacesListApplication_eu.properties | 0 .../SpacesListApplication_fa.properties | 0 .../SpacesListApplication_fi.properties | 0 .../SpacesListApplication_fil.properties | 0 .../SpacesListApplication_fr.properties | 0 .../SpacesListApplication_hi.properties | 0 .../SpacesListApplication_hu.properties | 0 .../SpacesListApplication_id.properties | 0 .../SpacesListApplication_in.properties | 0 .../SpacesListApplication_it.properties | 0 .../SpacesListApplication_ja.properties | 0 .../SpacesListApplication_kab.properties | 0 .../SpacesListApplication_ko.properties | 0 .../SpacesListApplication_lt.properties | 0 .../SpacesListApplication_ms.properties | 0 .../SpacesListApplication_nl.properties | 0 .../SpacesListApplication_no.properties | 0 .../SpacesListApplication_pcm.properties | 0 .../SpacesListApplication_pl.properties | 0 .../SpacesListApplication_pt_BR.properties | 0 .../SpacesListApplication_pt_PT.properties | 0 .../SpacesListApplication_ro.properties | 0 .../SpacesListApplication_ru.properties | 0 .../SpacesListApplication_sk.properties | 0 .../SpacesListApplication_sl.properties | 0 .../SpacesListApplication_sq.properties | 0 .../SpacesListApplication_sv_SE.properties | 0 .../SpacesListApplication_th.properties | 0 .../SpacesListApplication_tl.properties | 0 .../SpacesListApplication_tr.properties | 0 .../SpacesListApplication_uk.properties | 0 .../SpacesListApplication_ur_IN.properties | 0 .../SpacesListApplication_vi.properties | 0 .../SpacesListApplication_zh_CN.properties | 0 .../SpacesListApplication_zh_TW.properties | 0 .../social/SpacesOverview_ar.properties | 0 .../social/SpacesOverview_aro.properties | 0 .../social/SpacesOverview_az.properties | 0 .../social/SpacesOverview_ca.properties | 0 .../social/SpacesOverview_ceb.properties | 0 .../social/SpacesOverview_co.properties | 0 .../social/SpacesOverview_cs.properties | 0 .../social/SpacesOverview_de.properties | 0 .../social/SpacesOverview_el.properties | 0 .../social/SpacesOverview_en.properties | 0 .../social/SpacesOverview_es_ES.properties | 0 .../social/SpacesOverview_eu.properties | 0 .../social/SpacesOverview_fa.properties | 0 .../social/SpacesOverview_fi.properties | 0 .../social/SpacesOverview_fil.properties | 0 .../social/SpacesOverview_fr.properties | 0 .../social/SpacesOverview_hi.properties | 0 .../social/SpacesOverview_hu.properties | 0 .../social/SpacesOverview_id.properties | 0 .../social/SpacesOverview_in.properties | 0 .../social/SpacesOverview_it.properties | 0 .../social/SpacesOverview_ja.properties | 0 .../social/SpacesOverview_kab.properties | 0 .../social/SpacesOverview_ko.properties | 0 .../social/SpacesOverview_lt.properties | 0 .../social/SpacesOverview_ms.properties | 0 .../social/SpacesOverview_nl.properties | 0 .../social/SpacesOverview_no.properties | 0 .../social/SpacesOverview_pcm.properties | 0 .../social/SpacesOverview_pl.properties | 0 .../social/SpacesOverview_pt_BR.properties | 0 .../social/SpacesOverview_pt_PT.properties | 0 .../social/SpacesOverview_ro.properties | 0 .../social/SpacesOverview_ru.properties | 0 .../social/SpacesOverview_sk.properties | 0 .../social/SpacesOverview_sl.properties | 0 .../social/SpacesOverview_sq.properties | 0 .../social/SpacesOverview_sv_SE.properties | 0 .../social/SpacesOverview_th.properties | 0 .../social/SpacesOverview_tl.properties | 0 .../social/SpacesOverview_tr.properties | 0 .../social/SpacesOverview_uk.properties | 0 .../social/SpacesOverview_ur_IN.properties | 0 .../social/SpacesOverview_vi.properties | 0 .../social/SpacesOverview_zh_CN.properties | 0 .../social/SpacesOverview_zh_TW.properties | 0 .../social/SuggestionsPortlet_ar.properties | 0 .../social/SuggestionsPortlet_aro.properties | 0 .../social/SuggestionsPortlet_az.properties | 0 .../social/SuggestionsPortlet_ca.properties | 0 .../social/SuggestionsPortlet_ceb.properties | 0 .../social/SuggestionsPortlet_co.properties | 0 .../social/SuggestionsPortlet_cs.properties | 0 .../social/SuggestionsPortlet_de.properties | 0 .../social/SuggestionsPortlet_el.properties | 0 .../social/SuggestionsPortlet_en.properties | 0 .../SuggestionsPortlet_es_ES.properties | 0 .../social/SuggestionsPortlet_eu.properties | 0 .../social/SuggestionsPortlet_fa.properties | 0 .../social/SuggestionsPortlet_fi.properties | 0 .../social/SuggestionsPortlet_fil.properties | 0 .../social/SuggestionsPortlet_fr.properties | 0 .../social/SuggestionsPortlet_hi.properties | 0 .../social/SuggestionsPortlet_hu.properties | 0 .../social/SuggestionsPortlet_id.properties | 0 .../social/SuggestionsPortlet_in.properties | 0 .../social/SuggestionsPortlet_it.properties | 0 .../social/SuggestionsPortlet_ja.properties | 0 .../social/SuggestionsPortlet_kab.properties | 0 .../social/SuggestionsPortlet_ko.properties | 0 .../social/SuggestionsPortlet_lt.properties | 0 .../social/SuggestionsPortlet_ms.properties | 0 .../social/SuggestionsPortlet_nl.properties | 0 .../social/SuggestionsPortlet_no.properties | 0 .../social/SuggestionsPortlet_pcm.properties | 0 .../social/SuggestionsPortlet_pl.properties | 0 .../SuggestionsPortlet_pt_BR.properties | 0 .../SuggestionsPortlet_pt_PT.properties | 0 .../social/SuggestionsPortlet_ro.properties | 0 .../social/SuggestionsPortlet_ru.properties | 0 .../social/SuggestionsPortlet_sk.properties | 0 .../social/SuggestionsPortlet_sl.properties | 0 .../social/SuggestionsPortlet_sq.properties | 0 .../SuggestionsPortlet_sv_SE.properties | 0 .../social/SuggestionsPortlet_th.properties | 0 .../social/SuggestionsPortlet_tl.properties | 0 .../social/SuggestionsPortlet_tr.properties | 0 .../social/SuggestionsPortlet_uk.properties | 0 .../SuggestionsPortlet_ur_IN.properties | 0 .../social/SuggestionsPortlet_vi.properties | 0 .../SuggestionsPortlet_zh_CN.properties | 0 .../SuggestionsPortlet_zh_TW.properties | 0 .../portlet/social/UserPopup_ar.properties | 0 .../portlet/social/UserPopup_aro.properties | 0 .../portlet/social/UserPopup_az.properties | 0 .../portlet/social/UserPopup_ca.properties | 0 .../portlet/social/UserPopup_ceb.properties | 0 .../portlet/social/UserPopup_co.properties | 0 .../portlet/social/UserPopup_cs.properties | 0 .../portlet/social/UserPopup_de.properties | 0 .../portlet/social/UserPopup_el.properties | 0 .../portlet/social/UserPopup_en.properties | 0 .../portlet/social/UserPopup_es_ES.properties | 0 .../portlet/social/UserPopup_eu.properties | 0 .../portlet/social/UserPopup_fa.properties | 0 .../portlet/social/UserPopup_fi.properties | 0 .../portlet/social/UserPopup_fil.properties | 0 .../portlet/social/UserPopup_fr.properties | 0 .../portlet/social/UserPopup_hi.properties | 0 .../portlet/social/UserPopup_hu.properties | 0 .../portlet/social/UserPopup_id.properties | 0 .../portlet/social/UserPopup_in.properties | 0 .../portlet/social/UserPopup_it.properties | 0 .../portlet/social/UserPopup_ja.properties | 0 .../portlet/social/UserPopup_kab.properties | 0 .../portlet/social/UserPopup_ko.properties | 0 .../portlet/social/UserPopup_lt.properties | 0 .../portlet/social/UserPopup_ms.properties | 0 .../portlet/social/UserPopup_nl.properties | 0 .../portlet/social/UserPopup_no.properties | 0 .../portlet/social/UserPopup_pcm.properties | 0 .../portlet/social/UserPopup_pl.properties | 0 .../portlet/social/UserPopup_pt_BR.properties | 0 .../portlet/social/UserPopup_pt_PT.properties | 0 .../portlet/social/UserPopup_ro.properties | 0 .../portlet/social/UserPopup_ru.properties | 0 .../portlet/social/UserPopup_sk.properties | 0 .../portlet/social/UserPopup_sl.properties | 0 .../portlet/social/UserPopup_sq.properties | 0 .../portlet/social/UserPopup_sv_SE.properties | 0 .../portlet/social/UserPopup_th.properties | 0 .../portlet/social/UserPopup_tl.properties | 0 .../portlet/social/UserPopup_tr.properties | 0 .../portlet/social/UserPopup_uk.properties | 0 .../portlet/social/UserPopup_ur_IN.properties | 0 .../portlet/social/UserPopup_vi.properties | 0 .../portlet/social/UserPopup_zh_CN.properties | 0 .../portlet/social/UserPopup_zh_TW.properties | 0 .../portlet/social/UserSettings_ar.properties | 0 .../social/UserSettings_aro.properties | 0 .../portlet/social/UserSettings_az.properties | 0 .../portlet/social/UserSettings_ca.properties | 0 .../social/UserSettings_ceb.properties | 0 .../portlet/social/UserSettings_co.properties | 0 .../portlet/social/UserSettings_cs.properties | 0 .../portlet/social/UserSettings_de.properties | 0 .../portlet/social/UserSettings_el.properties | 0 .../portlet/social/UserSettings_en.properties | 0 .../social/UserSettings_es_ES.properties | 0 .../portlet/social/UserSettings_eu.properties | 0 .../portlet/social/UserSettings_fa.properties | 0 .../portlet/social/UserSettings_fi.properties | 0 .../social/UserSettings_fil.properties | 0 .../portlet/social/UserSettings_fr.properties | 0 .../portlet/social/UserSettings_hi.properties | 0 .../portlet/social/UserSettings_hu.properties | 0 .../portlet/social/UserSettings_id.properties | 0 .../portlet/social/UserSettings_in.properties | 0 .../portlet/social/UserSettings_it.properties | 0 .../portlet/social/UserSettings_ja.properties | 0 .../social/UserSettings_kab.properties | 0 .../portlet/social/UserSettings_ko.properties | 0 .../portlet/social/UserSettings_lt.properties | 0 .../portlet/social/UserSettings_ms.properties | 0 .../portlet/social/UserSettings_nl.properties | 0 .../portlet/social/UserSettings_no.properties | 0 .../social/UserSettings_pcm.properties | 0 .../portlet/social/UserSettings_pl.properties | 0 .../social/UserSettings_pt_BR.properties | 0 .../social/UserSettings_pt_PT.properties | 0 .../portlet/social/UserSettings_ro.properties | 0 .../portlet/social/UserSettings_ru.properties | 0 .../portlet/social/UserSettings_sk.properties | 0 .../portlet/social/UserSettings_sl.properties | 0 .../portlet/social/UserSettings_sq.properties | 0 .../social/UserSettings_sv_SE.properties | 0 .../portlet/social/UserSettings_th.properties | 0 .../portlet/social/UserSettings_tl.properties | 0 .../portlet/social/UserSettings_tr.properties | 0 .../portlet/social/UserSettings_uk.properties | 0 .../social/UserSettings_ur_IN.properties | 0 .../portlet/social/UserSettings_vi.properties | 0 .../social/UserSettings_zh_CN.properties | 0 .../social/UserSettings_zh_TW.properties | 0 .../whoisonline/whoisonline_ar.properties | 0 .../whoisonline/whoisonline_aro.properties | 0 .../whoisonline/whoisonline_az.properties | 0 .../whoisonline/whoisonline_ca.properties | 0 .../whoisonline/whoisonline_ceb.properties | 0 .../whoisonline/whoisonline_co.properties | 0 .../whoisonline/whoisonline_cs.properties | 0 .../whoisonline/whoisonline_de.properties | 0 .../whoisonline/whoisonline_el.properties | 0 .../whoisonline/whoisonline_en.properties | 0 .../whoisonline/whoisonline_es_ES.properties | 0 .../whoisonline/whoisonline_eu.properties | 0 .../whoisonline/whoisonline_fa.properties | 0 .../whoisonline/whoisonline_fi.properties | 0 .../whoisonline/whoisonline_fil.properties | 0 .../whoisonline/whoisonline_fr.properties | 0 .../whoisonline/whoisonline_he.properties | 0 .../whoisonline/whoisonline_hi.properties | 0 .../whoisonline/whoisonline_hu.properties | 0 .../whoisonline/whoisonline_id.properties | 0 .../whoisonline/whoisonline_in.properties | 0 .../whoisonline/whoisonline_it.properties | 0 .../whoisonline/whoisonline_ja.properties | 0 .../whoisonline/whoisonline_kab.properties | 0 .../whoisonline/whoisonline_ko.properties | 0 .../whoisonline/whoisonline_lt.properties | 0 .../whoisonline/whoisonline_ms.properties | 0 .../whoisonline/whoisonline_nl.properties | 0 .../whoisonline/whoisonline_no.properties | 0 .../whoisonline/whoisonline_pcm.properties | 0 .../whoisonline/whoisonline_pl.properties | 0 .../whoisonline/whoisonline_pt_BR.properties | 0 .../whoisonline/whoisonline_pt_PT.properties | 0 .../whoisonline/whoisonline_ro.properties | 0 .../whoisonline/whoisonline_ru.properties | 0 .../whoisonline/whoisonline_sk.properties | 0 .../whoisonline/whoisonline_sl.properties | 0 .../whoisonline/whoisonline_sq.properties | 0 .../whoisonline/whoisonline_sv_SE.properties | 0 .../whoisonline/whoisonline_th.properties | 0 .../whoisonline/whoisonline_tl.properties | 0 .../whoisonline/whoisonline_tr.properties | 0 .../whoisonline/whoisonline_uk.properties | 0 .../whoisonline/whoisonline_ur_IN.properties | 0 .../whoisonline/whoisonline_vi.properties | 0 .../whoisonline/whoisonline_zh_CN.properties | 0 .../whoisonline/whoisonline_zh_TW.properties | 0 .../src/main/webapp/META-INF/context.xml | 0 .../webapp/WEB-INF/conf/configuration.xml | 0 .../ckeditor/attach-image-plugin.js | 1 + .../conf/social-extension/ckeditor/config.js | 2 +- .../organization-configuration.xml | 0 .../dynamic-container-configuration.xml | 18 +- .../portal/social-portal-configuration.xml | 0 .../portal/upgrade-plugins-configuration.xml | 0 .../social/cache-configuration.xml | 0 .../social/ckeditor-configuration.xml | 0 .../social/common-configuration.xml | 0 .../component-plugins-configuration.xml | 0 .../social/core-configuration.xml | 0 .../social/indexing-configuration.xml | 0 .../social/metadata-plugins-configuration.xml | 0 .../social/notification-configuration.xml | 0 .../notification-plugins-configuration.xml | 0 .../social/permlink-configuration.xml | 0 .../profile-property-configuration.xml | 0 .../social/search-configuration.xml | 4 +- .../search/activities-search-query.json | 0 .../social/search/spaces-count-query.json | 0 .../social/search/spaces-search-query.json | 0 .../social/service-configuration.xml | 0 .../social/social-configuration.xml | 0 .../space-template/communication/banner.png | Bin .../space-template/community/banner.png | Bin .../social/space-template/project/banner.png | Bin .../social/space-template/team/banner.png | Bin .../social/spaces-templates-configuration.xml | 24 +- .../social/upgrade-configuration.xml | 0 .../social/websocket-configuration.xml | 0 .../social/webui-configuration.xml | 0 .../main/webapp/WEB-INF/gatein-resources.xml | 68 +-- .../jsp/externalRegistration/init_account.jsp | 0 .../jsp/forgotpassword/forgot_password.jsp | 0 .../main/webapp/WEB-INF/jsp/login/login.jsp | 0 .../WEB-INF/jsp/login/oauth_invitation.jsp | 4 +- .../WEB-INF/jsp/login/oauth_register.jsp | 4 +- .../WEB-INF/jsp/onboarding/reset_password.jsp | 0 .../WEB-INF/jsp/portlet/activityStream.jsp | 0 .../webapp/WEB-INF/jsp/portlet/breadcrumb.jsp | 2 +- .../WEB-INF/jsp/portlet/generalSettings.jsp | 2 +- .../WEB-INF/jsp/portlet/gettingStarted.jsp | 2 +- .../WEB-INF/jsp/portlet/hamburgerMenu.jsp | 2 +- .../main/webapp/WEB-INF/jsp/portlet/image.jsp | 2 +- .../main/webapp/WEB-INF/jsp/portlet/links.jsp | 2 +- .../jsp/portlet/organizationalChart.jsp | 2 +- .../webapp/WEB-INF/jsp/portlet/peopleList.jsp | 2 +- .../WEB-INF/jsp/portlet/peopleOverview.jsp | 0 .../WEB-INF/jsp/portlet/platformSettings.jsp | 2 +- .../WEB-INF/jsp/portlet/profileAboutMe.jsp | 2 +- .../jsp/portlet/profileContactInformation.jsp | 2 +- .../WEB-INF/jsp/portlet/profileHeader.jsp | 2 +- .../WEB-INF/jsp/portlet/profileSettings.jsp | 2 +- .../jsp/portlet/profileWorkExperience.jsp | 2 +- .../webapp/WEB-INF/jsp/portlet/search.jsp | 4 +- .../WEB-INF/jsp/portlet/spaceAccess.jsp | 2 +- .../WEB-INF/jsp/portlet/spaceBanner.jsp | 2 +- .../WEB-INF/jsp/portlet/spaceHeader.jsp | 4 +- .../WEB-INF/jsp/portlet/spaceInformation.jsp | 0 .../WEB-INF/jsp/portlet/spaceMembers.jsp | 2 +- .../webapp/WEB-INF/jsp/portlet/spaceMenu.jsp | 2 +- .../WEB-INF/jsp/portlet/spaceSettings.jsp | 2 +- .../jsp/portlet/spaceWidgetDescription.jsp | 2 +- .../jsp/portlet/spaceWidgetManagers.jsp | 2 +- .../jsp/portlet/spaceWidgetMembers.jsp | 2 +- .../webapp/WEB-INF/jsp/portlet/spacesList.jsp | 2 +- .../WEB-INF/jsp/portlet/suggestions.jsp | 2 +- .../webapp/WEB-INF/jsp/portlet/topBarMenu.jsp | 2 +- .../WEB-INF/jsp/portlet/topBarPublishSite.jsp | 2 +- .../WEB-INF/jsp/portlet/topbarLogin.jsp | 2 +- .../webapp/WEB-INF/jsp/portlet/topbarLogo.jsp | 0 .../jsp/portlet/topbarNotification.jsp | 2 +- .../jsp/portlet/userSettingLanguage.jsp | 2 +- .../jsp/portlet/userSettingNotifications.jsp | 2 +- .../jsp/portlet/userSettingSecurity.jsp | 2 +- .../WEB-INF/jsp/portlet/whoIsOnline.jsp | 2 +- .../webapp/WEB-INF/jsp/register/register.jsp | 0 .../jsp/welcome-screens/accountSetup.jsp | 6 +- .../templates/ActivityCommentPlugin.gtmpl | 0 .../templates/ActivityMentionPlugin.gtmpl | 0 .../ActivityReplyToCommentPlugin.gtmpl | 0 .../templates/EditActivityPlugin.gtmpl | 0 .../templates/EditCommentPlugin.gtmpl | 0 .../templates/LikeCommentPlugin.gtmpl | 0 .../notification/templates/LikePlugin.gtmpl | 0 .../templates/NewUserPlugin.gtmpl | 0 .../templates/PostActivityPlugin.gtmpl | 0 .../PostActivitySpaceStreamPlugin.gtmpl | 0 .../RelationshipReceivedRequestPlugin.gtmpl | 0 .../templates/RequestJoinSpacePlugin.gtmpl | 0 .../SharedActivitySpaceStreamPlugin.gtmpl | 0 .../templates/SpaceInvitationPlugin.gtmpl | 0 .../activities/DefaultActivity.gtmpl | 0 .../activities/NotificationLinkActivity.gtmpl | 0 .../src/main/webapp/WEB-INF/portlet.xml | 4 +- .../src/main/webapp/WEB-INF/web.xml | 2 +- .../webui/UISocialPortalApplicationHead.gtmpl | 0 .../social/webui/UISocialPreloadHead.gtmpl | 0 .../src/main/webapp/html/blank.html | 0 .../src/main/webapp/html/drawersOverlay.html | 0 .../main/webapp/html/externalSpaceList.html | 2 +- .../main/webapp/html/idmGroupsManagement.html | 2 +- .../html/idmMembershipTypesManagement.html | 2 +- .../main/webapp/html/idmUsersManagement.html | 2 +- .../html/notificationAdministration.html | 2 +- .../src/main/webapp/html/pageNotFound.html | 2 +- .../webapp/html/spacesAdministration.html | 2 +- .../src/main/webapp/html/spacesOverview.html | 2 +- .../src/main/webapp/html/topbarFavorites.html | 2 +- .../src/main/webapp/html/topbarPreview.html | 2 +- .../src/main/webapp/html/verticalMenu.html | 2 +- .../src/main/webapp/images/cadre.png | Bin .../deprecated/space-access/denyIcon.png | Bin .../deprecated/space-access/lockIcon.png | Bin .../deprecated/space-access/texture.png | Bin .../deprecated/space-access/warningIcon.png | Bin .../welcome-screen/uiIconsColor.png | Bin .../src/main/webapp/images/emptyCol1.webp | Bin .../src/main/webapp/images/emptyCol2.webp | Bin .../src/main/webapp/images/emptyCol3.webp | Bin .../main/webapp/images/empty_pin_stream.png | Bin .../src/main/webapp/images/link.jpg | Bin .../src/main/webapp/js/BodyScrollListener.js | 0 .../src/main/webapp/js/ExtendedDomPurify.js | 0 .../main/webapp/js/MobileSwipeContainer.js | 0 .../src/main/webapp/js/TopbarLoading.js | 0 .../attachImage/icons/attachImage.png | Bin .../js/ckeditorPlugins/attachImage/lang/en.js | 0 .../js/ckeditorPlugins/attachImage/lang/fr.js | 0 .../js/ckeditorPlugins/attachImage/plugin.js | 0 .../linkBalloon/icons/addLink.png | Bin .../linkBalloon/icons/removeLink.png | Bin .../js/ckeditorPlugins/linkBalloon/lang/en.js | 0 .../js/ckeditorPlugins/linkBalloon/lang/fr.js | 0 .../js/ckeditorPlugins/linkBalloon/plugin.js | 0 .../src/main/webapp/js/extensionRegistry.js | 0 .../src/main/webapp/js/lib/autolinker.min.js | 0 .../src/main/webapp/js/lib/cropper.min.js | 0 .../webapp/js/lib/deprecated/switch-button.js | 0 .../src/main/webapp/js/lib/echarts.min.js | 0 .../src/main/webapp/js/lib/html2canvas.min.js | 0 .../src/main/webapp/js/lib/jquery-3.2.1.js | 0 .../src/main/webapp/js/lib/jquery.atwho.js | 0 .../src/main/webapp/js/lib/jquery.caret.js | 0 .../main/webapp/js/lib/jquery.exomentions.js | 0 .../src/main/webapp/js/lib/jspdf.min.js | 0 .../src/main/webapp/js/lib/purify.min.js | 0 .../src/main/webapp/js/lib/require.js | 0 .../src/main/webapp/js/lib/selectize.js | 0 .../src/main/webapp/js/lib/sortable.min.js | 0 .../src/main/webapp/js/lib/underscore.js | 0 .../src/main/webapp/js/lib/vue-i18n.min.js | 0 .../src/main/webapp/js/lib/vue.min.js | 0 .../main/webapp/js/lib/vueDraggable.min.js | 0 .../src/main/webapp/js/lib/vuetify.min.js | 0 .../src/main/webapp/js/portal.js | 0 .../main/webapp/js/sanitize-html-directive.js | 0 .../src/main/webapp/js/suggester.js | 0 .../src/main/webapp/js/tag.suggester.js | 0 .../src/main/webapp/js/vue-i18n-wrapper.js | 0 .../webapp/js/welcome-screens/accountSetup.js | 0 .../DefaultSkin/portletIcons/Breadcrumb.png | Bin .../portletIcons/ExternalSpacesList.png | Bin .../skin/DefaultSkin/portletIcons/Image.png | Bin .../skin/DefaultSkin/portletIcons/Links.png | Bin .../portletIcons/MembersPortlet.png | Bin .../portletIcons/OrganizationalChart.png | Bin .../portletIcons/PeopleOverview.png | Bin .../SpaceActivityStreamPortlet.png | Bin .../DefaultSkin/portletIcons/SpaceInfos.png | Bin .../portletIcons/SpaceMenuPortlet.png | Bin .../portletIcons/SpaceSettingPortlet.png | Bin .../portletIcons/SpacesOverview.png | Bin .../SuggestionsPeopleAndSpace.png | Bin .../DefaultSkin/portletIcons/TopBarLogin.png | Bin .../DefaultSkin/portletIcons/TopBarLogo.png | Bin .../portletIcons/TopBarPreview.png | Bin .../portletIcons/TopBarPublishSite.png | Bin .../DefaultSkin/portletIcons/VerticalMenu.png | Bin .../portletIcons/WhoIsOnLinePortlet.png | Bin .../css/welcome-screens/jquery.qtip.min.css | 0 .../less/common/AdministrationSite/Style.less | 0 .../skin/less/common/Notification/Style.less | 0 .../skin/less/common/PeopleList/Style.less | 0 .../less/common/ProfileCard/Style-mobile.less | 0 .../skin/less/common/ProfileCard/Style.less | 0 .../skin/less/common/UserCard/Style.less | 0 .../skin/less/common/siteDetails/Style.less | 0 .../webapp/skin/less/deprecated/Style.less | 0 .../less/deprecated/bootstrap/bootstrap.less | 0 .../deprecated/bootstrap/less/accordion.less | 0 .../deprecated/bootstrap/less/alerts.less | 0 .../deprecated/bootstrap/less/bootstrap.less | 0 .../bootstrap/less/breadcrumbs.less | 0 .../bootstrap/less/button-groups.less | 0 .../deprecated/bootstrap/less/buttons.less | 0 .../deprecated/bootstrap/less/carousel.less | 0 .../less/deprecated/bootstrap/less/close.less | 0 .../less/deprecated/bootstrap/less/code.less | 0 .../bootstrap/less/component-animations.less | 0 .../deprecated/bootstrap/less/dropdowns.less | 0 .../less/deprecated/bootstrap/less/forms.less | 0 .../less/deprecated/bootstrap/less/grid.less | 0 .../deprecated/bootstrap/less/hero-unit.less | 0 .../bootstrap/less/labels-badges.less | 0 .../deprecated/bootstrap/less/layouts.less | 0 .../less/deprecated/bootstrap/less/media.less | 0 .../deprecated/bootstrap/less/mixins.less | 0 .../deprecated/bootstrap/less/modals.less | 0 .../deprecated/bootstrap/less/navbar.less | 0 .../less/deprecated/bootstrap/less/navs.less | 0 .../less/deprecated/bootstrap/less/pager.less | 0 .../deprecated/bootstrap/less/pagination.less | 0 .../deprecated/bootstrap/less/popovers.less | 0 .../bootstrap/less/progress-bars.less | 0 .../less/deprecated/bootstrap/less/reset.less | 0 .../bootstrap/less/responsive-1200px-min.less | 0 .../bootstrap/less/responsive-767px-max.less | 0 .../less/responsive-768px-979px.less | 0 .../bootstrap/less/responsive-navbar.less | 0 .../bootstrap/less/responsive-utilities.less | 0 .../deprecated/bootstrap/less/responsive.less | 0 .../bootstrap/less/scaffolding.less | 0 .../deprecated/bootstrap/less/sprites.less | 0 .../deprecated/bootstrap/less/tables.less | 0 .../deprecated/bootstrap/less/thumbnails.less | 0 .../deprecated/bootstrap/less/tooltip.less | 0 .../less/deprecated/bootstrap/less/type.less | 0 .../deprecated/bootstrap/less/utilities.less | 0 .../deprecated/bootstrap/less/variables.less | 0 .../less/deprecated/bootstrap/less/wells.less | 0 .../less/deprecated/webui/Buttons/Style.less | 0 .../less/deprecated/webui/Checkbox/Style.less | 0 .../less/deprecated/webui/Form/Style.less | 0 .../less/deprecated/webui/Grid/Style.less | 0 .../less/deprecated/webui/Grid/tables.less | 0 .../less/deprecated/webui/Popup/Style.less | 0 .../deprecated/webui/SearchInput/Style.less | 0 .../deprecated/webui/Selectize/Style.less | 0 .../skin/less/deprecated/webui/webui.less | 0 .../less/portlet/ActivitySearch/Style.less | 0 .../less/portlet/ActivityStream/Style.less | 0 .../less/portlet/GettingStarted/Style.less | 0 .../less/portlet/HamburgerMenu/Style.less | 0 .../portlet/IDMGroupsManagement/Style.less | 0 .../IDMMembershipTypesManagement/Style.less | 0 .../portlet/IDMUsersManagement/Style.less | 0 .../skin/less/portlet/PeopleList/Style.less | 0 .../less/portlet/PeopleOverview/Style.less | 0 .../less/portlet/ProfileAboutMe/Style.less | 0 .../ProfileContactInformation/Style.less | 0 .../less/portlet/ProfileHeader/Style.less | 0 .../less/portlet/ProfileSearch/Style.less | 0 .../less/portlet/ProfileSettings/Style.less | 0 .../portlet/ProfileWorkExperience/Style.less | 0 .../skin/less/portlet/Search/Style.less | 0 .../skin/less/portlet/SpaceHeader/Style.less | 0 .../skin/less/portlet/SpaceInfos/Style.less | 0 .../skin/less/portlet/SpaceMenu/Style.less | 0 .../portlet/SpacesAdministration/Style.less | 0 .../portlet/SpacesListExternal/Style.less | 0 .../less/portlet/SpacesOverview/Style.less | 0 .../SuggestionsPeopleAndSpace/Style.less | 0 .../skin/less/portlet/TopBarMenu/Style.less | 0 .../portlet/TopBarNotification/Style.less | 0 .../skin/less/portlet/VerticalMenu/Style.less | 0 .../portlet/organizational-chart/Style.less | 0 .../less/standalone-pages/AccountSetup.less | 4 +- .../skin/less/standalone-pages/Login.less | 0 .../skin/less/standalone-pages/OAuth.less | 0 .../src/main/webapp/tld/portlet_2_0.tld | 0 .../components/ActivityLikerItem.vue | 0 .../components/ActivityLikesList.vue | 0 .../components/ActivityReactions.vue | 0 .../components/ActivityReactionsApp.vue | 0 .../components/ActivityReactionsDrawer.vue | 0 .../components/ActivityReactionsListItems.vue | 0 .../components/ActivityReactionsMobile.vue | 0 .../vue-apps/activity-reactions/extensions.js | 0 .../activity-reactions/initComponents.js | 0 .../vue-apps/activity-reactions/main.js | 0 .../components/ActivityStream.vue | 0 .../activity/ActivityStreamActivity.vue | 0 .../activity/ActivityStreamLoader.vue | 0 .../activity/content/ActivityBody.vue | 0 .../activity/content/ActivityEmbeddedHTML.vue | 0 .../content/ActivityImageAttachments.vue | 0 .../activity/content/ActivityLink.vue | 0 .../activity/content/ActivityShare.vue | 0 .../activity/footer/ActivityActions.vue | 0 .../activity/footer/ActivityFooter.vue | 0 .../footer/ActivityShareInformation.vue | 0 .../footer/actions/ActivityCommentAction.vue | 0 .../footer/actions/ActivityFavoriteAction.vue | 0 .../footer/actions/ActivityLikeAction.vue | 0 .../footer/actions/ActivityShareAction.vue | 0 .../activity/header/ActivityHead.vue | 0 .../activity/header/ActivityHeadMenu.vue | 0 .../activity/header/ActivityHeadTime.vue | 0 .../activity/header/ActivityMobileHead.vue | 0 .../activity/list/ActivityStreamList.vue | 0 .../components/comment/ActivityComment.vue | 0 .../content/ActivityCommentBodyText.vue | 0 .../content/ActivityCommentRichText.vue | 0 .../comment/footer/ActivityCommentActions.vue | 0 .../comment/footer/ActivityCommentTime.vue | 0 .../actions/ActivityCommentLikeAction.vue | 0 .../actions/ActivityCommentReplyAction.vue | 0 .../comment/header/ActivityCommentMenu.vue | 0 .../comment/list/ActivityComments.vue | 0 .../comment/list/ActivityCommentsDrawer.vue | 0 .../comment/list/ActivityCommentsPreview.vue | 0 .../common/ActivityStreamConfirm.vue | 0 .../common/ActivityStreamUpdater.vue | 0 .../empty-stream/ActivityNotFound.vue | 0 .../ActivityStreamEmptyMessage.vue | 0 .../ActivityStreamEmptyMessageCard.vue | 2 +- .../ActivityStreamEmptyMessageFilter.vue | 0 .../ActivityStreamEmptyMessageSpace.vue | 0 .../ActivityStreamPinnedActivity.vue | 0 .../toolbar/ActivityComposerDrawer.vue | 0 .../toolbar/ActivityStreamFilterDrawer.vue | 0 .../toolbar/ActivityStreamToolbar.vue | 0 .../vue-apps/activity-stream/extensions.js | 2 +- .../activity-stream/initComponents.js | 0 .../activity-stream/js/ActivityConstants.js | 0 .../activity-stream/js/ActivityUtils.js | 0 .../vue-apps/activity-stream/js/WebSocket.js | 0 .../webapp/vue-apps/activity-stream/main.js | 6 +- .../components/ConfetiAnimation.vue | 0 .../vue-apps/animations/initComponents.js | 0 .../main/webapp/vue-apps/animations/main.js | 0 .../components/ApplicationToolbar.vue | 0 .../application-toolbar/initComponents.js | 0 .../vue-apps/application-toolbar/main.js | 0 .../form/ImageAttachmentCropDrawer.vue | 0 .../components/form/ImageInput.vue | 0 .../components/form/ImageInputItem.vue | 0 .../components/form/ImageInputItems.vue | 0 .../components/form/ImageInputMultiUpload.vue | 0 .../components/preview/ImagePreviewDialog.vue | 0 .../components/preview/ImagePreviewItem.vue | 0 .../components/view/ImageItem.vue | 0 .../components/view/ImageItems.vue | 0 .../vue-apps/attach-image/initComponents.js | 0 .../attach-image/js/FileAttachmentService.js | 0 .../main/webapp/vue-apps/attach-image/main.js | 0 .../webapp/vue-apps/attach-image/services.js | 0 .../breadcrumb/components/Breadcrumb.vue | 0 .../vue-apps/breadcrumb/initComponents.js | 0 .../main/webapp/vue-apps/breadcrumb/main.js | 0 .../components/FontIconDrawer.vue | 0 .../components/FontIconInput.vue | 0 .../common-font-icon/initComponents.js | 0 .../common-font-icon/js/fontLibrary.js | 0 .../webapp/vue-apps/common-font-icon/main.js | 0 .../vue-apps/common-font-icon/services.js | 0 .../common/components/ActivityShareDrawer.vue | 0 .../components/AttachmentsDraggableZone.vue | 0 .../common/components/CardCarousel.vue | 0 .../common/components/ChangesReminder.vue | 0 .../common/components/ConfirmDialog.vue | 0 .../vue-apps/common/components/DateFormat.vue | 0 .../vue-apps/common/components/DatePicker.vue | 0 .../common/components/DrawersOverlay.vue | 0 .../common/components/DynamicHTMLElement.vue | 0 .../vue-apps/common/components/ExoDrawer.vue | 0 .../common/components/ExoGroupSuggester.vue | 0 .../components/ExoIdentitySuggester.vue | 0 .../vue-apps/common/components/ExoModal.vue | 0 .../components/ExoNotificationAlert.vue | 0 .../common/components/ExtendedTextarea.vue | 0 .../components/ExtensionRegistryComponent.vue | 0 .../ExtensionRegistryComponents.vue | 0 .../common/components/FavoriteButton.vue | 0 .../vue-apps/common/components/HelpDrawer.vue | 0 .../vue-apps/common/components/HelpLabel.vue | 0 .../common/components/HelpTooltip.vue | 0 .../common/components/Notifications.vue | 0 .../common/components/NumberInput.vue | 0 .../common/components/RelativeDateFormat.vue | 0 .../vue-apps/common/components/RichEditor.vue | 0 .../common/components/RippleHoverButton.vue | 0 .../common/components/SpaceAvatar.vue | 0 .../vue-apps/common/components/TimePicker.vue | 0 .../common/components/UnreadBadge.vue | 0 .../vue-apps/common/components/UserAvatar.vue | 0 .../common/components/UserAvatarsList.vue | 0 .../vue-apps/common/components/Widget.vue | 0 .../webapp/vue-apps/common/initComponents.js | 0 .../vue-apps/common/js/ActivityService.js | 0 .../webapp/vue-apps/common/js/DateUtil.js | 0 .../vue-apps/common/js/FavoriteService.js | 0 .../vue-apps/common/js/FeatureService.js | 0 .../vue-apps/common/js/IdentityService.js | 0 .../vue-apps/common/js/NavigationService.js | 0 .../vue-apps/common/js/ObserverService.js | 0 .../vue-apps/common/js/ProfileLabelService.js | 0 .../common/js/ProfileSettingsService.js | 0 .../vue-apps/common/js/SettingService.js | 0 .../webapp/vue-apps/common/js/SiteService.js | 0 .../webapp/vue-apps/common/js/SpaceService.js | 0 .../vue-apps/common/js/SuggesterService.js | 0 .../webapp/vue-apps/common/js/TagService.js | 0 .../vue-apps/common/js/UploadService.js | 0 .../webapp/vue-apps/common/js/UserService.js | 0 .../main/webapp/vue-apps/common/js/Utils.js | 0 .../webapp/vue-apps/common/js/WebSocket.js | 0 .../vue-apps/common/js/brandingService.js | 0 .../vue-apps/common/js/spacesConstants.js | 0 .../src/main/webapp/vue-apps/common/main.js | 12 +- .../components/ComplementaryFilter.vue | 0 .../components/ComplementaryFilterItem.vue | 0 .../ComplementaryFilterItemsDrawer.vue | 0 .../complementary-filter/initComponents.js | 0 .../js/ComplementaryFilterService.js | 0 .../vue-apps/complementary-filter/main.js | 0 .../components/ImageCropDrawer.vue | 0 .../component-image-crop/initComponents.js | 0 .../vue-apps/component-image-crop/main.js | 0 .../components/TranslationDrawer.vue | 0 .../components/TranslationTextField.vue | 0 .../initComponents.js | 0 .../js/TranslationService.js | 0 .../component-translation-field/main.js | 0 .../components/ExternalSpaceItem.vue | 0 .../components/ExternalSpacesList.vue | 0 .../ExternalSpacesRequestsItems.vue | 0 .../external-spaces-list/initComponents.js | 0 .../vue-apps/external-spaces-list/main.js | 2 +- .../components/ActivityFavoriteItem.vue | 0 .../components/FavoriteItem.vue | 0 .../components/SpaceFavoriteItem.vue | 0 .../components/TopBarFavorites.vue | 0 .../components/TopBarFavoritesButton.vue | 0 .../components/TopBarFavoritesDrawer.vue | 0 .../favorites-list-top-bar/extensions.js | 0 .../favorites-list-top-bar/initComponents.js | 0 .../vue-apps/favorites-list-top-bar/main.js | 2 +- .../components/GeneralSettings.vue | 0 .../components/branding/SiteBranding.vue | 0 .../branding/SiteBrandingWindow.vue | 0 .../form/BackgroundImageAttachment.vue | 0 .../branding/form/BackgroundInput.vue | 0 .../branding/form/BorderRadiusSelector.vue | 0 .../components/branding/form/ColorPicker.vue | 0 .../branding/form/CompanyFavicon.vue | 0 .../components/branding/form/CompanyLogo.vue | 0 .../branding/form/CustomStyleInput.vue | 0 .../branding/form/LoginBackgroundSelector.vue | 0 .../branding/preview/SiteBrandingPreview.vue | 0 .../language/DefaultLanguageDrawer.vue | 0 .../components/login-page/LoginBranding.vue | 0 .../public-site/PublicSiteEditDrawer.vue | 0 .../registration/DefaultSpacesDrawer.vue | 0 .../components/registration/HubAccess.vue | 0 .../general-settings/initComponents.js | 0 .../js/LanguageSettingService.js | 0 .../js/RegistrationService.js | 0 .../webapp/vue-apps/general-settings/main.js | 8 +- .../vue-apps/general-settings/services.js | 0 .../webapp/vue-apps/getting-started/main.js | 0 .../components/HamburgerMenuNavigation.vue | 0 .../HamburgerMenuNavigationButton.vue | 0 .../HamburgerMenuNavigationFirstLevel.vue | 0 .../HamburgerMenuNavigationSecondLevel.vue | 0 .../HamburgerMenuNavigationThirdLevel.vue | 0 .../components/HamburgerMenuParentDrawer.vue | 0 .../components/HamburgerMenuParentSticky.vue | 0 .../profile/ProfileHamburgerNavigation.vue | 0 .../RecentSpacesHamburgerNavigation.vue | 0 .../SpaceHamburgerActionMenu.vue | 0 .../recent-spaces/SpaceNavigationItem.vue | 0 .../SpacePanelHamburgerNavigation.vue | 0 .../SpacesHamburgerNavigation.vue | 0 .../recent-spaces/SpacesNavigationContent.vue | 0 .../recent-spaces/SpacesNavigationEmpty.vue | 0 .../components/site/SiteHamburgerItem.vue | 0 .../site/SiteHamburgerNavigation.vue | 0 .../components/site/SitesHamburger.vue | 0 .../user/UserHamburgerNavigation.vue | 0 .../vue-apps/hamburger-menu/extensions.js | 0 .../vue-apps/hamburger-menu/initComponents.js | 0 .../webapp/vue-apps/hamburger-menu/main.js | 2 +- .../components/GroupsManagement.vue | 0 .../components/GroupsManagementFormDrawer.vue | 0 .../GroupsManagementMembershipFormDrawer.vue | 0 .../GroupsManagementMembershipList.vue | 0 .../GroupsManagementMembershipToolbar.vue | 0 .../components/GroupsManagementTree.vue | 0 .../GroupsManagementTreeGroupMenu.vue | 0 .../components/GroupsManagementTreeItem.vue | 0 .../GroupsManagementTreeToolbar.vue | 0 .../idm-groups-management/initComponents.js | 0 .../vue-apps/idm-groups-management/main.js | 2 +- .../components/MembershipTypesManagement.vue | 0 .../MembershipTypesManagementFormDrawer.vue | 0 .../MembershipTypesManagementList.vue | 0 .../MembershipTypesManagementToolbar.vue | 0 .../initComponents.js | 0 .../idm-membership-types-management/main.js | 2 +- .../components/UsersManagement.vue | 0 .../UsersManagementFilterDrawer.vue | 0 .../UsersManagementImportCSVButton.vue | 0 .../UsersManagementImportCSVErrorMessage.vue | 0 .../UsersManagementImportCSVResult.vue | 0 .../components/UsersManagementList.vue | 0 .../components/UsersManagementToolbar.vue | 0 .../UsersManagementUserFormDrawer.vue | 0 .../UsersManagementUserMembershipDrawer.vue | 0 .../idm-users-management/initComponents.js | 0 .../vue-apps/idm-users-management/main.js | 2 +- .../vue-apps/image/components/ImageApp.vue | 0 .../settings/ImageSettingsDrawer.vue | 0 .../settings/ImageSettingsHeader.vue | 0 .../image/components/view/ImageView.vue | 0 .../webapp/vue-apps/image/initComponents.js | 0 .../src/main/webapp/vue-apps/image/main.js | 2 +- .../vue-apps/links/components/LinksApp.vue | 0 .../settings/LinkDisplayPreview.vue | 0 .../components/settings/LinkFormDrawer.vue | 0 .../components/settings/LinkIconInput.vue | 0 .../links/components/settings/LinkInput.vue | 0 .../settings/LinkSettingsDrawer.vue | 0 .../links/components/view/LinksCard.vue | 0 .../links/components/view/LinksColumn.vue | 0 .../links/components/view/LinksHeader.vue | 0 .../links/components/view/LinksIcon.vue | 0 .../links/components/view/LinksList.vue | 0 .../webapp/vue-apps/links/initComponents.js | 0 .../webapp/vue-apps/links/js/LinkService.js | 0 .../src/main/webapp/vue-apps/links/main.js | 2 +- .../main/webapp/vue-apps/links/services.js | 0 .../login-common/components/BrandingImage.vue | 0 .../login-common/components/Introduction.vue | 0 .../login-common/components/PageTemplate.vue | 0 .../vue-apps/login-common/initComponents.js | 0 .../main/webapp/vue-apps/login-common/main.js | 0 .../components/ExternalOnboarding.vue | 0 ...ExternalOnboardingAlreadyAuthenticated.vue | 0 .../ExternalOnboardingCreateUserForm.vue | 0 .../components/ExternalOnboardingExpired.vue | 0 .../components/ExternalOnboardingMain.vue | 0 .../initComponents.js | 0 .../login-external-onboarding/main.js | 4 +- .../components/ForgotPassword.vue | 0 .../components/ForgotPasswordEmailForm.vue | 0 .../components/ForgotPasswordExpired.vue | 0 .../components/ForgotPasswordMain.vue | 0 .../components/ForgotPasswordResetForm.vue | 0 .../login-forgot-password/initComponents.js | 0 .../vue-apps/login-forgot-password/main.js | 4 +- .../components/InternalOnboarding.vue | 0 .../components/InternalOnboardingExpired.vue | 0 .../components/InternalOnboardingMain.vue | 0 .../InternalOnboardingResetForm.vue | 0 .../initComponents.js | 0 .../login-internal-onboarding/main.js | 4 +- .../vue-apps/login/components/Login.vue | 0 .../vue-apps/login/components/LoginMain.vue | 0 .../components/LoginMainBottomExtensions.vue | 0 .../components/LoginMainTopExtensions.vue | 0 .../login/components/LoginSeparator.vue | 0 .../components/provider/LoginProviderLink.vue | 0 .../provider/LoginProviderMenuLink.vue | 0 .../components/provider/LoginProviders.vue | 0 .../provider/LoginProvidersMenu.vue | 0 .../webapp/vue-apps/login/initComponents.js | 0 .../src/main/webapp/vue-apps/login/main.js | 4 +- .../components/NotificationAdministration.vue | 0 .../components/NotificationChannels.vue | 0 .../components/NotificationContact.vue | 0 .../components/NotificationPlugins.vue | 0 .../contact/NotificationContactDrawer.vue | 0 .../components/plugin/NotificationPlugin.vue | 0 .../plugin/NotificationPluginDrawer.vue | 0 .../plugin/NotificationPluginGroup.vue | 0 .../initComponents.js | 0 .../js/NotificationAdministration.js | 0 .../notification-administration/main.js | 6 +- .../notification-administration/services.js | 0 .../components/HtmlNotification.vue | 0 .../components/UserEmptyNotifications.vue | 0 .../components/UserNotification.vue | 0 .../components/UserNotificationMenu.vue | 0 .../components/UserNotificationTemplate.vue | 0 .../components/UserNotificationType.vue | 0 .../components/UserNotificationTypes.vue | 0 .../components/UserNotifications.vue | 0 .../components/UserNotificationsList.vue | 0 .../plugins/ActivityCommentPlugin.vue | 0 .../plugins/ActivityMentionPlugin.vue | 0 .../plugins/ActivityReplyToCommentPlugin.vue | 0 .../components/plugins/EditActivityPlugin.vue | 0 .../components/plugins/EditCommentPlugin.vue | 0 .../components/plugins/LikeCommentPlugin.vue | 0 .../components/plugins/LikePlugin.vue | 0 .../components/plugins/NewUser.vue | 0 .../components/plugins/PostActivityPlugin.vue | 0 .../plugins/PostActivitySpaceStreamPlugin.vue | 0 .../RelationshipReceivedRequestPlugin.vue | 0 .../plugins/RequestJoinSpacePlugin.vue | 0 .../SharedActivitySpaceStreamPlugin.vue | 0 .../plugins/SpaceInvitationPlugin.vue | 0 .../plugins/abstract/ActivityBasedPlugin.vue | 0 .../notification-extensions/extensions.js | 0 .../notification-extensions/initComponents.js | 0 .../js/NotificationService.js | 0 .../vue-apps/notification-extensions/main.js | 0 .../notification-extensions/services.js | 0 .../components/TopBarNotification.vue | 0 .../components/TopBarNotificationDrawer.vue | 0 .../notification-top-bar/initComponents.js | 0 .../js/NotificationWebSocket.js | 0 .../vue-apps/notification-top-bar/main.js | 6 +- .../vue-apps/notification-top-bar/services.js | 0 .../UserSettingNotificationChannel.vue | 0 .../UserSettingNotificationDrawer.vue | 0 .../UserSettingNotificationGroup.vue | 0 ...serSettingNotificationMuteSpacesDrawer.vue | 0 .../UserSettingNotificationPlugin.vue | 0 .../components/UserSettingNotifications.vue | 0 .../UserSettingNotificationsWindow.vue | 0 .../initComponents.js | 0 .../notification-user-settings/main.js | 4 +- .../components/OrganizationalChartApp.vue | 0 .../OrganizationalChartSettingsDrawer.vue | 0 .../components/view/ChartUserCompactCard.vue | 0 .../components/view/OrganizationalChart.vue | 0 .../view/OrganizationalChartHeader.vue | 0 .../extensions/extensions.js | 0 .../organizational-chart/extensions/main.js | 2 +- .../organizational-chart/initComponents.js | 0 .../vue-apps/organizational-chart/main.js | 4 +- .../components/PageNotFound.vue | 0 .../vue-apps/page-not-found/initComponents.js | 0 .../webapp/vue-apps/page-not-found/main.js | 2 +- .../components/AdvancedFilterInputItem.vue | 0 .../components/PeopleAdvancedFilterDrawer.vue | 0 .../people-list/components/PeopleCardList.vue | 0 .../people-list/components/PeopleList.vue | 0 .../people-list/components/PeopleToolbar.vue | 0 .../components/usercard/PeopleCard.vue | 0 .../components/usercard/PeopleUserCard.vue | 0 .../usercard/PeopleUserCardRoles.vue | 0 .../usercard/PeopleUserCompactCard.vue | 0 .../components/usercard/PeopleUserMenu.vue | 0 .../usercard/PeopleUserMenuItem.vue | 0 .../components/usercard/PeopleUserRole.vue | 0 .../webapp/vue-apps/people-list/extensions.js | 0 .../vue-apps/people-list/initComponents.js | 0 .../vue-apps/people-list/main-components.js | 0 .../main/webapp/vue-apps/people-list/main.js | 2 +- .../components/PeopleOverview.vue | 0 .../components/PeopleOverviewCard.vue | 0 .../components/PeopleOverviewDrawer.vue | 0 .../components/PeopleOverviewPeopleList.vue | 0 .../PeopleOverviewPeopleListItem.vue | 0 .../people-overview/initComponents.js | 0 .../webapp/vue-apps/people-overview/main.js | 2 +- .../components/PlatformSettings.vue | 0 .../platform-settings/initComponents.js | 0 .../webapp/vue-apps/platform-settings/main.js | 2 +- .../vue-apps/popover/components/Popover.vue | 0 .../popover/components/PopoverMenu.vue | 0 .../SpaceMuteNotificationButton.vue | 0 .../components/SpacePopoverContent.vue | 0 .../popover/components/UserPopoverContent.vue | 0 .../popover/components/UsersListDrawer.vue | 0 .../webapp/vue-apps/popover/initComponents.js | 0 .../src/main/webapp/vue-apps/popover/main.js | 6 +- .../components/ProfileAboutMe.vue | 0 .../profile-about-me/initComponents.js | 0 .../webapp/vue-apps/profile-about-me/main.js | 2 +- .../ProfileContactEditMultiField.vue | 0 .../ProfileContactEditMultiFieldSelect.vue | 0 .../components/ProfileContactInformation.vue | 0 .../ProfileContactInformationDrawer.vue | 0 .../ProfileContactUserTypeProperty.vue | 0 .../components/ProfileHiddenPropertyInfo.vue | 0 .../components/ProfileHidePropertyButton.vue | 0 .../components/ProfileMultiValuedProperty.vue | 0 .../ProfileSingleValuedProperty.vue | 0 .../ProfileUserTypePropertyValues.vue | 0 .../components/QuickSearchUsersListDrawer.vue | 0 .../initComponents.js | 0 .../profile-contact-information/main.js | 6 +- .../components/ProfileHeader.vue | 0 .../components/ProfileHeaderActions.vue | 0 .../components/ProfileHeaderAvatar.vue | 0 .../components/ProfileHeaderBannerButton.vue | 0 .../components/ProfileHeaderText.vue | 0 .../vue-apps/profile-header/extension.js | 0 .../vue-apps/profile-header/initComponents.js | 0 .../webapp/vue-apps/profile-header/main.js | 4 +- .../components/ProfileAttributeSettings.vue | 0 .../components/ProfileSettings.vue | 0 .../components/ProfileSettingsHeader.vue | 0 .../components/ProfileSettingsTable.vue | 0 .../components/cells/SettingsActionsCell.vue | 0 .../drawers/ProfilePropertyLabels.vue | 0 .../drawers/ProfileSettingFormDrawer.vue | 0 .../components/drawers/PropertyLabel.vue | 0 .../drawers/UserCardSettingsDrawer.vue | 0 .../menu/ProfileSettingsActionMenu.vue | 0 .../views/ProfileSettingsOption.vue | 0 .../profile-settings/initComponents.js | 0 .../webapp/vue-apps/profile-settings/main.js | 2 +- .../ProfileWorkExperienceDrawer.vue | 0 .../ProfileWorkExperienceEditItem.vue | 0 .../components/ProfileWorkExperienceItem.vue | 0 .../components/ProfileWorkExperiences.vue | 0 .../profile-work-experience/initComponents.js | 0 .../vue-apps/profile-work-experience/main.js | 2 +- .../components/SearchActivityCard.vue | 0 .../search-activity/initComponents.js | 0 .../webapp/vue-apps/search-activity/main.js | 0 .../components/SearchPeopleCard.vue | 0 .../vue-apps/search-people/initComponents.js | 0 .../webapp/vue-apps/search-people/main.js | 0 .../components/SearchSpaceCard.vue | 0 .../vue-apps/search-space/initComponents.js | 0 .../main/webapp/vue-apps/search-space/main.js | 0 .../search/components/SearchApplication.vue | 2 +- .../search/components/SearchResultCard.vue | 0 .../search/components/SearchResults.vue | 0 .../search/components/SearchTagList.vue | 0 .../search/components/SearchTagSelector.vue | 0 .../search/components/SearchToolbar.vue | 0 .../webapp/vue-apps/search/initComponents.js | 0 .../src/main/webapp/vue-apps/search/main.js | 0 .../site-details/components/SiteDetails.vue | 0 .../components/SiteNavigationItem.vue | 0 .../components/SiteNavigationTree.vue | 0 .../vue-apps/site-details/initComponents.js | 0 .../main/webapp/vue-apps/site-details/main.js | 0 .../space-access/components/SpaceAccess.vue | 0 .../vue-apps/space-access/initComponents.js | 0 .../main/webapp/vue-apps/space-access/main.js | 2 +- .../space-header/components/SpaceHeader.vue | 0 .../vue-apps/space-header/initComponents.js | 0 .../main/webapp/vue-apps/space-header/main.js | 2 +- .../space-infos-app/components/SpaceInfos.vue | 0 .../space-infos-app/initComponents.js | 0 .../webapp/vue-apps/space-infos-app/main.js | 2 +- .../components/SpaceInviteButtonsGroup.vue | 0 .../drawer/SpaceInviteInputEmailDrawer.vue | 0 .../drawer/SpaceInviteInputUsersDrawer.vue | 0 .../drawer/SpaceInvitePendingDrawer.vue | 0 .../components/form/SpaceInviteButton.vue | 0 .../list/SpaceInviteEmailListItem.vue | 0 .../components/list/SpaceSettingRoleList.vue | 0 .../list/SpaceSettingRoleListItem.vue | 0 .../space-invitation/initComponents.js | 0 .../webapp/vue-apps/space-invitation/main.js | 0 .../space-members/components/SpaceMembers.vue | 0 .../components/SpaceMembersAlert.vue | 0 .../components/SpaceMembersToolbar.vue | 0 .../vue-apps/space-members/extensions.js | 0 .../vue-apps/space-members/initComponents.js | 0 .../webapp/vue-apps/space-members/main.js | 2 +- .../space-menu/components/SpaceMenu.vue | 0 .../space-menu/components/SpaceMenuItem.vue | 0 .../vue-apps/space-menu/initComponents.js | 0 .../main/webapp/vue-apps/space-menu/main.js | 0 .../components/SpaceSettings.vue | 0 .../drawer/SpaceSettingAccessDrawer.vue | 0 .../drawer/SpaceSettingPublicSiteDrawer.vue | 0 .../drawer/SpaceSettingRedactorDrawer.vue | 0 .../drawer/SpaceSettingUsersListDrawer.vue | 0 .../SpaceSettingUsersSelectionDrawer.vue | 0 .../components/form/SpaceSettingAvatar.vue | 0 .../components/form/SpaceSettingBanner.vue | 0 .../form/SpaceSettingUsersListToolbar.vue | 0 .../components/main/SpaceSettingAccess.vue | 0 .../components/main/SpaceSettingOverview.vue | 0 .../main/SpaceSettingPublicSite.vue | 0 .../components/main/SpaceSettingRoles.vue | 0 .../section/SpaceSettingOverviewSection.vue | 0 .../section/SpaceSettingRolesSection.vue | 0 .../section/roles/SpaceSettingRolesTable.vue | 0 .../roles/SpaceSettingRolesTableItem.vue | 0 .../vue-apps/space-settings/initComponents.js | 0 .../webapp/vue-apps/space-settings/main.js | 4 +- .../components/SpaceHostsDrawer.vue | 0 .../components/SpaceLogoBanner.vue | 0 .../SpacePopoverActionComponents.vue | 0 .../space-top-bannerlogo/extension.js | 0 .../space-top-bannerlogo/initComponents.js | 0 .../vue-apps/space-top-bannerlogo/main.js | 4 +- .../SpaceDescriptionApplication.vue | 0 .../initComponents.js | 0 .../vue-apps/space-widget-description/main.js | 2 +- .../components/SpaceManagersApplication.vue | 0 .../space-widget-managers/initComponents.js | 0 .../vue-apps/space-widget-managers/main.js | 2 +- .../components/SpaceMembersApplication.vue | 0 .../components/SpaceMembersDrawer.vue | 0 .../space-widget-members/initComponents.js | 0 .../vue-apps/space-widget-members/main.js | 4 +- .../ExoSpacesAdministrationBindingReports.vue | 0 .../ExoSpacesAdministrationManageSpaces.vue | 0 .../ExoSpacesAdministrationSpaces.vue | 0 ...oSpacesAdministrationSpacesPermissions.vue | 0 .../drawer/ExoGroupBindingDrawer.vue | 0 .../ExoGroupBindingSecondLevelDrawer.vue | 0 .../modal/ExoSpacesAdministrationModal.vue | 0 .../modal/SpaceHomeLayoutResetConfirm.vue | 0 .../spaces-administration/initComponents.js | 0 .../js/SpacesAdministrationServices.js | 0 .../vue-apps/spaces-administration/main.js | 4 +- .../spaces-administration/services.js | 0 .../spaces-list/components/SpaceCard.vue | 0 .../components/SpaceCardButton.vue | 0 .../spaces-list/components/SpaceCardMenu.vue | 0 .../components/SpaceCardMenuItem.vue | 0 .../components/SpaceCardUnreadBadge.vue | 0 .../components/SpaceFavoriteAction.vue | 0 .../components/SpaceFormDrawer.vue | 0 .../components/SpacePendingButton.vue | 0 .../components/SpacePendingDrawer.vue | 0 .../spaces-list/components/SpaceRoleList.vue | 0 .../components/SpaceRoleListItem.vue | 0 .../spaces-list/components/SpacesCardList.vue | 0 .../spaces-list/components/SpacesList.vue | 0 .../components/SpacesListFilterDrawer.vue | 0 .../spaces-list/components/SpacesToolbar.vue | 0 .../vue-apps/spaces-list/initComponents.js | 0 .../main/webapp/vue-apps/spaces-list/main.js | 2 +- .../components/SpacesOverview.vue | 0 .../components/SpacesOverviewCard.vue | 0 .../components/SpacesOverviewDrawer.vue | 0 .../components/SpacesOverviewSpacesList.vue | 0 .../SpacesOverviewSpacesListItem.vue | 0 .../spaces-overview/initComponents.js | 0 .../webapp/vue-apps/spaces-overview/main.js | 2 +- .../ExoSuggestionsPeopleAndSpace.vue | 0 .../ExoSuggestionsPeopleListItem.vue | 0 .../ExoSuggestionsSpaceListItem.vue | 0 .../initComponents.js | 0 .../vue-apps/suggestions-people-space/main.js | 2 +- .../top-bar-login/components/TopBarLogin.vue | 0 .../vue-apps/top-bar-login/initComponents.js | 0 .../webapp/vue-apps/top-bar-login/main.js | 2 +- .../components/NavigationMenuItem.vue | 0 .../components/NavigationMenuSubItem.vue | 0 .../components/TopBarNavigationMenu.vue | 0 .../mobile/NavigationMobileMenuItem.vue | 0 .../mobile/NavigationMobileMenuSubItem.vue | 0 .../vue-apps/top-bar-menu/initComponents.js | 0 .../main/webapp/vue-apps/top-bar-menu/main.js | 2 +- .../components/TopBarPreview.vue | 0 .../top-bar-preview/initComponents.js | 0 .../webapp/vue-apps/top-bar-preview/main.js | 2 +- .../components/TopBarPublishSite.vue | 0 .../top-bar-publish-site/initComponents.js | 0 .../vue-apps/top-bar-publish-site/main.js | 2 +- .../components/OnboardingRegister.vue | 0 .../user-register-onboarding/extensions.js | 0 .../initComponents.js | 0 .../vue-apps/user-register-onboarding/main.js | 0 .../user-register/components/Register.vue | 0 .../components/RegisterExtensions.vue | 0 .../user-register/components/RegisterMain.vue | 0 .../components/RegisterSeparator.vue | 0 .../vue-apps/user-register/initComponents.js | 0 .../webapp/vue-apps/user-register/main.js | 4 +- .../components/UserLanguageDrawer.vue | 0 .../components/UserSettingLanguage.vue | 0 .../user-setting-language/initComponents.js | 0 .../vue-apps/user-setting-language/main.js | 2 +- .../components/UserSettingSecurity.vue | 0 .../components/UserSettingSecurityWindow.vue | 0 .../user-setting-security/initComponents.js | 0 .../vue-apps/user-setting-security/main.js | 2 +- .../components/VersionCard.vue | 0 .../components/VersionHistoryDrawer.vue | 0 .../version-history-drawer/initComponents.js | 0 .../vue-apps/version-history-drawer/main.js | 0 .../components/VerticalMenuApp.vue | 0 .../components/VerticalMenuButton.vue | 0 .../components/VerticalMenuContent.vue | 0 .../components/VerticalMenuDrawer.vue | 0 .../vue-apps/vertical-menu/initComponents.js | 0 .../webapp/vue-apps/vertical-menu/main.js | 0 .../components/ExoWhoIsOnline.vue | 0 .../components/initComponents.js | 0 .../webapp/vue-apps/who-is-online-app/main.js | 2 +- .../who-is-online-app/whoIsOnlineServices.js | 0 webapp/{portlet => }/webpack.common.js | 0 webapp/{portlet => }/webpack.dev.js | 2 +- webapp/{portlet => }/webpack.prod.js | 2 +- 2193 files changed, 408 insertions(+), 944 deletions(-) delete mode 100644 extension/pom.xml delete mode 100644 extension/war/pom.xml delete mode 100644 extension/war/src/main/webapp/WEB-INF/conf/social-extension/ckeditor/attach-image-plugin.js delete mode 100644 extension/war/src/main/webapp/WEB-INF/web.xml rename webapp/{portlet => }/.eslintrc.json (100%) rename webapp/{portlet => }/package-lock.json (99%) rename webapp/{portlet => }/package.json (96%) delete mode 100644 webapp/portlet/pom.xml rename webapp/{portlet => }/src/main/java/io/meeds/social/portlet/ImagePortlet.java (100%) rename webapp/{portlet => }/src/main/java/io/meeds/social/portlet/LinkPortlet.java (100%) rename webapp/{portlet => }/src/main/java/org/exoplatform/social/portlet/SpaceHeaderPortlet.java (100%) rename webapp/{portlet => }/src/main/java/org/exoplatform/social/portlet/SpaceMenuPortlet.java (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_ar.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_aro.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_az.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_ca.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_ceb.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_co.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_cs.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_de.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_el.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_en.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_es_ES.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_eu.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_fa.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_fi.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_fil.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_fr.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_he.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_hi.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_hu.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_id.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_in.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_it.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_ja.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_kab.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_ko.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_lt.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_ms.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_nl.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_no.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_pcm.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_pl.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_pt_BR.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_pt_PT.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_ro.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_ru.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_sk.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_sl.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_sq.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_sv_SE.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_th.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_tl.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_tr.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_uk.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_ur_IN.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_vi.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_zh_CN.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/notification/template/Notification_zh_TW.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_ar.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_aro.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_az.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_ca.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_ceb.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_co.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_cs.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_de.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_el.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_en.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_es_ES.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_eu.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_fa.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_fi.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_fil.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_fr.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_hi.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_hu.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_id.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_in.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_it.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_ja.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_kab.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_ko.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_lt.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_ms.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_nl.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_no.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_pcm.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_pl.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_pt_BR.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_pt_PT.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_ro.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_ru.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_sk.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_sl.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_sq.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_sv_SE.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_th.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_tl.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_tr.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_uk.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_ur_IN.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_vi.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_zh_CN.properties (100%) rename {extension/war => webapp}/src/main/resources/locale/portal/HamburgerMenu_zh_TW.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_ar.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_aro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_az.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_ca.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_ceb.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_co.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_cs.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_de.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_el.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_en.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_es_ES.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_eu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_fa.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_fi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_fil.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_fr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_he.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_hi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_hu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_id.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_in.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_it.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_ja.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_kab.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_ko.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_lt.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_ms.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_nl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_no.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_pcm.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_pl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_pt_BR.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_pt_PT.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_ro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_ru.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_sk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_sl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_sq.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_sv_SE.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_th.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_tl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_tr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_uk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_ur_IN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_vi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_zh_CN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portal_zh_TW.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_ar.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_aro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_az.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_ca.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_ceb.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_co.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_cs.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_de.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_el.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_en.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_es_ES.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_eu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_fa.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_fi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_fil.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_fr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_hi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_hu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_id.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_in.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_it.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_ja.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_ko.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_lt.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_ms.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_nl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_no.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_pcm.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_pl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_pt_BR.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_pt_PT.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_ro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_ru.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_sk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_sl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_sq.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_sv_SE.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_th.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_tl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_tr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_uk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_ur_IN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_vi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_zh_CN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/GeneralSettings_zh_TW.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_ar.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_aro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_az.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_ca.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_ceb.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_co.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_cs.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_de.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_el.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_en.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_es_ES.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_eu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_fa.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_fi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_fil.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_fr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_hi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_hu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_id.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_it.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_ja.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_ko.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_lt.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_ms.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_nl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_no.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_pcm.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_pl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_pt_BR.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_pt_PT.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_ro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_ru.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_sk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_sl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_sq.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_sv_SE.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_th.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_tl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_tr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_uk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_ur_IN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_vi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_zh_CN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Image_zh_TW.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_ar.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_aro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_az.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_ca.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_ceb.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_co.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_cs.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_de.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_el.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_en.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_es_ES.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_eu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_fa.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_fi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_fil.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_fr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_hi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_hu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_id.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_in.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_it.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_ja.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_ko.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_lt.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_ms.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_nl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_no.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_pcm.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_pl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_pt_BR.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_pt_PT.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_ro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_ru.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_sk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_sl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_sq.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_sv_SE.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_th.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_tl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_tr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_uk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_ur_IN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_vi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_zh_CN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Links_zh_TW.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_ar.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_aro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_az.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_ca.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_ceb.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_co.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_cs.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_de.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_el.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_en.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_es_ES.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_eu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_fa.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_fi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_fil.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_fr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_hi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_hu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_id.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_in.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_it.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_ja.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_ko.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_lt.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_ms.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_nl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_no.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_pcm.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_pl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_pt_BR.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_pt_PT.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_ro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_ru.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_sk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_sl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_sq.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_sv_SE.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_th.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_tl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_tr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_uk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_ur_IN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_vi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_zh_CN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Login_zh_TW.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_ar.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_aro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_az.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_ca.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_ceb.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_co.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_cs.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_de.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_el.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_en.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_es_ES.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_eu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_fa.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_fi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_fil.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_fr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_hi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_hu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_id.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_in.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_it.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_ja.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_ko.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_lt.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_ms.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_nl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_no.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_pcm.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_pl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_pt_BR.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_pt_PT.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_ro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_ru.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_sk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_sl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_sq.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_sv_SE.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_th.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_tl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_tr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_uk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_ur_IN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_vi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_zh_CN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/NotificationAdministration_zh_TW.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_ar.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_aro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_az.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_ca.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_ceb.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_co.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_cs.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_de.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_el.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_en.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_es_ES.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_eu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_fa.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_fi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_fil.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_fr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_hi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_hu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_id.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_it.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_ja.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_ko.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_lt.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_ms.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_nl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_no.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_pcm.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_pl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_pt_BR.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_pt_PT.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_ro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_ru.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_sk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_sl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_sq.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_sv_SE.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_th.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_tl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_tr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_uk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_ur_IN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_vi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_zh_CN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/PlatformSettings_zh_TW.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_ar.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_aro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_az.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_ca.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_ceb.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_co.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_cs.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_de.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_el.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_en.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_es_ES.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_eu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_fa.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_fi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_fil.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_fr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_he.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_hi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_hu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_id.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_in.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_it.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_ja.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_kab.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_ko.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_lt.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_ms.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_nl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_no.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_pcm.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_pl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_pt_BR.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_pt_PT.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_ro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_ru.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_sk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_sl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_sq.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_sv_SE.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_th.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_tl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_tr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_uk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_ur_IN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_vi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_zh_CN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/Portlets_zh_TW.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_ar.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_aro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_az.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_ca.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_ceb.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_co.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_cs.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_de.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_el.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_en.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_es_ES.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_eu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_fa.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_fi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_fil.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_fr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_hi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_hu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_id.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_in.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_it.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_ja.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_ko.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_lt.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_ms.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_nl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_no.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_pcm.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_pl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_pt_BR.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_pt_PT.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_ro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_ru.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_sk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_sl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_sq.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_sv_SE.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_th.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_tl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_tr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_uk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_ur_IN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_vi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_zh_CN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/UserNotificationPortlet_zh_TW.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_ar.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_aro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_az.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_ca.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_ceb.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_co.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_cs.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_de.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_el.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_en.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_es_ES.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_eu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_fa.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_fi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_fil.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_fr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_hi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_hu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_id.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_it.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_ja.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_ko.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_lt.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_ms.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_nl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_no.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_pcm.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_pl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_pt_BR.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_pt_PT.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_ro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_ru.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_sk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_sl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_sq.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_sv_SE.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_th.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_tl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_tr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_uk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_ur_IN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_vi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_zh_CN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ComplementaryFilter_zh_TW.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ar.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_aro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_az.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ca.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ceb.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_co.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_cs.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_de.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_el.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_en.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_es_ES.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_eu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_fa.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_fi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_fil.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_fr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_hi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_hu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_id.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_in.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_it.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ja.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_kab.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ko.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_lt.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ms.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_nl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_no.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_pcm.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_pl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_pt_BR.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_pt_PT.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ru.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_sk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_sl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_sq.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_sv_SE.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_th.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_tl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_tr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_uk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ur_IN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_vi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_zh_CN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_zh_TW.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_ar.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_aro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_az.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_ca.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_ceb.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_co.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_cs.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_de.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_el.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_en.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_es_ES.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_eu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_fa.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_fi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_fil.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_fr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_hi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_hu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_id.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_in.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_it.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_ja.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_kab.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_ko.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_lt.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_ms.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_nl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_no.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_pcm.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_pl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_pt_BR.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_pt_PT.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_ro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_ru.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_sk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_sl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_sq.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_sv_SE.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_th.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_tl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_tr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_uk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_ur_IN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_vi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_zh_CN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/GettingStartedPortlet_zh_TW.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_ar.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_aro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_az.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_ca.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_ceb.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_co.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_cs.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_de.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_el.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_en.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_es_ES.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_eu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_fa.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_fi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_fil.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_fr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_hi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_hu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_id.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_in.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_it.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_ja.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_kab.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_ko.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_lt.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_ms.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_nl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_no.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_pcm.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_pl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_pt_BR.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_pt_PT.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_ro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_ru.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_sk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_sl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_sq.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_sv_SE.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_th.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_tl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_tr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_uk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_ur_IN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_vi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_zh_CN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleListApplication_zh_TW.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_ar.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_aro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_az.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_ca.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_ceb.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_co.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_cs.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_de.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_el.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_en.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_es_ES.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_eu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_fa.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_fi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_fil.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_fr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_hi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_hu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_id.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_in.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_it.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_ja.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_kab.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_ko.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_lt.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_ms.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_nl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_no.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_pcm.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_pl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_pt_BR.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_pt_PT.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_ro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_ru.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_sk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_sl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_sq.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_sv_SE.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_th.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_tl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_tr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_uk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_ur_IN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_vi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_zh_CN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/PeopleOverview_zh_TW.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_ar.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_aro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_az.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_ca.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_ceb.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_co.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_cs.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_de.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_el.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_en.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_es_ES.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_eu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_fa.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_fi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_fil.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_fr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_hi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_hu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_id.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_in.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_it.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_ja.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_kab.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_ko.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_lt.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_ms.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_nl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_no.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_pcm.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_pl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_pt_BR.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_pt_PT.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_ro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_ru.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_sk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_sl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_sq.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_sv_SE.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_th.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_tl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_tr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_uk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_ur_IN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_vi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_zh_CN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileAboutMe_zh_TW.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_ar.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_aro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_az.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_ca.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_ceb.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_co.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_cs.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_de.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_el.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_en.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_es_ES.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_eu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_fa.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_fi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_fil.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_fr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_hi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_hu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_id.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_in.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_it.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_ja.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_kab.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_ko.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_lt.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_ms.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_nl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_no.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_pcm.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_pl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_pt_BR.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_pt_PT.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_ro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_ru.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_sk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_sl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_sq.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_sv_SE.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_th.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_tl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_tr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_uk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_ur_IN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_vi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_zh_CN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileContactInformation_zh_TW.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_ar.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_aro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_az.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_ca.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_ceb.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_co.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_cs.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_de.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_el.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_en.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_es_ES.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_eu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_fa.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_fi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_fil.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_fr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_hi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_hu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_id.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_in.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_it.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_ja.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_kab.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_ko.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_lt.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_ms.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_nl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_no.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_pcm.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_pl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_pt_BR.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_pt_PT.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_ro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_ru.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_sk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_sl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_sq.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_sv_SE.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_th.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_tl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_tr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_uk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_ur_IN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_vi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_zh_CN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileHeader_zh_TW.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_ar.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_aro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_az.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_ca.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_ceb.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_co.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_cs.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_de.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_el.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_en.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_es_ES.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_eu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_fa.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_fi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_fil.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_fr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_hi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_hu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_id.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_in.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_it.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_ja.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_kab.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_ko.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_lt.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_ms.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_nl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_no.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_pcm.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_pl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_pt_BR.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_pt_PT.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_ro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_ru.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_sk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_sl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_sq.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_sv_SE.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_th.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_tl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_tr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_uk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_ur_IN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_vi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_zh_CN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/ProfileWorkExperience_zh_TW.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ar.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_aro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_az.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ca.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ceb.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_co.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_cs.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_de.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_el.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_en.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_es_ES.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_eu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_fa.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_fi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_fil.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_fr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_hi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_hu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_id.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_in.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_it.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ja.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_kab.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ko.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_lt.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ms.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_nl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_no.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_pcm.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_pl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_pt_BR.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_pt_PT.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ru.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_sk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_sl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_sq.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_sv_SE.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_th.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_tl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_tr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_uk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ur_IN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_vi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_zh_CN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpaceInfosPortlet_zh_TW.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ar.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_aro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_az.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ca.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ceb.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_co.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_cs.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_de.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_el.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_en.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_es_ES.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_eu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_fa.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_fi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_fil.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_fr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_hi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_hu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_id.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_in.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_it.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ja.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_kab.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ko.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_lt.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ms.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_nl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_no.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_pcm.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_pl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_pt_BR.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_pt_PT.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ru.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_sk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_sl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_sq.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_sv_SE.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_th.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_tl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_tr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_uk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ur_IN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_vi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_zh_CN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_zh_TW.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_ar.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_aro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_az.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_ca.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_ceb.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_co.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_cs.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_de.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_el.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_en.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_es_ES.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_eu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_fa.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_fi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_fil.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_fr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_hi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_hu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_id.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_in.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_it.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_ja.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_kab.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_ko.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_lt.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_ms.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_nl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_no.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_pcm.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_pl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_pt_BR.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_pt_PT.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_ro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_ru.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_sk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_sl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_sq.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_sv_SE.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_th.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_tl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_tr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_uk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_ur_IN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_vi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_zh_CN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesListApplication_zh_TW.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_ar.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_aro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_az.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_ca.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_ceb.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_co.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_cs.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_de.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_el.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_en.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_es_ES.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_eu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_fa.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_fi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_fil.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_fr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_hi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_hu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_id.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_in.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_it.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_ja.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_kab.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_ko.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_lt.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_ms.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_nl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_no.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_pcm.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_pl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_pt_BR.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_pt_PT.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_ro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_ru.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_sk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_sl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_sq.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_sv_SE.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_th.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_tl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_tr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_uk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_ur_IN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_vi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_zh_CN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SpacesOverview_zh_TW.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_ar.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_aro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_az.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_ca.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_ceb.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_co.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_cs.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_de.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_el.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_en.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_es_ES.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_eu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_fa.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_fi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_fil.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_fr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_hi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_hu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_id.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_in.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_it.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_ja.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_kab.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_ko.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_lt.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_ms.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_nl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_no.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_pcm.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_pl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_pt_BR.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_pt_PT.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_ro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_ru.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_sk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_sl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_sq.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_sv_SE.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_th.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_tl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_tr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_uk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_ur_IN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_vi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_zh_CN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/SuggestionsPortlet_zh_TW.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_ar.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_aro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_az.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_ca.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_ceb.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_co.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_cs.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_de.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_el.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_en.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_es_ES.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_eu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_fa.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_fi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_fil.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_fr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_hi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_hu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_id.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_in.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_it.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_ja.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_kab.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_ko.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_lt.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_ms.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_nl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_no.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_pcm.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_pl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_pt_BR.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_pt_PT.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_ro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_ru.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_sk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_sl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_sq.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_sv_SE.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_th.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_tl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_tr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_uk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_ur_IN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_vi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_zh_CN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserPopup_zh_TW.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_ar.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_aro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_az.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_ca.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_ceb.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_co.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_cs.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_de.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_el.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_en.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_es_ES.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_eu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_fa.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_fi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_fil.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_fr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_hi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_hu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_id.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_in.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_it.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_ja.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_kab.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_ko.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_lt.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_ms.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_nl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_no.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_pcm.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_pl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_pt_BR.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_pt_PT.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_ro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_ru.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_sk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_sl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_sq.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_sv_SE.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_th.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_tl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_tr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_uk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_ur_IN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_vi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_zh_CN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/social/UserSettings_zh_TW.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_ar.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_aro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_az.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_ca.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_ceb.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_co.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_cs.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_de.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_el.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_en.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_es_ES.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_eu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_fa.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_fi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_fil.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_fr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_he.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_hi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_hu.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_id.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_in.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_it.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_ja.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_kab.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_ko.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_lt.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_ms.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_nl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_no.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_pcm.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_pl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_pt_BR.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_pt_PT.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_ro.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_ru.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_sk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_sl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_sq.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_sv_SE.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_th.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_tl.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_tr.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_uk.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_ur_IN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_vi.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_zh_CN.properties (100%) rename webapp/{portlet => }/src/main/resources/locale/portlet/whoisonline/whoisonline_zh_TW.properties (100%) rename webapp/{portlet => }/src/main/webapp/META-INF/context.xml (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/conf/configuration.xml (100%) create mode 100644 webapp/src/main/webapp/WEB-INF/conf/social-extension/ckeditor/attach-image-plugin.js rename {extension/war => webapp}/src/main/webapp/WEB-INF/conf/social-extension/ckeditor/config.js (98%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/conf/social-extension/organization/organization-configuration.xml (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/conf/social-extension/portal/dynamic-container-configuration.xml (96%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/conf/social-extension/portal/social-portal-configuration.xml (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/conf/social-extension/portal/upgrade-plugins-configuration.xml (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/conf/social-extension/social/cache-configuration.xml (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/conf/social-extension/social/ckeditor-configuration.xml (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/conf/social-extension/social/common-configuration.xml (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/conf/social-extension/social/component-plugins-configuration.xml (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/conf/social-extension/social/core-configuration.xml (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/conf/social-extension/social/indexing-configuration.xml (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/conf/social-extension/social/metadata-plugins-configuration.xml (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/conf/social-extension/social/notification-configuration.xml (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/conf/social-extension/social/notification-plugins-configuration.xml (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/conf/social-extension/social/permlink-configuration.xml (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/conf/social-extension/social/profileproperty/profile-property-configuration.xml (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/conf/social-extension/social/search-configuration.xml (98%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/conf/social-extension/social/search/activities-search-query.json (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/conf/social-extension/social/search/spaces-count-query.json (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/conf/social-extension/social/search/spaces-search-query.json (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/conf/social-extension/social/service-configuration.xml (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/conf/social-extension/social/social-configuration.xml (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/conf/social-extension/social/space-template/communication/banner.png (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/conf/social-extension/social/space-template/community/banner.png (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/conf/social-extension/social/space-template/project/banner.png (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/conf/social-extension/social/space-template/team/banner.png (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/conf/social-extension/social/spaces-templates-configuration.xml (96%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/conf/social-extension/social/upgrade-configuration.xml (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/conf/social-extension/social/websocket-configuration.xml (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/conf/social-extension/social/webui-configuration.xml (100%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/gatein-resources.xml (97%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/externalRegistration/init_account.jsp (100%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/forgotpassword/forgot_password.jsp (100%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/login/login.jsp (100%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/login/oauth_invitation.jsp (97%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/login/oauth_register.jsp (98%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/onboarding/reset_password.jsp (100%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/activityStream.jsp (100%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/breadcrumb.jsp (81%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/generalSettings.jsp (93%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/gettingStarted.jsp (98%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/hamburgerMenu.jsp (97%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/image.jsp (91%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/links.jsp (82%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/organizationalChart.jsp (98%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/peopleList.jsp (89%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/peopleOverview.jsp (100%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/platformSettings.jsp (94%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/profileAboutMe.jsp (84%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/profileContactInformation.jsp (95%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/profileHeader.jsp (88%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/profileSettings.jsp (94%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/profileWorkExperience.jsp (84%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/search.jsp (96%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/spaceAccess.jsp (96%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/spaceBanner.jsp (90%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/spaceHeader.jsp (94%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/spaceInformation.jsp (100%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/spaceMembers.jsp (96%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/spaceMenu.jsp (97%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/spaceSettings.jsp (90%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/spaceWidgetDescription.jsp (90%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/spaceWidgetManagers.jsp (98%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/spaceWidgetMembers.jsp (98%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/spacesList.jsp (93%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/suggestions.jsp (90%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/topBarMenu.jsp (89%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/topBarPublishSite.jsp (93%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/topbarLogin.jsp (97%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/topbarLogo.jsp (100%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/topbarNotification.jsp (91%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/userSettingLanguage.jsp (90%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/userSettingNotifications.jsp (96%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/userSettingSecurity.jsp (90%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/portlet/whoIsOnline.jsp (97%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/register/register.jsp (100%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/jsp/welcome-screens/accountSetup.jsp (96%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/notification/templates/ActivityCommentPlugin.gtmpl (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/notification/templates/ActivityMentionPlugin.gtmpl (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/notification/templates/ActivityReplyToCommentPlugin.gtmpl (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/notification/templates/EditActivityPlugin.gtmpl (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/notification/templates/EditCommentPlugin.gtmpl (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/notification/templates/LikeCommentPlugin.gtmpl (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/notification/templates/LikePlugin.gtmpl (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/notification/templates/NewUserPlugin.gtmpl (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/notification/templates/PostActivityPlugin.gtmpl (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/notification/templates/PostActivitySpaceStreamPlugin.gtmpl (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/notification/templates/RelationshipReceivedRequestPlugin.gtmpl (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/notification/templates/RequestJoinSpacePlugin.gtmpl (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/notification/templates/SharedActivitySpaceStreamPlugin.gtmpl (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/notification/templates/SpaceInvitationPlugin.gtmpl (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/notification/templates/activities/DefaultActivity.gtmpl (100%) rename {extension/war => webapp}/src/main/webapp/WEB-INF/notification/templates/activities/NotificationLinkActivity.gtmpl (100%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/portlet.xml (99%) rename webapp/{portlet => }/src/main/webapp/WEB-INF/web.xml (98%) rename webapp/{portlet => }/src/main/webapp/groovy/social/webui/UISocialPortalApplicationHead.gtmpl (100%) rename webapp/{portlet => }/src/main/webapp/groovy/social/webui/UISocialPreloadHead.gtmpl (100%) rename webapp/{portlet => }/src/main/webapp/html/blank.html (100%) rename webapp/{portlet => }/src/main/webapp/html/drawersOverlay.html (100%) rename webapp/{portlet => }/src/main/webapp/html/externalSpaceList.html (72%) rename webapp/{portlet => }/src/main/webapp/html/idmGroupsManagement.html (71%) rename webapp/{portlet => }/src/main/webapp/html/idmMembershipTypesManagement.html (69%) rename webapp/{portlet => }/src/main/webapp/html/idmUsersManagement.html (71%) rename webapp/{portlet => }/src/main/webapp/html/notificationAdministration.html (70%) rename webapp/{portlet => }/src/main/webapp/html/pageNotFound.html (83%) rename webapp/{portlet => }/src/main/webapp/html/spacesAdministration.html (71%) rename webapp/{portlet => }/src/main/webapp/html/spacesOverview.html (70%) rename webapp/{portlet => }/src/main/webapp/html/topbarFavorites.html (86%) rename webapp/{portlet => }/src/main/webapp/html/topbarPreview.html (70%) rename webapp/{portlet => }/src/main/webapp/html/verticalMenu.html (66%) rename webapp/{portlet => }/src/main/webapp/images/cadre.png (100%) rename webapp/{portlet => }/src/main/webapp/images/deprecated/space-access/denyIcon.png (100%) rename webapp/{portlet => }/src/main/webapp/images/deprecated/space-access/lockIcon.png (100%) rename webapp/{portlet => }/src/main/webapp/images/deprecated/space-access/texture.png (100%) rename webapp/{portlet => }/src/main/webapp/images/deprecated/space-access/warningIcon.png (100%) rename webapp/{portlet => }/src/main/webapp/images/deprecated/welcome-screen/uiIconsColor.png (100%) rename webapp/{portlet => }/src/main/webapp/images/emptyCol1.webp (100%) rename webapp/{portlet => }/src/main/webapp/images/emptyCol2.webp (100%) rename webapp/{portlet => }/src/main/webapp/images/emptyCol3.webp (100%) rename webapp/{portlet => }/src/main/webapp/images/empty_pin_stream.png (100%) rename webapp/{portlet => }/src/main/webapp/images/link.jpg (100%) rename webapp/{portlet => }/src/main/webapp/js/BodyScrollListener.js (100%) rename webapp/{portlet => }/src/main/webapp/js/ExtendedDomPurify.js (100%) rename webapp/{portlet => }/src/main/webapp/js/MobileSwipeContainer.js (100%) rename webapp/{portlet => }/src/main/webapp/js/TopbarLoading.js (100%) rename webapp/{portlet => }/src/main/webapp/js/ckeditorPlugins/attachImage/icons/attachImage.png (100%) rename webapp/{portlet => }/src/main/webapp/js/ckeditorPlugins/attachImage/lang/en.js (100%) rename webapp/{portlet => }/src/main/webapp/js/ckeditorPlugins/attachImage/lang/fr.js (100%) rename webapp/{portlet => }/src/main/webapp/js/ckeditorPlugins/attachImage/plugin.js (100%) rename webapp/{portlet => }/src/main/webapp/js/ckeditorPlugins/linkBalloon/icons/addLink.png (100%) rename webapp/{portlet => }/src/main/webapp/js/ckeditorPlugins/linkBalloon/icons/removeLink.png (100%) rename webapp/{portlet => }/src/main/webapp/js/ckeditorPlugins/linkBalloon/lang/en.js (100%) rename webapp/{portlet => }/src/main/webapp/js/ckeditorPlugins/linkBalloon/lang/fr.js (100%) rename webapp/{portlet => }/src/main/webapp/js/ckeditorPlugins/linkBalloon/plugin.js (100%) rename webapp/{portlet => }/src/main/webapp/js/extensionRegistry.js (100%) rename webapp/{portlet => }/src/main/webapp/js/lib/autolinker.min.js (100%) rename webapp/{portlet => }/src/main/webapp/js/lib/cropper.min.js (100%) rename webapp/{portlet => }/src/main/webapp/js/lib/deprecated/switch-button.js (100%) rename webapp/{portlet => }/src/main/webapp/js/lib/echarts.min.js (100%) rename webapp/{portlet => }/src/main/webapp/js/lib/html2canvas.min.js (100%) rename webapp/{portlet => }/src/main/webapp/js/lib/jquery-3.2.1.js (100%) rename webapp/{portlet => }/src/main/webapp/js/lib/jquery.atwho.js (100%) rename webapp/{portlet => }/src/main/webapp/js/lib/jquery.caret.js (100%) rename webapp/{portlet => }/src/main/webapp/js/lib/jquery.exomentions.js (100%) rename webapp/{portlet => }/src/main/webapp/js/lib/jspdf.min.js (100%) rename webapp/{portlet => }/src/main/webapp/js/lib/purify.min.js (100%) rename webapp/{portlet => }/src/main/webapp/js/lib/require.js (100%) rename webapp/{portlet => }/src/main/webapp/js/lib/selectize.js (100%) rename webapp/{portlet => }/src/main/webapp/js/lib/sortable.min.js (100%) rename webapp/{portlet => }/src/main/webapp/js/lib/underscore.js (100%) rename webapp/{portlet => }/src/main/webapp/js/lib/vue-i18n.min.js (100%) rename webapp/{portlet => }/src/main/webapp/js/lib/vue.min.js (100%) rename webapp/{portlet => }/src/main/webapp/js/lib/vueDraggable.min.js (100%) rename webapp/{portlet => }/src/main/webapp/js/lib/vuetify.min.js (100%) rename webapp/{portlet => }/src/main/webapp/js/portal.js (100%) rename webapp/{portlet => }/src/main/webapp/js/sanitize-html-directive.js (100%) rename webapp/{portlet => }/src/main/webapp/js/suggester.js (100%) rename webapp/{portlet => }/src/main/webapp/js/tag.suggester.js (100%) rename webapp/{portlet => }/src/main/webapp/js/vue-i18n-wrapper.js (100%) rename webapp/{portlet => }/src/main/webapp/js/welcome-screens/accountSetup.js (100%) rename webapp/{portlet => }/src/main/webapp/skin/DefaultSkin/portletIcons/Breadcrumb.png (100%) rename webapp/{portlet => }/src/main/webapp/skin/DefaultSkin/portletIcons/ExternalSpacesList.png (100%) rename webapp/{portlet => }/src/main/webapp/skin/DefaultSkin/portletIcons/Image.png (100%) rename webapp/{portlet => }/src/main/webapp/skin/DefaultSkin/portletIcons/Links.png (100%) rename webapp/{portlet => }/src/main/webapp/skin/DefaultSkin/portletIcons/MembersPortlet.png (100%) rename webapp/{portlet => }/src/main/webapp/skin/DefaultSkin/portletIcons/OrganizationalChart.png (100%) rename webapp/{portlet => }/src/main/webapp/skin/DefaultSkin/portletIcons/PeopleOverview.png (100%) rename webapp/{portlet => }/src/main/webapp/skin/DefaultSkin/portletIcons/SpaceActivityStreamPortlet.png (100%) rename webapp/{portlet => }/src/main/webapp/skin/DefaultSkin/portletIcons/SpaceInfos.png (100%) rename webapp/{portlet => }/src/main/webapp/skin/DefaultSkin/portletIcons/SpaceMenuPortlet.png (100%) rename webapp/{portlet => }/src/main/webapp/skin/DefaultSkin/portletIcons/SpaceSettingPortlet.png (100%) rename webapp/{portlet => }/src/main/webapp/skin/DefaultSkin/portletIcons/SpacesOverview.png (100%) rename webapp/{portlet => }/src/main/webapp/skin/DefaultSkin/portletIcons/SuggestionsPeopleAndSpace.png (100%) rename webapp/{portlet => }/src/main/webapp/skin/DefaultSkin/portletIcons/TopBarLogin.png (100%) rename webapp/{portlet => }/src/main/webapp/skin/DefaultSkin/portletIcons/TopBarLogo.png (100%) rename webapp/{portlet => }/src/main/webapp/skin/DefaultSkin/portletIcons/TopBarPreview.png (100%) rename webapp/{portlet => }/src/main/webapp/skin/DefaultSkin/portletIcons/TopBarPublishSite.png (100%) rename webapp/{portlet => }/src/main/webapp/skin/DefaultSkin/portletIcons/VerticalMenu.png (100%) rename webapp/{portlet => }/src/main/webapp/skin/DefaultSkin/portletIcons/WhoIsOnLinePortlet.png (100%) rename webapp/{portlet => }/src/main/webapp/skin/css/welcome-screens/jquery.qtip.min.css (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/common/AdministrationSite/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/common/Notification/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/common/PeopleList/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/common/ProfileCard/Style-mobile.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/common/ProfileCard/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/common/UserCard/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/common/siteDetails/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/bootstrap.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/accordion.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/alerts.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/bootstrap.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/breadcrumbs.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/button-groups.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/buttons.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/carousel.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/close.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/code.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/component-animations.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/dropdowns.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/forms.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/grid.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/hero-unit.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/labels-badges.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/layouts.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/media.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/mixins.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/modals.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/navbar.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/navs.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/pager.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/pagination.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/popovers.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/progress-bars.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/reset.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/responsive-1200px-min.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/responsive-767px-max.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/responsive-768px-979px.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/responsive-navbar.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/responsive-utilities.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/responsive.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/scaffolding.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/sprites.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/tables.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/thumbnails.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/tooltip.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/type.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/utilities.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/variables.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/bootstrap/less/wells.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/webui/Buttons/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/webui/Checkbox/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/webui/Form/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/webui/Grid/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/webui/Grid/tables.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/webui/Popup/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/webui/SearchInput/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/webui/Selectize/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/deprecated/webui/webui.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/portlet/ActivitySearch/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/portlet/ActivityStream/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/portlet/GettingStarted/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/portlet/HamburgerMenu/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/portlet/IDMGroupsManagement/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/portlet/IDMMembershipTypesManagement/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/portlet/IDMUsersManagement/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/portlet/PeopleList/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/portlet/PeopleOverview/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/portlet/ProfileAboutMe/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/portlet/ProfileContactInformation/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/portlet/ProfileHeader/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/portlet/ProfileSearch/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/portlet/ProfileSettings/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/portlet/ProfileWorkExperience/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/portlet/Search/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/portlet/SpaceHeader/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/portlet/SpaceInfos/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/portlet/SpaceMenu/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/portlet/SpacesAdministration/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/portlet/SpacesListExternal/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/portlet/SpacesOverview/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/portlet/SuggestionsPeopleAndSpace/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/portlet/TopBarMenu/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/portlet/TopBarNotification/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/portlet/VerticalMenu/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/portlet/organizational-chart/Style.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/standalone-pages/AccountSetup.less (95%) rename webapp/{portlet => }/src/main/webapp/skin/less/standalone-pages/Login.less (100%) rename webapp/{portlet => }/src/main/webapp/skin/less/standalone-pages/OAuth.less (100%) rename webapp/{portlet => }/src/main/webapp/tld/portlet_2_0.tld (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-reactions/components/ActivityLikerItem.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-reactions/components/ActivityLikesList.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-reactions/components/ActivityReactions.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-reactions/components/ActivityReactionsApp.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-reactions/components/ActivityReactionsDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-reactions/components/ActivityReactionsListItems.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-reactions/components/ActivityReactionsMobile.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-reactions/extensions.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-reactions/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-reactions/main.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/ActivityStream.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/activity/ActivityStreamActivity.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/activity/ActivityStreamLoader.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/activity/content/ActivityBody.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/activity/content/ActivityEmbeddedHTML.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/activity/content/ActivityImageAttachments.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/activity/content/ActivityLink.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/activity/content/ActivityShare.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/activity/footer/ActivityActions.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/activity/footer/ActivityFooter.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/activity/footer/ActivityShareInformation.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/activity/footer/actions/ActivityCommentAction.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/activity/footer/actions/ActivityFavoriteAction.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/activity/footer/actions/ActivityLikeAction.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/activity/footer/actions/ActivityShareAction.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/activity/header/ActivityHead.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/activity/header/ActivityHeadMenu.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/activity/header/ActivityHeadTime.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/activity/header/ActivityMobileHead.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/activity/list/ActivityStreamList.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/comment/ActivityComment.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/comment/content/ActivityCommentBodyText.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/comment/content/ActivityCommentRichText.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/comment/footer/ActivityCommentActions.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/comment/footer/ActivityCommentTime.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/comment/footer/actions/ActivityCommentLikeAction.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/comment/footer/actions/ActivityCommentReplyAction.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/comment/header/ActivityCommentMenu.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/comment/list/ActivityComments.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/comment/list/ActivityCommentsDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/comment/list/ActivityCommentsPreview.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/common/ActivityStreamConfirm.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/common/ActivityStreamUpdater.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/empty-stream/ActivityNotFound.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/empty-stream/ActivityStreamEmptyMessage.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/empty-stream/ActivityStreamEmptyMessageCard.vue (96%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/empty-stream/ActivityStreamEmptyMessageFilter.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/empty-stream/ActivityStreamEmptyMessageSpace.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/pinned-activity/ActivityStreamPinnedActivity.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/toolbar/ActivityComposerDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/toolbar/ActivityStreamFilterDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/components/toolbar/ActivityStreamToolbar.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/extensions.js (99%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/js/ActivityConstants.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/js/ActivityUtils.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/js/WebSocket.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/activity-stream/main.js (92%) rename webapp/{portlet => }/src/main/webapp/vue-apps/animations/components/ConfetiAnimation.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/animations/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/animations/main.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/application-toolbar/components/ApplicationToolbar.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/application-toolbar/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/application-toolbar/main.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/attach-image/components/form/ImageAttachmentCropDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/attach-image/components/form/ImageInput.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/attach-image/components/form/ImageInputItem.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/attach-image/components/form/ImageInputItems.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/attach-image/components/form/ImageInputMultiUpload.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/attach-image/components/preview/ImagePreviewDialog.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/attach-image/components/preview/ImagePreviewItem.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/attach-image/components/view/ImageItem.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/attach-image/components/view/ImageItems.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/attach-image/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/attach-image/js/FileAttachmentService.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/attach-image/main.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/attach-image/services.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/breadcrumb/components/Breadcrumb.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/breadcrumb/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/breadcrumb/main.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common-font-icon/components/FontIconDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common-font-icon/components/FontIconInput.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common-font-icon/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common-font-icon/js/fontLibrary.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common-font-icon/main.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common-font-icon/services.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/components/ActivityShareDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/components/AttachmentsDraggableZone.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/components/CardCarousel.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/components/ChangesReminder.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/components/ConfirmDialog.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/components/DateFormat.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/components/DatePicker.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/components/DrawersOverlay.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/components/DynamicHTMLElement.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/components/ExoDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/components/ExoGroupSuggester.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/components/ExoIdentitySuggester.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/components/ExoModal.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/components/ExoNotificationAlert.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/components/ExtendedTextarea.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/components/ExtensionRegistryComponent.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/components/ExtensionRegistryComponents.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/components/FavoriteButton.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/components/HelpDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/components/HelpLabel.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/components/HelpTooltip.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/components/Notifications.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/components/NumberInput.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/components/RelativeDateFormat.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/components/RichEditor.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/components/RippleHoverButton.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/components/SpaceAvatar.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/components/TimePicker.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/components/UnreadBadge.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/components/UserAvatar.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/components/UserAvatarsList.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/components/Widget.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/js/ActivityService.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/js/DateUtil.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/js/FavoriteService.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/js/FeatureService.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/js/IdentityService.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/js/NavigationService.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/js/ObserverService.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/js/ProfileLabelService.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/js/ProfileSettingsService.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/js/SettingService.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/js/SiteService.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/js/SpaceService.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/js/SuggesterService.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/js/TagService.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/js/UploadService.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/js/UserService.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/js/Utils.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/js/WebSocket.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/js/brandingService.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/js/spacesConstants.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/common/main.js (94%) rename webapp/{portlet => }/src/main/webapp/vue-apps/complementary-filter/components/ComplementaryFilter.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/complementary-filter/components/ComplementaryFilterItem.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/complementary-filter/components/ComplementaryFilterItemsDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/complementary-filter/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/complementary-filter/js/ComplementaryFilterService.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/complementary-filter/main.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/component-image-crop/components/ImageCropDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/component-image-crop/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/component-image-crop/main.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/component-translation-field/components/TranslationDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/component-translation-field/components/TranslationTextField.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/component-translation-field/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/component-translation-field/js/TranslationService.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/component-translation-field/main.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/external-spaces-list/components/ExternalSpaceItem.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/external-spaces-list/components/ExternalSpacesList.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/external-spaces-list/components/ExternalSpacesRequestsItems.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/external-spaces-list/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/external-spaces-list/main.js (91%) rename webapp/{portlet => }/src/main/webapp/vue-apps/favorites-list-top-bar/components/ActivityFavoriteItem.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/favorites-list-top-bar/components/FavoriteItem.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/favorites-list-top-bar/components/SpaceFavoriteItem.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/favorites-list-top-bar/components/TopBarFavorites.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/favorites-list-top-bar/components/TopBarFavoritesButton.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/favorites-list-top-bar/components/TopBarFavoritesDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/favorites-list-top-bar/extensions.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/favorites-list-top-bar/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/favorites-list-top-bar/main.js (92%) rename webapp/{portlet => }/src/main/webapp/vue-apps/general-settings/components/GeneralSettings.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/general-settings/components/branding/SiteBranding.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/general-settings/components/branding/SiteBrandingWindow.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/general-settings/components/branding/form/BackgroundImageAttachment.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/general-settings/components/branding/form/BackgroundInput.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/general-settings/components/branding/form/BorderRadiusSelector.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/general-settings/components/branding/form/ColorPicker.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/general-settings/components/branding/form/CompanyFavicon.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/general-settings/components/branding/form/CompanyLogo.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/general-settings/components/branding/form/CustomStyleInput.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/general-settings/components/branding/form/LoginBackgroundSelector.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/general-settings/components/branding/preview/SiteBrandingPreview.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/general-settings/components/language/DefaultLanguageDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/general-settings/components/login-page/LoginBranding.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/general-settings/components/public-site/PublicSiteEditDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/general-settings/components/registration/DefaultSpacesDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/general-settings/components/registration/HubAccess.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/general-settings/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/general-settings/js/LanguageSettingService.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/general-settings/js/RegistrationService.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/general-settings/main.js (92%) rename webapp/{portlet => }/src/main/webapp/vue-apps/general-settings/services.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/getting-started/main.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuNavigation.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuNavigationButton.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuNavigationFirstLevel.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuNavigationSecondLevel.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuNavigationThirdLevel.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuParentDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuParentSticky.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/hamburger-menu/components/profile/ProfileHamburgerNavigation.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/RecentSpacesHamburgerNavigation.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpaceHamburgerActionMenu.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpaceNavigationItem.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpacePanelHamburgerNavigation.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpacesHamburgerNavigation.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpacesNavigationContent.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpacesNavigationEmpty.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/hamburger-menu/components/site/SiteHamburgerItem.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/hamburger-menu/components/site/SiteHamburgerNavigation.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/hamburger-menu/components/site/SitesHamburger.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/hamburger-menu/components/user/UserHamburgerNavigation.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/hamburger-menu/extensions.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/hamburger-menu/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/hamburger-menu/main.js (96%) rename webapp/{portlet => }/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagement.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementFormDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementMembershipFormDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementMembershipList.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementMembershipToolbar.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementTree.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementTreeGroupMenu.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementTreeItem.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementTreeToolbar.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/idm-groups-management/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/idm-groups-management/main.js (93%) rename webapp/{portlet => }/src/main/webapp/vue-apps/idm-membership-types-management/components/MembershipTypesManagement.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/idm-membership-types-management/components/MembershipTypesManagementFormDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/idm-membership-types-management/components/MembershipTypesManagementList.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/idm-membership-types-management/components/MembershipTypesManagementToolbar.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/idm-membership-types-management/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/idm-membership-types-management/main.js (93%) rename webapp/{portlet => }/src/main/webapp/vue-apps/idm-users-management/components/UsersManagement.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementFilterDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementImportCSVButton.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementImportCSVErrorMessage.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementImportCSVResult.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementList.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementToolbar.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementUserFormDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementUserMembershipDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/idm-users-management/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/idm-users-management/main.js (93%) rename webapp/{portlet => }/src/main/webapp/vue-apps/image/components/ImageApp.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/image/components/settings/ImageSettingsDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/image/components/settings/ImageSettingsHeader.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/image/components/view/ImageView.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/image/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/image/main.js (98%) rename webapp/{portlet => }/src/main/webapp/vue-apps/links/components/LinksApp.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/links/components/settings/LinkDisplayPreview.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/links/components/settings/LinkFormDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/links/components/settings/LinkIconInput.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/links/components/settings/LinkInput.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/links/components/settings/LinkSettingsDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/links/components/view/LinksCard.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/links/components/view/LinksColumn.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/links/components/view/LinksHeader.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/links/components/view/LinksIcon.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/links/components/view/LinksList.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/links/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/links/js/LinkService.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/links/main.js (97%) rename webapp/{portlet => }/src/main/webapp/vue-apps/links/services.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/login-common/components/BrandingImage.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/login-common/components/Introduction.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/login-common/components/PageTemplate.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/login-common/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/login-common/main.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/login-external-onboarding/components/ExternalOnboarding.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/login-external-onboarding/components/ExternalOnboardingAlreadyAuthenticated.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/login-external-onboarding/components/ExternalOnboardingCreateUserForm.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/login-external-onboarding/components/ExternalOnboardingExpired.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/login-external-onboarding/components/ExternalOnboardingMain.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/login-external-onboarding/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/login-external-onboarding/main.js (93%) rename webapp/{portlet => }/src/main/webapp/vue-apps/login-forgot-password/components/ForgotPassword.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/login-forgot-password/components/ForgotPasswordEmailForm.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/login-forgot-password/components/ForgotPasswordExpired.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/login-forgot-password/components/ForgotPasswordMain.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/login-forgot-password/components/ForgotPasswordResetForm.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/login-forgot-password/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/login-forgot-password/main.js (93%) rename webapp/{portlet => }/src/main/webapp/vue-apps/login-internal-onboarding/components/InternalOnboarding.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/login-internal-onboarding/components/InternalOnboardingExpired.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/login-internal-onboarding/components/InternalOnboardingMain.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/login-internal-onboarding/components/InternalOnboardingResetForm.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/login-internal-onboarding/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/login-internal-onboarding/main.js (93%) rename webapp/{portlet => }/src/main/webapp/vue-apps/login/components/Login.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/login/components/LoginMain.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/login/components/LoginMainBottomExtensions.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/login/components/LoginMainTopExtensions.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/login/components/LoginSeparator.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/login/components/provider/LoginProviderLink.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/login/components/provider/LoginProviderMenuLink.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/login/components/provider/LoginProviders.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/login/components/provider/LoginProvidersMenu.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/login/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/login/main.js (93%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-administration/components/NotificationAdministration.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-administration/components/NotificationChannels.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-administration/components/NotificationContact.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-administration/components/NotificationPlugins.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-administration/components/contact/NotificationContactDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-administration/components/plugin/NotificationPlugin.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-administration/components/plugin/NotificationPluginDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-administration/components/plugin/NotificationPluginGroup.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-administration/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-administration/js/NotificationAdministration.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-administration/main.js (89%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-administration/services.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-extensions/components/HtmlNotification.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-extensions/components/UserEmptyNotifications.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-extensions/components/UserNotification.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-extensions/components/UserNotificationMenu.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-extensions/components/UserNotificationTemplate.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-extensions/components/UserNotificationType.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-extensions/components/UserNotificationTypes.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-extensions/components/UserNotifications.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-extensions/components/UserNotificationsList.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-extensions/components/plugins/ActivityCommentPlugin.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-extensions/components/plugins/ActivityMentionPlugin.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-extensions/components/plugins/ActivityReplyToCommentPlugin.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-extensions/components/plugins/EditActivityPlugin.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-extensions/components/plugins/EditCommentPlugin.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-extensions/components/plugins/LikeCommentPlugin.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-extensions/components/plugins/LikePlugin.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-extensions/components/plugins/NewUser.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-extensions/components/plugins/PostActivityPlugin.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-extensions/components/plugins/PostActivitySpaceStreamPlugin.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-extensions/components/plugins/RelationshipReceivedRequestPlugin.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-extensions/components/plugins/RequestJoinSpacePlugin.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-extensions/components/plugins/SharedActivitySpaceStreamPlugin.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-extensions/components/plugins/SpaceInvitationPlugin.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-extensions/components/plugins/abstract/ActivityBasedPlugin.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-extensions/extensions.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-extensions/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-extensions/js/NotificationService.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-extensions/main.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-extensions/services.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-top-bar/components/TopBarNotification.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-top-bar/components/TopBarNotificationDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-top-bar/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-top-bar/js/NotificationWebSocket.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-top-bar/main.js (93%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-top-bar/services.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationChannel.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationGroup.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationMuteSpacesDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationPlugin.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotifications.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationsWindow.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-user-settings/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/notification-user-settings/main.js (87%) rename webapp/{portlet => }/src/main/webapp/vue-apps/organizational-chart/components/OrganizationalChartApp.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/organizational-chart/components/settings/OrganizationalChartSettingsDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/organizational-chart/components/view/ChartUserCompactCard.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/organizational-chart/components/view/OrganizationalChart.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/organizational-chart/components/view/OrganizationalChartHeader.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/organizational-chart/extensions/extensions.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/organizational-chart/extensions/main.js (90%) rename webapp/{portlet => }/src/main/webapp/vue-apps/organizational-chart/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/organizational-chart/main.js (93%) rename webapp/{portlet => }/src/main/webapp/vue-apps/page-not-found/components/PageNotFound.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/page-not-found/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/page-not-found/main.js (96%) rename webapp/{portlet => }/src/main/webapp/vue-apps/people-list/components/AdvancedFilterInputItem.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/people-list/components/PeopleAdvancedFilterDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/people-list/components/PeopleCardList.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/people-list/components/PeopleList.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/people-list/components/PeopleToolbar.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/people-list/components/usercard/PeopleCard.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/people-list/components/usercard/PeopleUserCard.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/people-list/components/usercard/PeopleUserCardRoles.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/people-list/components/usercard/PeopleUserCompactCard.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/people-list/components/usercard/PeopleUserMenu.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/people-list/components/usercard/PeopleUserMenuItem.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/people-list/components/usercard/PeopleUserRole.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/people-list/extensions.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/people-list/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/people-list/main-components.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/people-list/main.js (94%) rename webapp/{portlet => }/src/main/webapp/vue-apps/people-overview/components/PeopleOverview.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/people-overview/components/PeopleOverviewCard.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/people-overview/components/PeopleOverviewDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/people-overview/components/PeopleOverviewPeopleList.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/people-overview/components/PeopleOverviewPeopleListItem.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/people-overview/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/people-overview/main.js (89%) rename webapp/{portlet => }/src/main/webapp/vue-apps/platform-settings/components/PlatformSettings.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/platform-settings/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/platform-settings/main.js (95%) rename webapp/{portlet => }/src/main/webapp/vue-apps/popover/components/Popover.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/popover/components/PopoverMenu.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/popover/components/SpaceMuteNotificationButton.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/popover/components/SpacePopoverContent.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/popover/components/UserPopoverContent.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/popover/components/UsersListDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/popover/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/popover/main.js (92%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-about-me/components/ProfileAboutMe.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-about-me/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-about-me/main.js (93%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-contact-information/components/ProfileContactEditMultiField.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-contact-information/components/ProfileContactEditMultiFieldSelect.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-contact-information/components/ProfileContactInformation.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-contact-information/components/ProfileContactInformationDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-contact-information/components/ProfileContactUserTypeProperty.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-contact-information/components/ProfileHiddenPropertyInfo.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-contact-information/components/ProfileHidePropertyButton.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-contact-information/components/ProfileMultiValuedProperty.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-contact-information/components/ProfileSingleValuedProperty.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-contact-information/components/ProfileUserTypePropertyValues.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-contact-information/components/QuickSearchUsersListDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-contact-information/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-contact-information/main.js (85%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-header/components/ProfileHeader.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-header/components/ProfileHeaderActions.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-header/components/ProfileHeaderAvatar.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-header/components/ProfileHeaderBannerButton.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-header/components/ProfileHeaderText.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-header/extension.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-header/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-header/main.js (89%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-settings/components/ProfileAttributeSettings.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-settings/components/ProfileSettings.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-settings/components/ProfileSettingsHeader.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-settings/components/ProfileSettingsTable.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-settings/components/cells/SettingsActionsCell.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-settings/components/drawers/ProfilePropertyLabels.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-settings/components/drawers/ProfileSettingFormDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-settings/components/drawers/PropertyLabel.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-settings/components/drawers/UserCardSettingsDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-settings/components/menu/ProfileSettingsActionMenu.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-settings/components/views/ProfileSettingsOption.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-settings/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-settings/main.js (95%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-work-experience/components/ProfileWorkExperienceDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-work-experience/components/ProfileWorkExperienceEditItem.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-work-experience/components/ProfileWorkExperienceItem.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-work-experience/components/ProfileWorkExperiences.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-work-experience/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/profile-work-experience/main.js (92%) rename webapp/{portlet => }/src/main/webapp/vue-apps/search-activity/components/SearchActivityCard.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/search-activity/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/search-activity/main.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/search-people/components/SearchPeopleCard.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/search-people/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/search-people/main.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/search-space/components/SearchSpaceCard.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/search-space/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/search-space/main.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/search/components/SearchApplication.vue (98%) rename webapp/{portlet => }/src/main/webapp/vue-apps/search/components/SearchResultCard.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/search/components/SearchResults.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/search/components/SearchTagList.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/search/components/SearchTagSelector.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/search/components/SearchToolbar.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/search/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/search/main.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/site-details/components/SiteDetails.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/site-details/components/SiteNavigationItem.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/site-details/components/SiteNavigationTree.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/site-details/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/site-details/main.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-access/components/SpaceAccess.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-access/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-access/main.js (96%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-header/components/SpaceHeader.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-header/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-header/main.js (95%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-infos-app/components/SpaceInfos.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-infos-app/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-infos-app/main.js (91%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-invitation/components/SpaceInviteButtonsGroup.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-invitation/components/drawer/SpaceInviteInputEmailDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-invitation/components/drawer/SpaceInviteInputUsersDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-invitation/components/drawer/SpaceInvitePendingDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-invitation/components/form/SpaceInviteButton.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-invitation/components/list/SpaceInviteEmailListItem.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-invitation/components/list/SpaceSettingRoleList.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-invitation/components/list/SpaceSettingRoleListItem.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-invitation/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-invitation/main.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-members/components/SpaceMembers.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-members/components/SpaceMembersAlert.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-members/components/SpaceMembersToolbar.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-members/extensions.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-members/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-members/main.js (97%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-menu/components/SpaceMenu.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-menu/components/SpaceMenuItem.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-menu/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-menu/main.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-settings/components/SpaceSettings.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-settings/components/drawer/SpaceSettingAccessDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-settings/components/drawer/SpaceSettingPublicSiteDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-settings/components/drawer/SpaceSettingRedactorDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-settings/components/drawer/SpaceSettingUsersListDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-settings/components/drawer/SpaceSettingUsersSelectionDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-settings/components/form/SpaceSettingAvatar.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-settings/components/form/SpaceSettingBanner.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-settings/components/form/SpaceSettingUsersListToolbar.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-settings/components/main/SpaceSettingAccess.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-settings/components/main/SpaceSettingOverview.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-settings/components/main/SpaceSettingPublicSite.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-settings/components/main/SpaceSettingRoles.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-settings/components/section/SpaceSettingOverviewSection.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-settings/components/section/SpaceSettingRolesSection.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-settings/components/section/roles/SpaceSettingRolesTable.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-settings/components/section/roles/SpaceSettingRolesTableItem.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-settings/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-settings/main.js (97%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-top-bannerlogo/components/SpaceHostsDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-top-bannerlogo/components/SpaceLogoBanner.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-top-bannerlogo/components/SpacePopoverActionComponents.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-top-bannerlogo/extension.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-top-bannerlogo/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-top-bannerlogo/main.js (95%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-widget-description/components/SpaceDescriptionApplication.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-widget-description/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-widget-description/main.js (95%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-widget-managers/components/SpaceManagersApplication.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-widget-managers/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-widget-managers/main.js (95%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-widget-members/components/SpaceMembersApplication.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-widget-members/components/SpaceMembersDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-widget-members/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/space-widget-members/main.js (96%) rename webapp/{portlet => }/src/main/webapp/vue-apps/spaces-administration/components/ExoSpacesAdministrationBindingReports.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/spaces-administration/components/ExoSpacesAdministrationManageSpaces.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/spaces-administration/components/ExoSpacesAdministrationSpaces.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/spaces-administration/components/ExoSpacesAdministrationSpacesPermissions.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/spaces-administration/components/drawer/ExoGroupBindingDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/spaces-administration/components/drawer/ExoGroupBindingSecondLevelDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/spaces-administration/components/modal/ExoSpacesAdministrationModal.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/spaces-administration/components/modal/SpaceHomeLayoutResetConfirm.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/spaces-administration/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/spaces-administration/js/SpacesAdministrationServices.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/spaces-administration/main.js (88%) rename webapp/{portlet => }/src/main/webapp/vue-apps/spaces-administration/services.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/spaces-list/components/SpaceCard.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/spaces-list/components/SpaceCardButton.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/spaces-list/components/SpaceCardMenu.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/spaces-list/components/SpaceCardMenuItem.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/spaces-list/components/SpaceCardUnreadBadge.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/spaces-list/components/SpaceFavoriteAction.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/spaces-list/components/SpaceFormDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/spaces-list/components/SpacePendingButton.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/spaces-list/components/SpacePendingDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/spaces-list/components/SpaceRoleList.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/spaces-list/components/SpaceRoleListItem.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/spaces-list/components/SpacesCardList.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/spaces-list/components/SpacesList.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/spaces-list/components/SpacesListFilterDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/spaces-list/components/SpacesToolbar.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/spaces-list/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/spaces-list/main.js (96%) rename webapp/{portlet => }/src/main/webapp/vue-apps/spaces-overview/components/SpacesOverview.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/spaces-overview/components/SpacesOverviewCard.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/spaces-overview/components/SpacesOverviewDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/spaces-overview/components/SpacesOverviewSpacesList.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/spaces-overview/components/SpacesOverviewSpacesListItem.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/spaces-overview/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/spaces-overview/main.js (90%) rename webapp/{portlet => }/src/main/webapp/vue-apps/suggestions-people-space/components/ExoSuggestionsPeopleAndSpace.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/suggestions-people-space/components/ExoSuggestionsPeopleListItem.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/suggestions-people-space/components/ExoSuggestionsSpaceListItem.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/suggestions-people-space/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/suggestions-people-space/main.js (91%) rename webapp/{portlet => }/src/main/webapp/vue-apps/top-bar-login/components/TopBarLogin.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/top-bar-login/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/top-bar-login/main.js (95%) rename webapp/{portlet => }/src/main/webapp/vue-apps/top-bar-menu/components/NavigationMenuItem.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/top-bar-menu/components/NavigationMenuSubItem.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/top-bar-menu/components/TopBarNavigationMenu.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/top-bar-menu/components/mobile/NavigationMobileMenuItem.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/top-bar-menu/components/mobile/NavigationMobileMenuSubItem.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/top-bar-menu/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/top-bar-menu/main.js (96%) rename webapp/{portlet => }/src/main/webapp/vue-apps/top-bar-preview/components/TopBarPreview.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/top-bar-preview/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/top-bar-preview/main.js (94%) rename webapp/{portlet => }/src/main/webapp/vue-apps/top-bar-publish-site/components/TopBarPublishSite.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/top-bar-publish-site/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/top-bar-publish-site/main.js (95%) rename webapp/{portlet => }/src/main/webapp/vue-apps/user-register-onboarding/components/OnboardingRegister.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/user-register-onboarding/extensions.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/user-register-onboarding/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/user-register-onboarding/main.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/user-register/components/Register.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/user-register/components/RegisterExtensions.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/user-register/components/RegisterMain.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/user-register/components/RegisterSeparator.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/user-register/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/user-register/main.js (93%) rename webapp/{portlet => }/src/main/webapp/vue-apps/user-setting-language/components/UserLanguageDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/user-setting-language/components/UserSettingLanguage.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/user-setting-language/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/user-setting-language/main.js (92%) rename webapp/{portlet => }/src/main/webapp/vue-apps/user-setting-security/components/UserSettingSecurity.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/user-setting-security/components/UserSettingSecurityWindow.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/user-setting-security/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/user-setting-security/main.js (92%) rename webapp/{portlet => }/src/main/webapp/vue-apps/version-history-drawer/components/VersionCard.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/version-history-drawer/components/VersionHistoryDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/version-history-drawer/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/version-history-drawer/main.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/vertical-menu/components/VerticalMenuApp.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/vertical-menu/components/VerticalMenuButton.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/vertical-menu/components/VerticalMenuContent.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/vertical-menu/components/VerticalMenuDrawer.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/vertical-menu/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/vertical-menu/main.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/who-is-online-app/components/ExoWhoIsOnline.vue (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/who-is-online-app/components/initComponents.js (100%) rename webapp/{portlet => }/src/main/webapp/vue-apps/who-is-online-app/main.js (94%) rename webapp/{portlet => }/src/main/webapp/vue-apps/who-is-online-app/whoIsOnlineServices.js (100%) rename webapp/{portlet => }/webpack.common.js (100%) rename webapp/{portlet => }/webpack.dev.js (94%) rename webapp/{portlet => }/webpack.prod.js (92%) diff --git a/component/core/src/test/resources/conf/exo.social.component.core-configuration.xml b/component/core/src/test/resources/conf/exo.social.component.core-configuration.xml index d98b6de3f55..82975c9a3bc 100644 --- a/component/core/src/test/resources/conf/exo.social.component.core-configuration.xml +++ b/component/core/src/test/resources/conf/exo.social.component.core-configuration.xml @@ -1348,7 +1348,7 @@ - social-portlet + social SpaceActivityStreamPortlet @@ -1386,7 +1386,7 @@ - social-portlet + social SpaceSettingPortlet @@ -1419,7 +1419,7 @@ - social-portlet + social MembersPortlet diff --git a/component/core/src/test/resources/conf/exo.social.component.core-local-configuration.xml b/component/core/src/test/resources/conf/exo.social.component.core-local-configuration.xml index af909974165..98bcc8b0911 100644 --- a/component/core/src/test/resources/conf/exo.social.component.core-local-configuration.xml +++ b/component/core/src/test/resources/conf/exo.social.component.core-local-configuration.xml @@ -227,7 +227,7 @@ - social-portlet + social SpaceSettingPortlet @@ -256,7 +256,7 @@ - social-portlet + social MembersPortlet diff --git a/component/core/src/test/resources/portal/template/pages/space/page.xml b/component/core/src/test/resources/portal/template/pages/space/page.xml index d11da263741..f86df1d7db4 100644 --- a/component/core/src/test/resources/portal/template/pages/space/page.xml +++ b/component/core/src/test/resources/portal/template/pages/space/page.xml @@ -20,7 +20,7 @@ - social-portlet + social SpaceBannerPortlet *:/platform/users diff --git a/component/core/src/test/resources/portal/template/pages/spaceHomePage/page.xml b/component/core/src/test/resources/portal/template/pages/spaceHomePage/page.xml index 3dd5f4cb3f2..77021f12d38 100644 --- a/component/core/src/test/resources/portal/template/pages/spaceHomePage/page.xml +++ b/component/core/src/test/resources/portal/template/pages/spaceHomePage/page.xml @@ -25,7 +25,7 @@ - social-portlet + social SpaceBannerPortlet *:/platform/users @@ -36,7 +36,7 @@ - social-portlet + social SpaceActivityStreamPortlet false @@ -46,7 +46,7 @@ - social-portlet + social SpaceInfos false @@ -55,7 +55,7 @@ - social-portlet + social WhoIsOnLinePortlet false @@ -64,7 +64,7 @@ - social-portlet + social HomePageCalendarPortlet false diff --git a/extension/pom.xml b/extension/pom.xml deleted file mode 100644 index 87f0d7975d5..00000000000 --- a/extension/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - 4.0.0 - - social - io.meeds.social - 7.0.x-SNAPSHOT - - social-extension - pom - Meeds:: PLF:: Social Extension - Meeds Social Extension - - war - - diff --git a/extension/war/pom.xml b/extension/war/pom.xml deleted file mode 100644 index 319f333e1cf..00000000000 --- a/extension/war/pom.xml +++ /dev/null @@ -1,422 +0,0 @@ - - - - 4.0.0 - - social-extension - io.meeds.social - 7.0.x-SNAPSHOT - - social-extension-war - war - Meeds:: PLF:: Social Extension WAR - Meeds Social Extension WAR - - - - io.meeds.portal - portal.component.api - - - org.springframework.boot - spring-boot-starter-logging - - - org.slf4j - * - - - org.apache.logging.log4j - * - - - org.apache.tomcat.embed - * - - - - - io.meeds.portal - portal.component.api - test-jar - test - - - - io.meeds.portal - portal.component.common - - - io.meeds.portal - portal.component.common - test-jar - test - - - - io.meeds.portal - portal.component.file-storage - - - io.meeds.portal - portal.component.file-storage - test-jar - test - - - - io.meeds.portal - portal.component.resources - - - io.meeds.portal - portal.component.resources - test-jar - test - - - - io.meeds.portal - portal.component.identity - - - io.meeds.portal - portal.component.identity - test-jar - test - - - - io.meeds.portal - portal.component.pc - - - io.meeds.portal - portal.component.pc - test-jar - test - - - - io.meeds.portal - portal.component.portal - - - io.meeds.portal - portal.component.portal - test-jar - test - - - - io.meeds.portal - portal.component.scripting - - - io.meeds.portal - portal.component.scripting - test-jar - test - - - - io.meeds.portal - portal.component.web.controller - - - io.meeds.portal - portal.component.web.controller - test-jar - test - - - - io.meeds.portal - portal.component.web.security - - - io.meeds.portal - portal.component.web.security - test-jar - test - - - - io.meeds.portal - portal.component.web.server - - - io.meeds.portal - portal.component.web.server - test-jar - test - - - - io.meeds.portal - portal.component.web.api - - - io.meeds.portal - portal.component.web.api - test-jar - test - - - - io.meeds.portal - portal.component.web.resources - - - io.meeds.portal - portal.component.web.resources - test-jar - test - - - - io.meeds.portal - portal.webui.portal - - - io.meeds.portal - portal.webui.portal - test-jar - test - - - - io.meeds.portal - portal.component.management - - - io.meeds.portal - portal.component.management - test-jar - test - - - - - io.meeds.commons - commons-api - - - io.meeds.commons - commons-api - test-jar - test - - - - io.meeds.commons - commons-component-common - - - io.meeds.commons - commons-component-common - test-jar - test - - - - io.meeds.commons - commons-component-product - - - io.meeds.commons - commons-component-product - test-jar - test - - - - io.meeds.commons - commons-component-upgrade - - - io.meeds.commons - commons-component-upgrade - test-jar - test - - - - io.meeds.commons - commons-search - - - io.meeds.commons - commons-search - test-jar - test - - - - io.meeds.commons - commons-comet-service - - - io.meeds.commons - commons-comet-service - test-jar - test - - - - - ${project.groupId} - social-component-api - - - ${project.groupId} - social-component-api - test-jar - test - - - - ${project.groupId} - social-component-common - - - ${project.groupId} - social-component-common - test-jar - test - - - - ${project.groupId} - social-component-core - - - ${project.groupId} - social-component-core - test-jar - test - - - - ${project.groupId} - social-component-service - - - ${project.groupId} - social-component-service - test-jar - test - - - - ${project.groupId} - social-component-notification - - - ${project.groupId} - social-component-notification - test-jar - test - - - - ${project.groupId} - social-component-oauth-auth - - - ${project.groupId} - social-component-oauth-auth - test-jar - test - - - - ${project.groupId} - social-component-web - - - ${project.groupId} - social-component-web - test-jar - test - - - - - io.meeds.kernel - exo.kernel.component.ext.cache.impl.infinispan.v8 - - - - - io.meeds.portal - portal.component.test.core - test - - - - io.meeds.portal - portal.component.test.web - test - - - - io.meeds.commons - commons-testing - test - - - - - jakarta.servlet - jakarta.servlet-api - - test - - - - io.swagger.core.v3 - swagger-annotations-jakarta - test - - - - org.projectlombok - lombok - test - - - - - social-extension - - - org.apache.maven.plugins - maven-war-plugin - - false - WEB-INF/lib/*.jar - - - - - diff --git a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/ckeditor/attach-image-plugin.js b/extension/war/src/main/webapp/WEB-INF/conf/social-extension/ckeditor/attach-image-plugin.js deleted file mode 100644 index 0f4d679af08..00000000000 --- a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/ckeditor/attach-image-plugin.js +++ /dev/null @@ -1 +0,0 @@ - CKEDITOR.plugins.addExternal('attachImage', '/social-portlet/js/ckeditorPlugins/attachImage/', 'plugin.js'); \ No newline at end of file diff --git a/extension/war/src/main/webapp/WEB-INF/web.xml b/extension/war/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index f4d7f22fac1..00000000000 --- a/extension/war/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - social-extension - - - - - - ResourceRequestFilter - org.exoplatform.portal.application.ResourceRequestFilter - - - - ResourceRequestFilter - *.css - *.js - *.html - /i18n/* - /images/* - - - - - - - - org.exoplatform.container.web.PortalContainerConfigOwner - - - - - - GateInServlet - org.gatein.wci.api.GateInServlet - 0 - - - - - GateInServlet - /gateinservlet - - - - diff --git a/pom.xml b/pom.xml index 66ad96e0e75..2b560342f48 100644 --- a/pom.xml +++ b/pom.xml @@ -32,7 +32,6 @@ Meeds:: PLF:: Social Meeds Social - Enterprise Social Networking - extension component webapp @@ -164,45 +163,19 @@ test-jar - - io.meeds.social - social-extension - ${project.version} - pom - - - io.meeds.social - social-extension-war - ${project.version} - war - - - io.meeds.social - social-extension-war - ${project.version} - pom - - io.meeds.social social-webapp ${project.version} - pom - - - io.meeds.social - social-webapp-portlet - ${project.version} war io.meeds.social - social-webapp-portlet + social-webapp ${project.version} pom - - + diff --git a/webapp/portlet/.eslintrc.json b/webapp/.eslintrc.json similarity index 100% rename from webapp/portlet/.eslintrc.json rename to webapp/.eslintrc.json diff --git a/webapp/portlet/package-lock.json b/webapp/package-lock.json similarity index 99% rename from webapp/portlet/package-lock.json rename to webapp/package-lock.json index 32fc6090f20..6e7c5641538 100644 --- a/webapp/portlet/package-lock.json +++ b/webapp/package-lock.json @@ -1,11 +1,11 @@ { - "name": "meeds-social-portlets", + "name": "meeds-social", "version": "6.2.0", "lockfileVersion": 3, "requires": true, "packages": { "": { - "name": "meeds-social-portlets", + "name": "meeds-social", "version": "6.2.0", "license": "LGPL", "devDependencies": { diff --git a/webapp/portlet/package.json b/webapp/package.json similarity index 96% rename from webapp/portlet/package.json rename to webapp/package.json index 077c076f3d2..4563ae02caf 100644 --- a/webapp/portlet/package.json +++ b/webapp/package.json @@ -1,5 +1,5 @@ { - "name": "meeds-social-portlets", + "name": "meeds-social", "version": "6.2.0", "description": "Meeds Space poetlets", "repository": { diff --git a/webapp/pom.xml b/webapp/pom.xml index 8b076f9674b..5404c575453 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -1,34 +1,203 @@ 4.0.0 - social io.meeds.social + social 7.0.x-SNAPSHOT social-webapp - pom - Meeds:: PLF:: Social Web Apps - Meeds Social Web Apps - - portlet - + war + Meeds:: PLF:: Social Webapp + Meeds Social Webapp + + + ${project.groupId} + social-component-web + + + ${project.groupId} + social-component-web + test-jar + test + + + + + io.meeds.kernel + exo.kernel.component.ext.cache.impl.infinispan.v8 + + + + + io.meeds.portal + portal.component.test.core + test + + + + io.meeds.portal + portal.component.test.web + test + + + + io.meeds.commons + commons-testing + test + + + + + jakarta.servlet + jakarta.servlet-api + + test + + + + io.swagger.core.v3 + swagger-annotations-jakarta + test + + + + org.projectlombok + lombok + provided + + + + + io.meeds.platform-ui + platform-ui-skin + sources + provided + + + + social + + + maven-resources-plugin + + + less-copy-resources + generate-sources + + copy-resources + + + ${project.build.directory}/src/main/webapp/skin/less + + + src/main/webapp/skin/less + + + + + + + + maven-dependency-plugin + + + platform-ui-src + initialize + + unpack-dependencies + + + platform-ui-skin + ${project.build.directory}/src/main/webapp + + + + + + org.lesscss + lesscss-maven-plugin + + + core + + ${project.build.directory}/src/main/webapp/skin/less + ${project.build.directory}/${project.build.finalName}/skin/css + false + + portlet/ActivitySearch/Style.less + portlet/ActivityStream/Style.less + portlet/GettingStarted/Style.less + portlet/HamburgerMenu/Style.less + portlet/IDMGroupsManagement/Style.less + portlet/IDMMembershipTypesManagement/Style.less + portlet/IDMUsersManagement/Style.less + portlet/PeopleList/Style.less + portlet/PeopleOverview/Style.less + portlet/ProfileAboutMe/Style.less + portlet/ProfileContactInformation/Style.less + portlet/ProfileHeader/Style.less + portlet/ProfileSearch/Style.less + portlet/ProfileSettings/Style.less + portlet/ProfileWorkExperience/Style.less + portlet/Search/Style.less + portlet/SpaceHeader/Style.less + portlet/SpaceInfos/Style.less + portlet/SpaceMenu/Style.less + portlet/SpacesAdministration/Style.less + portlet/SpacesListExternal/Style.less + portlet/SpacesOverview/Style.less + portlet/SuggestionsPeopleAndSpace/Style.less + portlet/TopBarMenu/Style.less + portlet/VerticalMenu/Style.less + common/siteDetails/Style.less + common/AdministrationSite/Style.less + portlet/organizational-chart/Style.less + + portlet/TopBarNotification/Style.less + + standalone-pages/AccountSetup.less + standalone-pages/Login.less + + + + compile + + + + + + org.apache.maven.plugins + maven-war-plugin + + false + WEB-INF/lib/*.jar,**/*.less,**/less/**,**/*.vue,css/lib/*,vue-apps/**,js/mock/**/*,**-dev.*,**/vue-apps + + + + com.github.eirslett + frontend-maven-plugin + + + diff --git a/webapp/portlet/pom.xml b/webapp/portlet/pom.xml deleted file mode 100644 index 771a4fa81b7..00000000000 --- a/webapp/portlet/pom.xml +++ /dev/null @@ -1,151 +0,0 @@ - - - - 4.0.0 - - social-webapp - io.meeds.social - 7.0.x-SNAPSHOT - - social-webapp-portlet - war - Meeds:: PLF:: Social Portlet Web App - Meeds Social Portlet Web App - - - ${project.groupId} - social-component-web - provided - - - - io.meeds.platform-ui - platform-ui-skin - sources - provided - - - - social-portlet - - - maven-resources-plugin - - - less-copy-resources - generate-sources - - copy-resources - - - ${project.build.directory}/src/main/webapp/skin/less - - - src/main/webapp/skin/less - - - - - - - - maven-dependency-plugin - - - platform-ui-src - initialize - - unpack-dependencies - - - platform-ui-skin - ${project.build.directory}/src/main/webapp - - - - - - org.lesscss - lesscss-maven-plugin - - - core - - ${project.build.directory}/src/main/webapp/skin/less - ${project.build.directory}/${project.build.finalName}/skin/css - false - - portlet/ActivitySearch/Style.less - portlet/ActivityStream/Style.less - portlet/GettingStarted/Style.less - portlet/HamburgerMenu/Style.less - portlet/IDMGroupsManagement/Style.less - portlet/IDMMembershipTypesManagement/Style.less - portlet/IDMUsersManagement/Style.less - portlet/PeopleList/Style.less - portlet/PeopleOverview/Style.less - portlet/ProfileAboutMe/Style.less - portlet/ProfileContactInformation/Style.less - portlet/ProfileHeader/Style.less - portlet/ProfileSearch/Style.less - portlet/ProfileSettings/Style.less - portlet/ProfileWorkExperience/Style.less - portlet/Search/Style.less - portlet/SpaceHeader/Style.less - portlet/SpaceInfos/Style.less - portlet/SpaceMenu/Style.less - portlet/SpacesAdministration/Style.less - portlet/SpacesListExternal/Style.less - portlet/SpacesOverview/Style.less - portlet/SuggestionsPeopleAndSpace/Style.less - portlet/TopBarMenu/Style.less - portlet/VerticalMenu/Style.less - common/siteDetails/Style.less - common/AdministrationSite/Style.less - portlet/organizational-chart/Style.less - - portlet/TopBarNotification/Style.less - - standalone-pages/AccountSetup.less - standalone-pages/Login.less - - - - compile - - - - - - org.apache.maven.plugins - maven-war-plugin - - false - WEB-INF/lib/*.jar,**/*.less,**/less/**,**/*.vue,css/lib/*,vue-apps/**,js/mock/**/*,**-dev.*,**/vue-apps - - - - com.github.eirslett - frontend-maven-plugin - - - - diff --git a/webapp/portlet/src/main/java/io/meeds/social/portlet/ImagePortlet.java b/webapp/src/main/java/io/meeds/social/portlet/ImagePortlet.java similarity index 100% rename from webapp/portlet/src/main/java/io/meeds/social/portlet/ImagePortlet.java rename to webapp/src/main/java/io/meeds/social/portlet/ImagePortlet.java diff --git a/webapp/portlet/src/main/java/io/meeds/social/portlet/LinkPortlet.java b/webapp/src/main/java/io/meeds/social/portlet/LinkPortlet.java similarity index 100% rename from webapp/portlet/src/main/java/io/meeds/social/portlet/LinkPortlet.java rename to webapp/src/main/java/io/meeds/social/portlet/LinkPortlet.java diff --git a/webapp/portlet/src/main/java/org/exoplatform/social/portlet/SpaceHeaderPortlet.java b/webapp/src/main/java/org/exoplatform/social/portlet/SpaceHeaderPortlet.java similarity index 100% rename from webapp/portlet/src/main/java/org/exoplatform/social/portlet/SpaceHeaderPortlet.java rename to webapp/src/main/java/org/exoplatform/social/portlet/SpaceHeaderPortlet.java diff --git a/webapp/portlet/src/main/java/org/exoplatform/social/portlet/SpaceMenuPortlet.java b/webapp/src/main/java/org/exoplatform/social/portlet/SpaceMenuPortlet.java similarity index 100% rename from webapp/portlet/src/main/java/org/exoplatform/social/portlet/SpaceMenuPortlet.java rename to webapp/src/main/java/org/exoplatform/social/portlet/SpaceMenuPortlet.java diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_ar.properties b/webapp/src/main/resources/locale/notification/template/Notification_ar.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_ar.properties rename to webapp/src/main/resources/locale/notification/template/Notification_ar.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_aro.properties b/webapp/src/main/resources/locale/notification/template/Notification_aro.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_aro.properties rename to webapp/src/main/resources/locale/notification/template/Notification_aro.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_az.properties b/webapp/src/main/resources/locale/notification/template/Notification_az.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_az.properties rename to webapp/src/main/resources/locale/notification/template/Notification_az.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_ca.properties b/webapp/src/main/resources/locale/notification/template/Notification_ca.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_ca.properties rename to webapp/src/main/resources/locale/notification/template/Notification_ca.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_ceb.properties b/webapp/src/main/resources/locale/notification/template/Notification_ceb.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_ceb.properties rename to webapp/src/main/resources/locale/notification/template/Notification_ceb.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_co.properties b/webapp/src/main/resources/locale/notification/template/Notification_co.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_co.properties rename to webapp/src/main/resources/locale/notification/template/Notification_co.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_cs.properties b/webapp/src/main/resources/locale/notification/template/Notification_cs.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_cs.properties rename to webapp/src/main/resources/locale/notification/template/Notification_cs.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_de.properties b/webapp/src/main/resources/locale/notification/template/Notification_de.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_de.properties rename to webapp/src/main/resources/locale/notification/template/Notification_de.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_el.properties b/webapp/src/main/resources/locale/notification/template/Notification_el.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_el.properties rename to webapp/src/main/resources/locale/notification/template/Notification_el.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_en.properties b/webapp/src/main/resources/locale/notification/template/Notification_en.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_en.properties rename to webapp/src/main/resources/locale/notification/template/Notification_en.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_es_ES.properties b/webapp/src/main/resources/locale/notification/template/Notification_es_ES.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_es_ES.properties rename to webapp/src/main/resources/locale/notification/template/Notification_es_ES.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_eu.properties b/webapp/src/main/resources/locale/notification/template/Notification_eu.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_eu.properties rename to webapp/src/main/resources/locale/notification/template/Notification_eu.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_fa.properties b/webapp/src/main/resources/locale/notification/template/Notification_fa.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_fa.properties rename to webapp/src/main/resources/locale/notification/template/Notification_fa.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_fi.properties b/webapp/src/main/resources/locale/notification/template/Notification_fi.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_fi.properties rename to webapp/src/main/resources/locale/notification/template/Notification_fi.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_fil.properties b/webapp/src/main/resources/locale/notification/template/Notification_fil.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_fil.properties rename to webapp/src/main/resources/locale/notification/template/Notification_fil.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_fr.properties b/webapp/src/main/resources/locale/notification/template/Notification_fr.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_fr.properties rename to webapp/src/main/resources/locale/notification/template/Notification_fr.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_he.properties b/webapp/src/main/resources/locale/notification/template/Notification_he.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_he.properties rename to webapp/src/main/resources/locale/notification/template/Notification_he.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_hi.properties b/webapp/src/main/resources/locale/notification/template/Notification_hi.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_hi.properties rename to webapp/src/main/resources/locale/notification/template/Notification_hi.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_hu.properties b/webapp/src/main/resources/locale/notification/template/Notification_hu.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_hu.properties rename to webapp/src/main/resources/locale/notification/template/Notification_hu.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_id.properties b/webapp/src/main/resources/locale/notification/template/Notification_id.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_id.properties rename to webapp/src/main/resources/locale/notification/template/Notification_id.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_in.properties b/webapp/src/main/resources/locale/notification/template/Notification_in.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_in.properties rename to webapp/src/main/resources/locale/notification/template/Notification_in.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_it.properties b/webapp/src/main/resources/locale/notification/template/Notification_it.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_it.properties rename to webapp/src/main/resources/locale/notification/template/Notification_it.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_ja.properties b/webapp/src/main/resources/locale/notification/template/Notification_ja.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_ja.properties rename to webapp/src/main/resources/locale/notification/template/Notification_ja.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_kab.properties b/webapp/src/main/resources/locale/notification/template/Notification_kab.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_kab.properties rename to webapp/src/main/resources/locale/notification/template/Notification_kab.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_ko.properties b/webapp/src/main/resources/locale/notification/template/Notification_ko.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_ko.properties rename to webapp/src/main/resources/locale/notification/template/Notification_ko.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_lt.properties b/webapp/src/main/resources/locale/notification/template/Notification_lt.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_lt.properties rename to webapp/src/main/resources/locale/notification/template/Notification_lt.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_ms.properties b/webapp/src/main/resources/locale/notification/template/Notification_ms.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_ms.properties rename to webapp/src/main/resources/locale/notification/template/Notification_ms.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_nl.properties b/webapp/src/main/resources/locale/notification/template/Notification_nl.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_nl.properties rename to webapp/src/main/resources/locale/notification/template/Notification_nl.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_no.properties b/webapp/src/main/resources/locale/notification/template/Notification_no.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_no.properties rename to webapp/src/main/resources/locale/notification/template/Notification_no.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_pcm.properties b/webapp/src/main/resources/locale/notification/template/Notification_pcm.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_pcm.properties rename to webapp/src/main/resources/locale/notification/template/Notification_pcm.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_pl.properties b/webapp/src/main/resources/locale/notification/template/Notification_pl.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_pl.properties rename to webapp/src/main/resources/locale/notification/template/Notification_pl.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_pt_BR.properties b/webapp/src/main/resources/locale/notification/template/Notification_pt_BR.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_pt_BR.properties rename to webapp/src/main/resources/locale/notification/template/Notification_pt_BR.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_pt_PT.properties b/webapp/src/main/resources/locale/notification/template/Notification_pt_PT.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_pt_PT.properties rename to webapp/src/main/resources/locale/notification/template/Notification_pt_PT.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_ro.properties b/webapp/src/main/resources/locale/notification/template/Notification_ro.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_ro.properties rename to webapp/src/main/resources/locale/notification/template/Notification_ro.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_ru.properties b/webapp/src/main/resources/locale/notification/template/Notification_ru.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_ru.properties rename to webapp/src/main/resources/locale/notification/template/Notification_ru.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_sk.properties b/webapp/src/main/resources/locale/notification/template/Notification_sk.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_sk.properties rename to webapp/src/main/resources/locale/notification/template/Notification_sk.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_sl.properties b/webapp/src/main/resources/locale/notification/template/Notification_sl.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_sl.properties rename to webapp/src/main/resources/locale/notification/template/Notification_sl.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_sq.properties b/webapp/src/main/resources/locale/notification/template/Notification_sq.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_sq.properties rename to webapp/src/main/resources/locale/notification/template/Notification_sq.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_sv_SE.properties b/webapp/src/main/resources/locale/notification/template/Notification_sv_SE.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_sv_SE.properties rename to webapp/src/main/resources/locale/notification/template/Notification_sv_SE.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_th.properties b/webapp/src/main/resources/locale/notification/template/Notification_th.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_th.properties rename to webapp/src/main/resources/locale/notification/template/Notification_th.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_tl.properties b/webapp/src/main/resources/locale/notification/template/Notification_tl.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_tl.properties rename to webapp/src/main/resources/locale/notification/template/Notification_tl.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_tr.properties b/webapp/src/main/resources/locale/notification/template/Notification_tr.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_tr.properties rename to webapp/src/main/resources/locale/notification/template/Notification_tr.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_uk.properties b/webapp/src/main/resources/locale/notification/template/Notification_uk.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_uk.properties rename to webapp/src/main/resources/locale/notification/template/Notification_uk.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_ur_IN.properties b/webapp/src/main/resources/locale/notification/template/Notification_ur_IN.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_ur_IN.properties rename to webapp/src/main/resources/locale/notification/template/Notification_ur_IN.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_vi.properties b/webapp/src/main/resources/locale/notification/template/Notification_vi.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_vi.properties rename to webapp/src/main/resources/locale/notification/template/Notification_vi.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_zh_CN.properties b/webapp/src/main/resources/locale/notification/template/Notification_zh_CN.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_zh_CN.properties rename to webapp/src/main/resources/locale/notification/template/Notification_zh_CN.properties diff --git a/extension/war/src/main/resources/locale/notification/template/Notification_zh_TW.properties b/webapp/src/main/resources/locale/notification/template/Notification_zh_TW.properties similarity index 100% rename from extension/war/src/main/resources/locale/notification/template/Notification_zh_TW.properties rename to webapp/src/main/resources/locale/notification/template/Notification_zh_TW.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_ar.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_ar.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_ar.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_ar.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_aro.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_aro.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_aro.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_aro.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_az.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_az.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_az.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_az.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_ca.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_ca.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_ca.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_ca.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_ceb.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_ceb.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_ceb.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_ceb.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_co.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_co.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_co.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_co.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_cs.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_cs.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_cs.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_cs.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_de.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_de.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_de.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_de.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_el.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_el.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_el.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_el.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_en.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_en.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_en.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_en.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_es_ES.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_es_ES.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_es_ES.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_es_ES.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_eu.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_eu.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_eu.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_eu.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_fa.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_fa.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_fa.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_fa.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_fi.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_fi.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_fi.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_fi.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_fil.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_fil.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_fil.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_fil.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_fr.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_fr.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_fr.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_fr.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_hi.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_hi.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_hi.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_hi.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_hu.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_hu.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_hu.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_hu.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_id.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_id.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_id.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_id.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_in.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_in.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_in.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_in.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_it.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_it.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_it.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_it.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_ja.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_ja.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_ja.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_ja.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_kab.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_kab.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_kab.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_kab.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_ko.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_ko.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_ko.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_ko.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_lt.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_lt.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_lt.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_lt.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_ms.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_ms.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_ms.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_ms.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_nl.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_nl.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_nl.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_nl.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_no.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_no.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_no.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_no.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_pcm.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_pcm.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_pcm.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_pcm.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_pl.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_pl.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_pl.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_pl.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_pt_BR.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_pt_BR.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_pt_BR.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_pt_BR.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_pt_PT.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_pt_PT.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_pt_PT.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_pt_PT.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_ro.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_ro.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_ro.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_ro.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_ru.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_ru.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_ru.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_ru.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_sk.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_sk.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_sk.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_sk.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_sl.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_sl.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_sl.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_sl.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_sq.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_sq.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_sq.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_sq.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_sv_SE.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_sv_SE.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_sv_SE.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_sv_SE.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_th.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_th.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_th.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_th.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_tl.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_tl.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_tl.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_tl.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_tr.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_tr.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_tr.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_tr.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_uk.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_uk.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_uk.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_uk.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_ur_IN.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_ur_IN.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_ur_IN.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_ur_IN.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_vi.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_vi.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_vi.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_vi.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_zh_CN.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_zh_CN.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_zh_CN.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_zh_CN.properties diff --git a/extension/war/src/main/resources/locale/portal/HamburgerMenu_zh_TW.properties b/webapp/src/main/resources/locale/portal/HamburgerMenu_zh_TW.properties similarity index 100% rename from extension/war/src/main/resources/locale/portal/HamburgerMenu_zh_TW.properties rename to webapp/src/main/resources/locale/portal/HamburgerMenu_zh_TW.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_ar.properties b/webapp/src/main/resources/locale/portal_ar.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_ar.properties rename to webapp/src/main/resources/locale/portal_ar.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_aro.properties b/webapp/src/main/resources/locale/portal_aro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_aro.properties rename to webapp/src/main/resources/locale/portal_aro.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_az.properties b/webapp/src/main/resources/locale/portal_az.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_az.properties rename to webapp/src/main/resources/locale/portal_az.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_ca.properties b/webapp/src/main/resources/locale/portal_ca.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_ca.properties rename to webapp/src/main/resources/locale/portal_ca.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_ceb.properties b/webapp/src/main/resources/locale/portal_ceb.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_ceb.properties rename to webapp/src/main/resources/locale/portal_ceb.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_co.properties b/webapp/src/main/resources/locale/portal_co.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_co.properties rename to webapp/src/main/resources/locale/portal_co.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_cs.properties b/webapp/src/main/resources/locale/portal_cs.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_cs.properties rename to webapp/src/main/resources/locale/portal_cs.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_de.properties b/webapp/src/main/resources/locale/portal_de.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_de.properties rename to webapp/src/main/resources/locale/portal_de.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_el.properties b/webapp/src/main/resources/locale/portal_el.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_el.properties rename to webapp/src/main/resources/locale/portal_el.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_en.properties b/webapp/src/main/resources/locale/portal_en.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_en.properties rename to webapp/src/main/resources/locale/portal_en.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_es_ES.properties b/webapp/src/main/resources/locale/portal_es_ES.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_es_ES.properties rename to webapp/src/main/resources/locale/portal_es_ES.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_eu.properties b/webapp/src/main/resources/locale/portal_eu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_eu.properties rename to webapp/src/main/resources/locale/portal_eu.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_fa.properties b/webapp/src/main/resources/locale/portal_fa.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_fa.properties rename to webapp/src/main/resources/locale/portal_fa.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_fi.properties b/webapp/src/main/resources/locale/portal_fi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_fi.properties rename to webapp/src/main/resources/locale/portal_fi.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_fil.properties b/webapp/src/main/resources/locale/portal_fil.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_fil.properties rename to webapp/src/main/resources/locale/portal_fil.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_fr.properties b/webapp/src/main/resources/locale/portal_fr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_fr.properties rename to webapp/src/main/resources/locale/portal_fr.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_he.properties b/webapp/src/main/resources/locale/portal_he.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_he.properties rename to webapp/src/main/resources/locale/portal_he.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_hi.properties b/webapp/src/main/resources/locale/portal_hi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_hi.properties rename to webapp/src/main/resources/locale/portal_hi.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_hu.properties b/webapp/src/main/resources/locale/portal_hu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_hu.properties rename to webapp/src/main/resources/locale/portal_hu.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_id.properties b/webapp/src/main/resources/locale/portal_id.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_id.properties rename to webapp/src/main/resources/locale/portal_id.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_in.properties b/webapp/src/main/resources/locale/portal_in.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_in.properties rename to webapp/src/main/resources/locale/portal_in.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_it.properties b/webapp/src/main/resources/locale/portal_it.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_it.properties rename to webapp/src/main/resources/locale/portal_it.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_ja.properties b/webapp/src/main/resources/locale/portal_ja.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_ja.properties rename to webapp/src/main/resources/locale/portal_ja.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_kab.properties b/webapp/src/main/resources/locale/portal_kab.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_kab.properties rename to webapp/src/main/resources/locale/portal_kab.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_ko.properties b/webapp/src/main/resources/locale/portal_ko.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_ko.properties rename to webapp/src/main/resources/locale/portal_ko.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_lt.properties b/webapp/src/main/resources/locale/portal_lt.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_lt.properties rename to webapp/src/main/resources/locale/portal_lt.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_ms.properties b/webapp/src/main/resources/locale/portal_ms.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_ms.properties rename to webapp/src/main/resources/locale/portal_ms.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_nl.properties b/webapp/src/main/resources/locale/portal_nl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_nl.properties rename to webapp/src/main/resources/locale/portal_nl.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_no.properties b/webapp/src/main/resources/locale/portal_no.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_no.properties rename to webapp/src/main/resources/locale/portal_no.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_pcm.properties b/webapp/src/main/resources/locale/portal_pcm.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_pcm.properties rename to webapp/src/main/resources/locale/portal_pcm.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_pl.properties b/webapp/src/main/resources/locale/portal_pl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_pl.properties rename to webapp/src/main/resources/locale/portal_pl.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_pt_BR.properties b/webapp/src/main/resources/locale/portal_pt_BR.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_pt_BR.properties rename to webapp/src/main/resources/locale/portal_pt_BR.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_pt_PT.properties b/webapp/src/main/resources/locale/portal_pt_PT.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_pt_PT.properties rename to webapp/src/main/resources/locale/portal_pt_PT.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_ro.properties b/webapp/src/main/resources/locale/portal_ro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_ro.properties rename to webapp/src/main/resources/locale/portal_ro.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_ru.properties b/webapp/src/main/resources/locale/portal_ru.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_ru.properties rename to webapp/src/main/resources/locale/portal_ru.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_sk.properties b/webapp/src/main/resources/locale/portal_sk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_sk.properties rename to webapp/src/main/resources/locale/portal_sk.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_sl.properties b/webapp/src/main/resources/locale/portal_sl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_sl.properties rename to webapp/src/main/resources/locale/portal_sl.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_sq.properties b/webapp/src/main/resources/locale/portal_sq.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_sq.properties rename to webapp/src/main/resources/locale/portal_sq.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_sv_SE.properties b/webapp/src/main/resources/locale/portal_sv_SE.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_sv_SE.properties rename to webapp/src/main/resources/locale/portal_sv_SE.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_th.properties b/webapp/src/main/resources/locale/portal_th.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_th.properties rename to webapp/src/main/resources/locale/portal_th.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_tl.properties b/webapp/src/main/resources/locale/portal_tl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_tl.properties rename to webapp/src/main/resources/locale/portal_tl.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_tr.properties b/webapp/src/main/resources/locale/portal_tr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_tr.properties rename to webapp/src/main/resources/locale/portal_tr.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_uk.properties b/webapp/src/main/resources/locale/portal_uk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_uk.properties rename to webapp/src/main/resources/locale/portal_uk.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_ur_IN.properties b/webapp/src/main/resources/locale/portal_ur_IN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_ur_IN.properties rename to webapp/src/main/resources/locale/portal_ur_IN.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_vi.properties b/webapp/src/main/resources/locale/portal_vi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_vi.properties rename to webapp/src/main/resources/locale/portal_vi.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_zh_CN.properties b/webapp/src/main/resources/locale/portal_zh_CN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_zh_CN.properties rename to webapp/src/main/resources/locale/portal_zh_CN.properties diff --git a/webapp/portlet/src/main/resources/locale/portal_zh_TW.properties b/webapp/src/main/resources/locale/portal_zh_TW.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portal_zh_TW.properties rename to webapp/src/main/resources/locale/portal_zh_TW.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_ar.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_ar.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_ar.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_ar.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_aro.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_aro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_aro.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_aro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_az.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_az.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_az.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_az.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_ca.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_ca.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_ca.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_ca.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_ceb.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_ceb.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_ceb.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_ceb.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_co.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_co.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_co.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_co.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_cs.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_cs.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_cs.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_cs.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_de.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_de.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_de.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_de.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_el.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_el.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_el.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_el.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_en.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_en.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_en.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_en.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_es_ES.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_es_ES.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_es_ES.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_es_ES.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_eu.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_eu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_eu.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_eu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_fa.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_fa.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_fa.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_fa.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_fi.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_fi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_fi.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_fi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_fil.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_fil.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_fil.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_fil.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_fr.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_fr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_fr.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_fr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_hi.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_hi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_hi.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_hi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_hu.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_hu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_hu.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_hu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_id.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_id.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_id.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_id.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_in.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_in.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_in.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_in.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_it.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_it.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_it.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_it.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_ja.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_ja.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_ja.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_ja.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_ko.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_ko.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_ko.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_ko.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_lt.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_lt.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_lt.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_lt.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_ms.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_ms.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_ms.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_ms.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_nl.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_nl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_nl.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_nl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_no.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_no.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_no.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_no.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_pcm.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_pcm.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_pcm.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_pcm.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_pl.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_pl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_pl.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_pl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_pt_BR.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_pt_BR.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_pt_BR.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_pt_BR.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_pt_PT.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_pt_PT.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_pt_PT.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_pt_PT.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_ro.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_ro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_ro.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_ro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_ru.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_ru.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_ru.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_ru.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_sk.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_sk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_sk.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_sk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_sl.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_sl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_sl.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_sl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_sq.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_sq.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_sq.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_sq.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_sv_SE.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_sv_SE.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_sv_SE.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_sv_SE.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_th.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_th.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_th.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_th.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_tl.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_tl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_tl.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_tl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_tr.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_tr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_tr.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_tr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_uk.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_uk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_uk.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_uk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_ur_IN.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_ur_IN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_ur_IN.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_ur_IN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_vi.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_vi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_vi.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_vi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_zh_CN.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_zh_CN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_zh_CN.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_zh_CN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_zh_TW.properties b/webapp/src/main/resources/locale/portlet/GeneralSettings_zh_TW.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_zh_TW.properties rename to webapp/src/main/resources/locale/portlet/GeneralSettings_zh_TW.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_ar.properties b/webapp/src/main/resources/locale/portlet/Image_ar.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_ar.properties rename to webapp/src/main/resources/locale/portlet/Image_ar.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_aro.properties b/webapp/src/main/resources/locale/portlet/Image_aro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_aro.properties rename to webapp/src/main/resources/locale/portlet/Image_aro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_az.properties b/webapp/src/main/resources/locale/portlet/Image_az.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_az.properties rename to webapp/src/main/resources/locale/portlet/Image_az.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_ca.properties b/webapp/src/main/resources/locale/portlet/Image_ca.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_ca.properties rename to webapp/src/main/resources/locale/portlet/Image_ca.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_ceb.properties b/webapp/src/main/resources/locale/portlet/Image_ceb.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_ceb.properties rename to webapp/src/main/resources/locale/portlet/Image_ceb.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_co.properties b/webapp/src/main/resources/locale/portlet/Image_co.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_co.properties rename to webapp/src/main/resources/locale/portlet/Image_co.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_cs.properties b/webapp/src/main/resources/locale/portlet/Image_cs.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_cs.properties rename to webapp/src/main/resources/locale/portlet/Image_cs.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_de.properties b/webapp/src/main/resources/locale/portlet/Image_de.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_de.properties rename to webapp/src/main/resources/locale/portlet/Image_de.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_el.properties b/webapp/src/main/resources/locale/portlet/Image_el.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_el.properties rename to webapp/src/main/resources/locale/portlet/Image_el.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_en.properties b/webapp/src/main/resources/locale/portlet/Image_en.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_en.properties rename to webapp/src/main/resources/locale/portlet/Image_en.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_es_ES.properties b/webapp/src/main/resources/locale/portlet/Image_es_ES.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_es_ES.properties rename to webapp/src/main/resources/locale/portlet/Image_es_ES.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_eu.properties b/webapp/src/main/resources/locale/portlet/Image_eu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_eu.properties rename to webapp/src/main/resources/locale/portlet/Image_eu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_fa.properties b/webapp/src/main/resources/locale/portlet/Image_fa.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_fa.properties rename to webapp/src/main/resources/locale/portlet/Image_fa.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_fi.properties b/webapp/src/main/resources/locale/portlet/Image_fi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_fi.properties rename to webapp/src/main/resources/locale/portlet/Image_fi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_fil.properties b/webapp/src/main/resources/locale/portlet/Image_fil.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_fil.properties rename to webapp/src/main/resources/locale/portlet/Image_fil.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_fr.properties b/webapp/src/main/resources/locale/portlet/Image_fr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_fr.properties rename to webapp/src/main/resources/locale/portlet/Image_fr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_hi.properties b/webapp/src/main/resources/locale/portlet/Image_hi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_hi.properties rename to webapp/src/main/resources/locale/portlet/Image_hi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_hu.properties b/webapp/src/main/resources/locale/portlet/Image_hu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_hu.properties rename to webapp/src/main/resources/locale/portlet/Image_hu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_id.properties b/webapp/src/main/resources/locale/portlet/Image_id.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_id.properties rename to webapp/src/main/resources/locale/portlet/Image_id.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_it.properties b/webapp/src/main/resources/locale/portlet/Image_it.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_it.properties rename to webapp/src/main/resources/locale/portlet/Image_it.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_ja.properties b/webapp/src/main/resources/locale/portlet/Image_ja.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_ja.properties rename to webapp/src/main/resources/locale/portlet/Image_ja.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_ko.properties b/webapp/src/main/resources/locale/portlet/Image_ko.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_ko.properties rename to webapp/src/main/resources/locale/portlet/Image_ko.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_lt.properties b/webapp/src/main/resources/locale/portlet/Image_lt.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_lt.properties rename to webapp/src/main/resources/locale/portlet/Image_lt.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_ms.properties b/webapp/src/main/resources/locale/portlet/Image_ms.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_ms.properties rename to webapp/src/main/resources/locale/portlet/Image_ms.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_nl.properties b/webapp/src/main/resources/locale/portlet/Image_nl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_nl.properties rename to webapp/src/main/resources/locale/portlet/Image_nl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_no.properties b/webapp/src/main/resources/locale/portlet/Image_no.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_no.properties rename to webapp/src/main/resources/locale/portlet/Image_no.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_pcm.properties b/webapp/src/main/resources/locale/portlet/Image_pcm.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_pcm.properties rename to webapp/src/main/resources/locale/portlet/Image_pcm.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_pl.properties b/webapp/src/main/resources/locale/portlet/Image_pl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_pl.properties rename to webapp/src/main/resources/locale/portlet/Image_pl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_pt_BR.properties b/webapp/src/main/resources/locale/portlet/Image_pt_BR.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_pt_BR.properties rename to webapp/src/main/resources/locale/portlet/Image_pt_BR.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_pt_PT.properties b/webapp/src/main/resources/locale/portlet/Image_pt_PT.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_pt_PT.properties rename to webapp/src/main/resources/locale/portlet/Image_pt_PT.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_ro.properties b/webapp/src/main/resources/locale/portlet/Image_ro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_ro.properties rename to webapp/src/main/resources/locale/portlet/Image_ro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_ru.properties b/webapp/src/main/resources/locale/portlet/Image_ru.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_ru.properties rename to webapp/src/main/resources/locale/portlet/Image_ru.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_sk.properties b/webapp/src/main/resources/locale/portlet/Image_sk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_sk.properties rename to webapp/src/main/resources/locale/portlet/Image_sk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_sl.properties b/webapp/src/main/resources/locale/portlet/Image_sl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_sl.properties rename to webapp/src/main/resources/locale/portlet/Image_sl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_sq.properties b/webapp/src/main/resources/locale/portlet/Image_sq.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_sq.properties rename to webapp/src/main/resources/locale/portlet/Image_sq.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_sv_SE.properties b/webapp/src/main/resources/locale/portlet/Image_sv_SE.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_sv_SE.properties rename to webapp/src/main/resources/locale/portlet/Image_sv_SE.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_th.properties b/webapp/src/main/resources/locale/portlet/Image_th.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_th.properties rename to webapp/src/main/resources/locale/portlet/Image_th.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_tl.properties b/webapp/src/main/resources/locale/portlet/Image_tl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_tl.properties rename to webapp/src/main/resources/locale/portlet/Image_tl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_tr.properties b/webapp/src/main/resources/locale/portlet/Image_tr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_tr.properties rename to webapp/src/main/resources/locale/portlet/Image_tr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_uk.properties b/webapp/src/main/resources/locale/portlet/Image_uk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_uk.properties rename to webapp/src/main/resources/locale/portlet/Image_uk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_ur_IN.properties b/webapp/src/main/resources/locale/portlet/Image_ur_IN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_ur_IN.properties rename to webapp/src/main/resources/locale/portlet/Image_ur_IN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_vi.properties b/webapp/src/main/resources/locale/portlet/Image_vi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_vi.properties rename to webapp/src/main/resources/locale/portlet/Image_vi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_zh_CN.properties b/webapp/src/main/resources/locale/portlet/Image_zh_CN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_zh_CN.properties rename to webapp/src/main/resources/locale/portlet/Image_zh_CN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Image_zh_TW.properties b/webapp/src/main/resources/locale/portlet/Image_zh_TW.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Image_zh_TW.properties rename to webapp/src/main/resources/locale/portlet/Image_zh_TW.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_ar.properties b/webapp/src/main/resources/locale/portlet/Links_ar.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_ar.properties rename to webapp/src/main/resources/locale/portlet/Links_ar.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_aro.properties b/webapp/src/main/resources/locale/portlet/Links_aro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_aro.properties rename to webapp/src/main/resources/locale/portlet/Links_aro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_az.properties b/webapp/src/main/resources/locale/portlet/Links_az.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_az.properties rename to webapp/src/main/resources/locale/portlet/Links_az.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_ca.properties b/webapp/src/main/resources/locale/portlet/Links_ca.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_ca.properties rename to webapp/src/main/resources/locale/portlet/Links_ca.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_ceb.properties b/webapp/src/main/resources/locale/portlet/Links_ceb.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_ceb.properties rename to webapp/src/main/resources/locale/portlet/Links_ceb.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_co.properties b/webapp/src/main/resources/locale/portlet/Links_co.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_co.properties rename to webapp/src/main/resources/locale/portlet/Links_co.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_cs.properties b/webapp/src/main/resources/locale/portlet/Links_cs.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_cs.properties rename to webapp/src/main/resources/locale/portlet/Links_cs.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_de.properties b/webapp/src/main/resources/locale/portlet/Links_de.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_de.properties rename to webapp/src/main/resources/locale/portlet/Links_de.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_el.properties b/webapp/src/main/resources/locale/portlet/Links_el.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_el.properties rename to webapp/src/main/resources/locale/portlet/Links_el.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_en.properties b/webapp/src/main/resources/locale/portlet/Links_en.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_en.properties rename to webapp/src/main/resources/locale/portlet/Links_en.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_es_ES.properties b/webapp/src/main/resources/locale/portlet/Links_es_ES.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_es_ES.properties rename to webapp/src/main/resources/locale/portlet/Links_es_ES.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_eu.properties b/webapp/src/main/resources/locale/portlet/Links_eu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_eu.properties rename to webapp/src/main/resources/locale/portlet/Links_eu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_fa.properties b/webapp/src/main/resources/locale/portlet/Links_fa.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_fa.properties rename to webapp/src/main/resources/locale/portlet/Links_fa.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_fi.properties b/webapp/src/main/resources/locale/portlet/Links_fi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_fi.properties rename to webapp/src/main/resources/locale/portlet/Links_fi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_fil.properties b/webapp/src/main/resources/locale/portlet/Links_fil.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_fil.properties rename to webapp/src/main/resources/locale/portlet/Links_fil.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_fr.properties b/webapp/src/main/resources/locale/portlet/Links_fr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_fr.properties rename to webapp/src/main/resources/locale/portlet/Links_fr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_hi.properties b/webapp/src/main/resources/locale/portlet/Links_hi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_hi.properties rename to webapp/src/main/resources/locale/portlet/Links_hi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_hu.properties b/webapp/src/main/resources/locale/portlet/Links_hu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_hu.properties rename to webapp/src/main/resources/locale/portlet/Links_hu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_id.properties b/webapp/src/main/resources/locale/portlet/Links_id.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_id.properties rename to webapp/src/main/resources/locale/portlet/Links_id.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_in.properties b/webapp/src/main/resources/locale/portlet/Links_in.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_in.properties rename to webapp/src/main/resources/locale/portlet/Links_in.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_it.properties b/webapp/src/main/resources/locale/portlet/Links_it.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_it.properties rename to webapp/src/main/resources/locale/portlet/Links_it.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_ja.properties b/webapp/src/main/resources/locale/portlet/Links_ja.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_ja.properties rename to webapp/src/main/resources/locale/portlet/Links_ja.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_ko.properties b/webapp/src/main/resources/locale/portlet/Links_ko.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_ko.properties rename to webapp/src/main/resources/locale/portlet/Links_ko.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_lt.properties b/webapp/src/main/resources/locale/portlet/Links_lt.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_lt.properties rename to webapp/src/main/resources/locale/portlet/Links_lt.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_ms.properties b/webapp/src/main/resources/locale/portlet/Links_ms.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_ms.properties rename to webapp/src/main/resources/locale/portlet/Links_ms.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_nl.properties b/webapp/src/main/resources/locale/portlet/Links_nl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_nl.properties rename to webapp/src/main/resources/locale/portlet/Links_nl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_no.properties b/webapp/src/main/resources/locale/portlet/Links_no.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_no.properties rename to webapp/src/main/resources/locale/portlet/Links_no.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_pcm.properties b/webapp/src/main/resources/locale/portlet/Links_pcm.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_pcm.properties rename to webapp/src/main/resources/locale/portlet/Links_pcm.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_pl.properties b/webapp/src/main/resources/locale/portlet/Links_pl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_pl.properties rename to webapp/src/main/resources/locale/portlet/Links_pl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_pt_BR.properties b/webapp/src/main/resources/locale/portlet/Links_pt_BR.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_pt_BR.properties rename to webapp/src/main/resources/locale/portlet/Links_pt_BR.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_pt_PT.properties b/webapp/src/main/resources/locale/portlet/Links_pt_PT.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_pt_PT.properties rename to webapp/src/main/resources/locale/portlet/Links_pt_PT.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_ro.properties b/webapp/src/main/resources/locale/portlet/Links_ro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_ro.properties rename to webapp/src/main/resources/locale/portlet/Links_ro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_ru.properties b/webapp/src/main/resources/locale/portlet/Links_ru.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_ru.properties rename to webapp/src/main/resources/locale/portlet/Links_ru.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_sk.properties b/webapp/src/main/resources/locale/portlet/Links_sk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_sk.properties rename to webapp/src/main/resources/locale/portlet/Links_sk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_sl.properties b/webapp/src/main/resources/locale/portlet/Links_sl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_sl.properties rename to webapp/src/main/resources/locale/portlet/Links_sl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_sq.properties b/webapp/src/main/resources/locale/portlet/Links_sq.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_sq.properties rename to webapp/src/main/resources/locale/portlet/Links_sq.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_sv_SE.properties b/webapp/src/main/resources/locale/portlet/Links_sv_SE.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_sv_SE.properties rename to webapp/src/main/resources/locale/portlet/Links_sv_SE.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_th.properties b/webapp/src/main/resources/locale/portlet/Links_th.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_th.properties rename to webapp/src/main/resources/locale/portlet/Links_th.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_tl.properties b/webapp/src/main/resources/locale/portlet/Links_tl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_tl.properties rename to webapp/src/main/resources/locale/portlet/Links_tl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_tr.properties b/webapp/src/main/resources/locale/portlet/Links_tr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_tr.properties rename to webapp/src/main/resources/locale/portlet/Links_tr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_uk.properties b/webapp/src/main/resources/locale/portlet/Links_uk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_uk.properties rename to webapp/src/main/resources/locale/portlet/Links_uk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_ur_IN.properties b/webapp/src/main/resources/locale/portlet/Links_ur_IN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_ur_IN.properties rename to webapp/src/main/resources/locale/portlet/Links_ur_IN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_vi.properties b/webapp/src/main/resources/locale/portlet/Links_vi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_vi.properties rename to webapp/src/main/resources/locale/portlet/Links_vi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_zh_CN.properties b/webapp/src/main/resources/locale/portlet/Links_zh_CN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_zh_CN.properties rename to webapp/src/main/resources/locale/portlet/Links_zh_CN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Links_zh_TW.properties b/webapp/src/main/resources/locale/portlet/Links_zh_TW.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Links_zh_TW.properties rename to webapp/src/main/resources/locale/portlet/Links_zh_TW.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_ar.properties b/webapp/src/main/resources/locale/portlet/Login_ar.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_ar.properties rename to webapp/src/main/resources/locale/portlet/Login_ar.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_aro.properties b/webapp/src/main/resources/locale/portlet/Login_aro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_aro.properties rename to webapp/src/main/resources/locale/portlet/Login_aro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_az.properties b/webapp/src/main/resources/locale/portlet/Login_az.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_az.properties rename to webapp/src/main/resources/locale/portlet/Login_az.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_ca.properties b/webapp/src/main/resources/locale/portlet/Login_ca.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_ca.properties rename to webapp/src/main/resources/locale/portlet/Login_ca.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_ceb.properties b/webapp/src/main/resources/locale/portlet/Login_ceb.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_ceb.properties rename to webapp/src/main/resources/locale/portlet/Login_ceb.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_co.properties b/webapp/src/main/resources/locale/portlet/Login_co.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_co.properties rename to webapp/src/main/resources/locale/portlet/Login_co.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_cs.properties b/webapp/src/main/resources/locale/portlet/Login_cs.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_cs.properties rename to webapp/src/main/resources/locale/portlet/Login_cs.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_de.properties b/webapp/src/main/resources/locale/portlet/Login_de.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_de.properties rename to webapp/src/main/resources/locale/portlet/Login_de.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_el.properties b/webapp/src/main/resources/locale/portlet/Login_el.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_el.properties rename to webapp/src/main/resources/locale/portlet/Login_el.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_en.properties b/webapp/src/main/resources/locale/portlet/Login_en.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_en.properties rename to webapp/src/main/resources/locale/portlet/Login_en.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_es_ES.properties b/webapp/src/main/resources/locale/portlet/Login_es_ES.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_es_ES.properties rename to webapp/src/main/resources/locale/portlet/Login_es_ES.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_eu.properties b/webapp/src/main/resources/locale/portlet/Login_eu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_eu.properties rename to webapp/src/main/resources/locale/portlet/Login_eu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_fa.properties b/webapp/src/main/resources/locale/portlet/Login_fa.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_fa.properties rename to webapp/src/main/resources/locale/portlet/Login_fa.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_fi.properties b/webapp/src/main/resources/locale/portlet/Login_fi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_fi.properties rename to webapp/src/main/resources/locale/portlet/Login_fi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_fil.properties b/webapp/src/main/resources/locale/portlet/Login_fil.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_fil.properties rename to webapp/src/main/resources/locale/portlet/Login_fil.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_fr.properties b/webapp/src/main/resources/locale/portlet/Login_fr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_fr.properties rename to webapp/src/main/resources/locale/portlet/Login_fr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_hi.properties b/webapp/src/main/resources/locale/portlet/Login_hi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_hi.properties rename to webapp/src/main/resources/locale/portlet/Login_hi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_hu.properties b/webapp/src/main/resources/locale/portlet/Login_hu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_hu.properties rename to webapp/src/main/resources/locale/portlet/Login_hu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_id.properties b/webapp/src/main/resources/locale/portlet/Login_id.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_id.properties rename to webapp/src/main/resources/locale/portlet/Login_id.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_in.properties b/webapp/src/main/resources/locale/portlet/Login_in.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_in.properties rename to webapp/src/main/resources/locale/portlet/Login_in.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_it.properties b/webapp/src/main/resources/locale/portlet/Login_it.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_it.properties rename to webapp/src/main/resources/locale/portlet/Login_it.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_ja.properties b/webapp/src/main/resources/locale/portlet/Login_ja.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_ja.properties rename to webapp/src/main/resources/locale/portlet/Login_ja.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_ko.properties b/webapp/src/main/resources/locale/portlet/Login_ko.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_ko.properties rename to webapp/src/main/resources/locale/portlet/Login_ko.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_lt.properties b/webapp/src/main/resources/locale/portlet/Login_lt.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_lt.properties rename to webapp/src/main/resources/locale/portlet/Login_lt.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_ms.properties b/webapp/src/main/resources/locale/portlet/Login_ms.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_ms.properties rename to webapp/src/main/resources/locale/portlet/Login_ms.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_nl.properties b/webapp/src/main/resources/locale/portlet/Login_nl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_nl.properties rename to webapp/src/main/resources/locale/portlet/Login_nl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_no.properties b/webapp/src/main/resources/locale/portlet/Login_no.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_no.properties rename to webapp/src/main/resources/locale/portlet/Login_no.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_pcm.properties b/webapp/src/main/resources/locale/portlet/Login_pcm.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_pcm.properties rename to webapp/src/main/resources/locale/portlet/Login_pcm.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_pl.properties b/webapp/src/main/resources/locale/portlet/Login_pl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_pl.properties rename to webapp/src/main/resources/locale/portlet/Login_pl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_pt_BR.properties b/webapp/src/main/resources/locale/portlet/Login_pt_BR.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_pt_BR.properties rename to webapp/src/main/resources/locale/portlet/Login_pt_BR.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_pt_PT.properties b/webapp/src/main/resources/locale/portlet/Login_pt_PT.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_pt_PT.properties rename to webapp/src/main/resources/locale/portlet/Login_pt_PT.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_ro.properties b/webapp/src/main/resources/locale/portlet/Login_ro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_ro.properties rename to webapp/src/main/resources/locale/portlet/Login_ro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_ru.properties b/webapp/src/main/resources/locale/portlet/Login_ru.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_ru.properties rename to webapp/src/main/resources/locale/portlet/Login_ru.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_sk.properties b/webapp/src/main/resources/locale/portlet/Login_sk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_sk.properties rename to webapp/src/main/resources/locale/portlet/Login_sk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_sl.properties b/webapp/src/main/resources/locale/portlet/Login_sl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_sl.properties rename to webapp/src/main/resources/locale/portlet/Login_sl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_sq.properties b/webapp/src/main/resources/locale/portlet/Login_sq.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_sq.properties rename to webapp/src/main/resources/locale/portlet/Login_sq.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_sv_SE.properties b/webapp/src/main/resources/locale/portlet/Login_sv_SE.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_sv_SE.properties rename to webapp/src/main/resources/locale/portlet/Login_sv_SE.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_th.properties b/webapp/src/main/resources/locale/portlet/Login_th.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_th.properties rename to webapp/src/main/resources/locale/portlet/Login_th.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_tl.properties b/webapp/src/main/resources/locale/portlet/Login_tl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_tl.properties rename to webapp/src/main/resources/locale/portlet/Login_tl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_tr.properties b/webapp/src/main/resources/locale/portlet/Login_tr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_tr.properties rename to webapp/src/main/resources/locale/portlet/Login_tr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_uk.properties b/webapp/src/main/resources/locale/portlet/Login_uk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_uk.properties rename to webapp/src/main/resources/locale/portlet/Login_uk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_ur_IN.properties b/webapp/src/main/resources/locale/portlet/Login_ur_IN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_ur_IN.properties rename to webapp/src/main/resources/locale/portlet/Login_ur_IN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_vi.properties b/webapp/src/main/resources/locale/portlet/Login_vi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_vi.properties rename to webapp/src/main/resources/locale/portlet/Login_vi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_zh_CN.properties b/webapp/src/main/resources/locale/portlet/Login_zh_CN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_zh_CN.properties rename to webapp/src/main/resources/locale/portlet/Login_zh_CN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Login_zh_TW.properties b/webapp/src/main/resources/locale/portlet/Login_zh_TW.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Login_zh_TW.properties rename to webapp/src/main/resources/locale/portlet/Login_zh_TW.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_ar.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_ar.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_ar.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_ar.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_aro.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_aro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_aro.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_aro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_az.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_az.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_az.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_az.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_ca.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_ca.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_ca.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_ca.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_ceb.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_ceb.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_ceb.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_ceb.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_co.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_co.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_co.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_co.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_cs.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_cs.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_cs.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_cs.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_de.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_de.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_de.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_de.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_el.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_el.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_el.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_el.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_en.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_en.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_en.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_en.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_es_ES.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_es_ES.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_es_ES.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_es_ES.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_eu.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_eu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_eu.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_eu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_fa.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_fa.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_fa.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_fa.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_fi.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_fi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_fi.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_fi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_fil.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_fil.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_fil.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_fil.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_fr.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_fr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_fr.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_fr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_hi.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_hi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_hi.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_hi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_hu.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_hu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_hu.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_hu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_id.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_id.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_id.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_id.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_in.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_in.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_in.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_in.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_it.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_it.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_it.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_it.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_ja.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_ja.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_ja.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_ja.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_ko.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_ko.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_ko.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_ko.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_lt.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_lt.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_lt.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_lt.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_ms.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_ms.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_ms.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_ms.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_nl.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_nl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_nl.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_nl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_no.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_no.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_no.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_no.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_pcm.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_pcm.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_pcm.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_pcm.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_pl.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_pl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_pl.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_pl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_pt_BR.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_pt_BR.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_pt_BR.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_pt_BR.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_pt_PT.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_pt_PT.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_pt_PT.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_pt_PT.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_ro.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_ro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_ro.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_ro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_ru.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_ru.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_ru.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_ru.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_sk.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_sk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_sk.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_sk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_sl.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_sl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_sl.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_sl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_sq.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_sq.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_sq.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_sq.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_sv_SE.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_sv_SE.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_sv_SE.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_sv_SE.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_th.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_th.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_th.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_th.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_tl.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_tl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_tl.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_tl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_tr.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_tr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_tr.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_tr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_uk.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_uk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_uk.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_uk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_ur_IN.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_ur_IN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_ur_IN.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_ur_IN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_vi.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_vi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_vi.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_vi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_zh_CN.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_zh_CN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_zh_CN.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_zh_CN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_zh_TW.properties b/webapp/src/main/resources/locale/portlet/NotificationAdministration_zh_TW.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_zh_TW.properties rename to webapp/src/main/resources/locale/portlet/NotificationAdministration_zh_TW.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_ar.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_ar.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_ar.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_ar.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_aro.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_aro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_aro.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_aro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_az.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_az.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_az.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_az.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_ca.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_ca.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_ca.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_ca.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_ceb.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_ceb.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_ceb.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_ceb.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_co.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_co.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_co.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_co.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_cs.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_cs.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_cs.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_cs.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_de.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_de.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_de.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_de.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_el.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_el.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_el.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_el.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_en.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_en.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_en.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_en.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_es_ES.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_es_ES.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_es_ES.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_es_ES.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_eu.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_eu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_eu.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_eu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_fa.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_fa.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_fa.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_fa.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_fi.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_fi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_fi.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_fi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_fil.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_fil.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_fil.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_fil.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_fr.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_fr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_fr.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_fr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_hi.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_hi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_hi.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_hi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_hu.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_hu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_hu.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_hu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_id.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_id.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_id.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_id.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_it.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_it.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_it.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_it.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_ja.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_ja.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_ja.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_ja.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_ko.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_ko.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_ko.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_ko.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_lt.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_lt.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_lt.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_lt.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_ms.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_ms.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_ms.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_ms.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_nl.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_nl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_nl.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_nl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_no.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_no.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_no.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_no.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_pcm.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_pcm.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_pcm.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_pcm.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_pl.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_pl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_pl.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_pl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_pt_BR.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_pt_BR.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_pt_BR.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_pt_BR.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_pt_PT.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_pt_PT.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_pt_PT.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_pt_PT.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_ro.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_ro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_ro.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_ro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_ru.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_ru.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_ru.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_ru.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_sk.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_sk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_sk.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_sk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_sl.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_sl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_sl.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_sl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_sq.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_sq.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_sq.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_sq.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_sv_SE.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_sv_SE.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_sv_SE.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_sv_SE.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_th.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_th.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_th.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_th.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_tl.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_tl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_tl.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_tl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_tr.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_tr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_tr.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_tr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_uk.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_uk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_uk.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_uk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_ur_IN.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_ur_IN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_ur_IN.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_ur_IN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_vi.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_vi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_vi.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_vi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_zh_CN.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_zh_CN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_zh_CN.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_zh_CN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_zh_TW.properties b/webapp/src/main/resources/locale/portlet/PlatformSettings_zh_TW.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_zh_TW.properties rename to webapp/src/main/resources/locale/portlet/PlatformSettings_zh_TW.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_ar.properties b/webapp/src/main/resources/locale/portlet/Portlets_ar.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_ar.properties rename to webapp/src/main/resources/locale/portlet/Portlets_ar.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_aro.properties b/webapp/src/main/resources/locale/portlet/Portlets_aro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_aro.properties rename to webapp/src/main/resources/locale/portlet/Portlets_aro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_az.properties b/webapp/src/main/resources/locale/portlet/Portlets_az.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_az.properties rename to webapp/src/main/resources/locale/portlet/Portlets_az.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_ca.properties b/webapp/src/main/resources/locale/portlet/Portlets_ca.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_ca.properties rename to webapp/src/main/resources/locale/portlet/Portlets_ca.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_ceb.properties b/webapp/src/main/resources/locale/portlet/Portlets_ceb.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_ceb.properties rename to webapp/src/main/resources/locale/portlet/Portlets_ceb.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_co.properties b/webapp/src/main/resources/locale/portlet/Portlets_co.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_co.properties rename to webapp/src/main/resources/locale/portlet/Portlets_co.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_cs.properties b/webapp/src/main/resources/locale/portlet/Portlets_cs.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_cs.properties rename to webapp/src/main/resources/locale/portlet/Portlets_cs.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_de.properties b/webapp/src/main/resources/locale/portlet/Portlets_de.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_de.properties rename to webapp/src/main/resources/locale/portlet/Portlets_de.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_el.properties b/webapp/src/main/resources/locale/portlet/Portlets_el.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_el.properties rename to webapp/src/main/resources/locale/portlet/Portlets_el.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_en.properties b/webapp/src/main/resources/locale/portlet/Portlets_en.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_en.properties rename to webapp/src/main/resources/locale/portlet/Portlets_en.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_es_ES.properties b/webapp/src/main/resources/locale/portlet/Portlets_es_ES.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_es_ES.properties rename to webapp/src/main/resources/locale/portlet/Portlets_es_ES.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_eu.properties b/webapp/src/main/resources/locale/portlet/Portlets_eu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_eu.properties rename to webapp/src/main/resources/locale/portlet/Portlets_eu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_fa.properties b/webapp/src/main/resources/locale/portlet/Portlets_fa.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_fa.properties rename to webapp/src/main/resources/locale/portlet/Portlets_fa.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_fi.properties b/webapp/src/main/resources/locale/portlet/Portlets_fi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_fi.properties rename to webapp/src/main/resources/locale/portlet/Portlets_fi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_fil.properties b/webapp/src/main/resources/locale/portlet/Portlets_fil.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_fil.properties rename to webapp/src/main/resources/locale/portlet/Portlets_fil.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_fr.properties b/webapp/src/main/resources/locale/portlet/Portlets_fr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_fr.properties rename to webapp/src/main/resources/locale/portlet/Portlets_fr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_he.properties b/webapp/src/main/resources/locale/portlet/Portlets_he.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_he.properties rename to webapp/src/main/resources/locale/portlet/Portlets_he.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_hi.properties b/webapp/src/main/resources/locale/portlet/Portlets_hi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_hi.properties rename to webapp/src/main/resources/locale/portlet/Portlets_hi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_hu.properties b/webapp/src/main/resources/locale/portlet/Portlets_hu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_hu.properties rename to webapp/src/main/resources/locale/portlet/Portlets_hu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_id.properties b/webapp/src/main/resources/locale/portlet/Portlets_id.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_id.properties rename to webapp/src/main/resources/locale/portlet/Portlets_id.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_in.properties b/webapp/src/main/resources/locale/portlet/Portlets_in.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_in.properties rename to webapp/src/main/resources/locale/portlet/Portlets_in.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_it.properties b/webapp/src/main/resources/locale/portlet/Portlets_it.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_it.properties rename to webapp/src/main/resources/locale/portlet/Portlets_it.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_ja.properties b/webapp/src/main/resources/locale/portlet/Portlets_ja.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_ja.properties rename to webapp/src/main/resources/locale/portlet/Portlets_ja.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_kab.properties b/webapp/src/main/resources/locale/portlet/Portlets_kab.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_kab.properties rename to webapp/src/main/resources/locale/portlet/Portlets_kab.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_ko.properties b/webapp/src/main/resources/locale/portlet/Portlets_ko.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_ko.properties rename to webapp/src/main/resources/locale/portlet/Portlets_ko.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_lt.properties b/webapp/src/main/resources/locale/portlet/Portlets_lt.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_lt.properties rename to webapp/src/main/resources/locale/portlet/Portlets_lt.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_ms.properties b/webapp/src/main/resources/locale/portlet/Portlets_ms.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_ms.properties rename to webapp/src/main/resources/locale/portlet/Portlets_ms.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_nl.properties b/webapp/src/main/resources/locale/portlet/Portlets_nl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_nl.properties rename to webapp/src/main/resources/locale/portlet/Portlets_nl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_no.properties b/webapp/src/main/resources/locale/portlet/Portlets_no.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_no.properties rename to webapp/src/main/resources/locale/portlet/Portlets_no.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_pcm.properties b/webapp/src/main/resources/locale/portlet/Portlets_pcm.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_pcm.properties rename to webapp/src/main/resources/locale/portlet/Portlets_pcm.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_pl.properties b/webapp/src/main/resources/locale/portlet/Portlets_pl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_pl.properties rename to webapp/src/main/resources/locale/portlet/Portlets_pl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_pt_BR.properties b/webapp/src/main/resources/locale/portlet/Portlets_pt_BR.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_pt_BR.properties rename to webapp/src/main/resources/locale/portlet/Portlets_pt_BR.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_pt_PT.properties b/webapp/src/main/resources/locale/portlet/Portlets_pt_PT.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_pt_PT.properties rename to webapp/src/main/resources/locale/portlet/Portlets_pt_PT.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_ro.properties b/webapp/src/main/resources/locale/portlet/Portlets_ro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_ro.properties rename to webapp/src/main/resources/locale/portlet/Portlets_ro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_ru.properties b/webapp/src/main/resources/locale/portlet/Portlets_ru.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_ru.properties rename to webapp/src/main/resources/locale/portlet/Portlets_ru.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_sk.properties b/webapp/src/main/resources/locale/portlet/Portlets_sk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_sk.properties rename to webapp/src/main/resources/locale/portlet/Portlets_sk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_sl.properties b/webapp/src/main/resources/locale/portlet/Portlets_sl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_sl.properties rename to webapp/src/main/resources/locale/portlet/Portlets_sl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_sq.properties b/webapp/src/main/resources/locale/portlet/Portlets_sq.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_sq.properties rename to webapp/src/main/resources/locale/portlet/Portlets_sq.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_sv_SE.properties b/webapp/src/main/resources/locale/portlet/Portlets_sv_SE.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_sv_SE.properties rename to webapp/src/main/resources/locale/portlet/Portlets_sv_SE.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_th.properties b/webapp/src/main/resources/locale/portlet/Portlets_th.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_th.properties rename to webapp/src/main/resources/locale/portlet/Portlets_th.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_tl.properties b/webapp/src/main/resources/locale/portlet/Portlets_tl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_tl.properties rename to webapp/src/main/resources/locale/portlet/Portlets_tl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_tr.properties b/webapp/src/main/resources/locale/portlet/Portlets_tr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_tr.properties rename to webapp/src/main/resources/locale/portlet/Portlets_tr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_uk.properties b/webapp/src/main/resources/locale/portlet/Portlets_uk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_uk.properties rename to webapp/src/main/resources/locale/portlet/Portlets_uk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_ur_IN.properties b/webapp/src/main/resources/locale/portlet/Portlets_ur_IN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_ur_IN.properties rename to webapp/src/main/resources/locale/portlet/Portlets_ur_IN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_vi.properties b/webapp/src/main/resources/locale/portlet/Portlets_vi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_vi.properties rename to webapp/src/main/resources/locale/portlet/Portlets_vi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_zh_CN.properties b/webapp/src/main/resources/locale/portlet/Portlets_zh_CN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_zh_CN.properties rename to webapp/src/main/resources/locale/portlet/Portlets_zh_CN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/Portlets_zh_TW.properties b/webapp/src/main/resources/locale/portlet/Portlets_zh_TW.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/Portlets_zh_TW.properties rename to webapp/src/main/resources/locale/portlet/Portlets_zh_TW.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_ar.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ar.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_ar.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ar.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_aro.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_aro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_aro.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_aro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_az.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_az.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_az.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_az.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_ca.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ca.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_ca.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ca.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_ceb.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ceb.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_ceb.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ceb.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_co.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_co.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_co.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_co.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_cs.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_cs.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_cs.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_cs.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_de.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_de.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_de.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_de.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_el.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_el.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_el.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_el.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_en.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_en.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_en.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_en.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_es_ES.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_es_ES.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_es_ES.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_es_ES.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_eu.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_eu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_eu.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_eu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_fa.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_fa.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_fa.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_fa.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_fi.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_fi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_fi.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_fi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_fil.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_fil.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_fil.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_fil.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_fr.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_fr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_fr.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_fr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_hi.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_hi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_hi.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_hi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_hu.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_hu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_hu.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_hu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_id.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_id.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_id.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_id.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_in.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_in.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_in.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_in.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_it.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_it.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_it.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_it.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_ja.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ja.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_ja.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ja.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_ko.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ko.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_ko.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ko.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_lt.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_lt.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_lt.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_lt.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_ms.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ms.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_ms.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ms.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_nl.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_nl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_nl.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_nl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_no.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_no.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_no.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_no.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_pcm.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_pcm.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_pcm.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_pcm.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_pl.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_pl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_pl.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_pl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_pt_BR.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_pt_BR.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_pt_BR.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_pt_BR.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_pt_PT.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_pt_PT.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_pt_PT.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_pt_PT.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_ro.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_ro.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_ru.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ru.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_ru.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ru.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_sk.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_sk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_sk.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_sk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_sl.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_sl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_sl.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_sl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_sq.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_sq.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_sq.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_sq.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_sv_SE.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_sv_SE.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_sv_SE.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_sv_SE.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_th.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_th.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_th.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_th.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_tl.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_tl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_tl.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_tl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_tr.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_tr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_tr.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_tr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_uk.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_uk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_uk.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_uk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_ur_IN.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ur_IN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_ur_IN.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_ur_IN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_vi.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_vi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_vi.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_vi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_zh_CN.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_zh_CN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_zh_CN.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_zh_CN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_zh_TW.properties b/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_zh_TW.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_zh_TW.properties rename to webapp/src/main/resources/locale/portlet/UserNotificationPortlet_zh_TW.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_ar.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_ar.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_ar.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_ar.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_aro.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_aro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_aro.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_aro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_az.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_az.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_az.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_az.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_ca.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_ca.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_ca.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_ca.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_ceb.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_ceb.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_ceb.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_ceb.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_co.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_co.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_co.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_co.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_cs.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_cs.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_cs.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_cs.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_de.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_de.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_de.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_de.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_el.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_el.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_el.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_el.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_en.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_en.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_en.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_en.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_es_ES.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_es_ES.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_es_ES.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_es_ES.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_eu.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_eu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_eu.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_eu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_fa.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_fa.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_fa.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_fa.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_fi.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_fi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_fi.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_fi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_fil.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_fil.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_fil.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_fil.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_fr.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_fr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_fr.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_fr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_hi.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_hi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_hi.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_hi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_hu.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_hu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_hu.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_hu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_id.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_id.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_id.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_id.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_it.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_it.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_it.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_it.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_ja.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_ja.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_ja.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_ja.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_ko.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_ko.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_ko.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_ko.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_lt.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_lt.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_lt.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_lt.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_ms.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_ms.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_ms.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_ms.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_nl.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_nl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_nl.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_nl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_no.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_no.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_no.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_no.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_pcm.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_pcm.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_pcm.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_pcm.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_pl.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_pl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_pl.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_pl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_pt_BR.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_pt_BR.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_pt_BR.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_pt_BR.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_pt_PT.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_pt_PT.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_pt_PT.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_pt_PT.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_ro.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_ro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_ro.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_ro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_ru.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_ru.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_ru.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_ru.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_sk.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_sk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_sk.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_sk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_sl.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_sl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_sl.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_sl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_sq.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_sq.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_sq.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_sq.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_sv_SE.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_sv_SE.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_sv_SE.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_sv_SE.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_th.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_th.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_th.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_th.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_tl.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_tl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_tl.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_tl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_tr.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_tr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_tr.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_tr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_uk.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_uk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_uk.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_uk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_ur_IN.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_ur_IN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_ur_IN.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_ur_IN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_vi.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_vi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_vi.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_vi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_zh_CN.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_zh_CN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_zh_CN.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_zh_CN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_zh_TW.properties b/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_zh_TW.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_zh_TW.properties rename to webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_zh_TW.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ar.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ar.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ar.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ar.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_aro.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_aro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_aro.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_aro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_az.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_az.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_az.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_az.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ca.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ca.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ca.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ca.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ceb.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ceb.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ceb.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ceb.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_co.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_co.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_co.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_co.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_cs.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_cs.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_cs.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_cs.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_de.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_de.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_de.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_de.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_el.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_el.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_el.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_el.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_en.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_en.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_en.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_en.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_es_ES.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_es_ES.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_es_ES.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_es_ES.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_eu.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_eu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_eu.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_eu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_fa.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_fa.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_fa.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_fa.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_fi.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_fi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_fi.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_fi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_fil.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_fil.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_fil.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_fil.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_fr.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_fr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_fr.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_fr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_hi.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_hi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_hi.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_hi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_hu.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_hu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_hu.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_hu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_id.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_id.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_id.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_id.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_in.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_in.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_in.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_in.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_it.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_it.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_it.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_it.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ja.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ja.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ja.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ja.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_kab.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_kab.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_kab.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_kab.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ko.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ko.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ko.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ko.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_lt.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_lt.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_lt.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_lt.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ms.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ms.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ms.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ms.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_nl.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_nl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_nl.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_nl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_no.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_no.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_no.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_no.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_pcm.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_pcm.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_pcm.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_pcm.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_pl.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_pl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_pl.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_pl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_pt_BR.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_pt_BR.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_pt_BR.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_pt_BR.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_pt_PT.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_pt_PT.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_pt_PT.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_pt_PT.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ro.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ro.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ru.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ru.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ru.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ru.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_sk.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_sk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_sk.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_sk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_sl.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_sl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_sl.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_sl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_sq.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_sq.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_sq.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_sq.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_sv_SE.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_sv_SE.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_sv_SE.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_sv_SE.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_th.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_th.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_th.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_th.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_tl.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_tl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_tl.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_tl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_tr.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_tr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_tr.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_tr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_uk.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_uk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_uk.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_uk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ur_IN.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ur_IN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ur_IN.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_ur_IN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_vi.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_vi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_vi.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_vi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_zh_CN.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_zh_CN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_zh_CN.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_zh_CN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_zh_TW.properties b/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_zh_TW.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_zh_TW.properties rename to webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_zh_TW.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_ar.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_ar.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_ar.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_ar.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_aro.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_aro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_aro.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_aro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_az.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_az.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_az.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_az.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_ca.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_ca.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_ca.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_ca.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_ceb.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_ceb.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_ceb.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_ceb.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_co.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_co.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_co.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_co.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_cs.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_cs.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_cs.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_cs.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_de.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_de.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_de.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_de.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_el.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_el.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_el.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_el.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_en.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_en.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_en.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_en.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_es_ES.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_es_ES.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_es_ES.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_es_ES.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_eu.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_eu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_eu.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_eu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_fa.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_fa.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_fa.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_fa.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_fi.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_fi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_fi.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_fi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_fil.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_fil.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_fil.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_fil.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_fr.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_fr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_fr.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_fr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_hi.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_hi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_hi.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_hi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_hu.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_hu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_hu.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_hu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_id.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_id.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_id.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_id.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_in.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_in.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_in.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_in.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_it.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_it.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_it.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_it.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_ja.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_ja.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_ja.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_ja.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_kab.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_kab.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_kab.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_kab.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_ko.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_ko.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_ko.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_ko.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_lt.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_lt.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_lt.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_lt.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_ms.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_ms.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_ms.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_ms.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_nl.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_nl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_nl.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_nl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_no.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_no.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_no.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_no.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_pcm.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_pcm.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_pcm.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_pcm.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_pl.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_pl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_pl.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_pl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_pt_BR.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_pt_BR.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_pt_BR.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_pt_BR.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_pt_PT.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_pt_PT.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_pt_PT.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_pt_PT.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_ro.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_ro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_ro.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_ro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_ru.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_ru.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_ru.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_ru.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_sk.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_sk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_sk.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_sk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_sl.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_sl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_sl.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_sl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_sq.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_sq.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_sq.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_sq.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_sv_SE.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_sv_SE.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_sv_SE.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_sv_SE.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_th.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_th.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_th.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_th.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_tl.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_tl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_tl.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_tl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_tr.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_tr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_tr.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_tr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_uk.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_uk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_uk.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_uk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_ur_IN.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_ur_IN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_ur_IN.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_ur_IN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_vi.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_vi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_vi.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_vi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_zh_CN.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_zh_CN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_zh_CN.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_zh_CN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_zh_TW.properties b/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_zh_TW.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_zh_TW.properties rename to webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_zh_TW.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_ar.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_ar.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_ar.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_ar.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_aro.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_aro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_aro.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_aro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_az.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_az.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_az.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_az.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_ca.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_ca.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_ca.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_ca.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_ceb.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_ceb.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_ceb.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_ceb.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_co.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_co.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_co.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_co.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_cs.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_cs.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_cs.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_cs.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_de.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_de.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_de.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_de.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_el.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_el.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_el.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_el.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_en.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_en.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_en.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_en.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_es_ES.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_es_ES.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_es_ES.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_es_ES.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_eu.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_eu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_eu.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_eu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_fa.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_fa.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_fa.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_fa.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_fi.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_fi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_fi.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_fi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_fil.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_fil.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_fil.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_fil.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_fr.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_fr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_fr.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_fr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_hi.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_hi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_hi.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_hi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_hu.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_hu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_hu.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_hu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_id.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_id.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_id.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_id.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_in.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_in.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_in.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_in.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_it.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_it.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_it.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_it.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_ja.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_ja.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_ja.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_ja.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_kab.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_kab.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_kab.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_kab.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_ko.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_ko.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_ko.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_ko.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_lt.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_lt.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_lt.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_lt.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_ms.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_ms.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_ms.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_ms.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_nl.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_nl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_nl.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_nl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_no.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_no.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_no.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_no.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_pcm.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_pcm.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_pcm.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_pcm.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_pl.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_pl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_pl.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_pl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_pt_BR.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_pt_BR.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_pt_BR.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_pt_BR.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_pt_PT.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_pt_PT.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_pt_PT.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_pt_PT.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_ro.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_ro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_ro.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_ro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_ru.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_ru.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_ru.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_ru.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_sk.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_sk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_sk.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_sk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_sl.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_sl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_sl.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_sl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_sq.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_sq.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_sq.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_sq.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_sv_SE.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_sv_SE.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_sv_SE.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_sv_SE.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_th.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_th.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_th.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_th.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_tl.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_tl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_tl.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_tl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_tr.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_tr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_tr.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_tr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_uk.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_uk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_uk.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_uk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_ur_IN.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_ur_IN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_ur_IN.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_ur_IN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_vi.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_vi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_vi.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_vi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_zh_CN.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_zh_CN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_zh_CN.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_zh_CN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_zh_TW.properties b/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_zh_TW.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_zh_TW.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleListApplication_zh_TW.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_ar.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_ar.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_ar.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_ar.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_aro.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_aro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_aro.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_aro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_az.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_az.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_az.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_az.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_ca.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_ca.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_ca.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_ca.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_ceb.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_ceb.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_ceb.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_ceb.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_co.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_co.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_co.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_co.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_cs.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_cs.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_cs.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_cs.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_de.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_de.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_de.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_de.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_el.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_el.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_el.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_el.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_en.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_en.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_en.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_en.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_es_ES.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_es_ES.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_es_ES.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_es_ES.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_eu.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_eu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_eu.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_eu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_fa.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_fa.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_fa.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_fa.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_fi.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_fi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_fi.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_fi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_fil.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_fil.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_fil.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_fil.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_fr.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_fr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_fr.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_fr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_hi.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_hi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_hi.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_hi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_hu.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_hu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_hu.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_hu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_id.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_id.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_id.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_id.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_in.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_in.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_in.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_in.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_it.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_it.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_it.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_it.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_ja.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_ja.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_ja.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_ja.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_kab.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_kab.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_kab.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_kab.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_ko.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_ko.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_ko.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_ko.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_lt.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_lt.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_lt.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_lt.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_ms.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_ms.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_ms.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_ms.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_nl.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_nl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_nl.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_nl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_no.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_no.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_no.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_no.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_pcm.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_pcm.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_pcm.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_pcm.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_pl.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_pl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_pl.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_pl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_pt_BR.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_pt_BR.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_pt_BR.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_pt_BR.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_pt_PT.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_pt_PT.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_pt_PT.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_pt_PT.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_ro.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_ro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_ro.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_ro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_ru.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_ru.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_ru.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_ru.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_sk.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_sk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_sk.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_sk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_sl.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_sl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_sl.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_sl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_sq.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_sq.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_sq.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_sq.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_sv_SE.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_sv_SE.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_sv_SE.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_sv_SE.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_th.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_th.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_th.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_th.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_tl.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_tl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_tl.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_tl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_tr.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_tr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_tr.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_tr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_uk.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_uk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_uk.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_uk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_ur_IN.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_ur_IN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_ur_IN.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_ur_IN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_vi.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_vi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_vi.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_vi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_zh_CN.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_zh_CN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_zh_CN.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_zh_CN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_zh_TW.properties b/webapp/src/main/resources/locale/portlet/social/PeopleOverview_zh_TW.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_zh_TW.properties rename to webapp/src/main/resources/locale/portlet/social/PeopleOverview_zh_TW.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_ar.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_ar.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_ar.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_ar.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_aro.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_aro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_aro.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_aro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_az.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_az.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_az.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_az.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_ca.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_ca.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_ca.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_ca.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_ceb.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_ceb.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_ceb.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_ceb.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_co.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_co.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_co.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_co.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_cs.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_cs.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_cs.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_cs.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_de.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_de.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_de.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_de.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_el.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_el.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_el.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_el.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_en.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_en.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_en.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_en.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_es_ES.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_es_ES.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_es_ES.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_es_ES.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_eu.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_eu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_eu.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_eu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_fa.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_fa.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_fa.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_fa.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_fi.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_fi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_fi.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_fi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_fil.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_fil.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_fil.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_fil.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_fr.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_fr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_fr.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_fr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_hi.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_hi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_hi.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_hi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_hu.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_hu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_hu.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_hu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_id.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_id.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_id.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_id.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_in.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_in.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_in.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_in.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_it.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_it.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_it.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_it.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_ja.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_ja.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_ja.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_ja.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_kab.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_kab.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_kab.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_kab.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_ko.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_ko.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_ko.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_ko.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_lt.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_lt.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_lt.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_lt.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_ms.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_ms.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_ms.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_ms.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_nl.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_nl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_nl.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_nl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_no.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_no.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_no.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_no.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_pcm.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_pcm.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_pcm.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_pcm.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_pl.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_pl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_pl.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_pl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_pt_BR.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_pt_BR.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_pt_BR.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_pt_BR.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_pt_PT.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_pt_PT.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_pt_PT.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_pt_PT.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_ro.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_ro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_ro.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_ro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_ru.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_ru.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_ru.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_ru.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_sk.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_sk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_sk.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_sk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_sl.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_sl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_sl.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_sl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_sq.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_sq.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_sq.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_sq.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_sv_SE.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_sv_SE.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_sv_SE.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_sv_SE.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_th.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_th.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_th.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_th.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_tl.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_tl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_tl.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_tl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_tr.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_tr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_tr.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_tr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_uk.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_uk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_uk.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_uk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_ur_IN.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_ur_IN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_ur_IN.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_ur_IN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_vi.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_vi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_vi.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_vi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_zh_CN.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_zh_CN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_zh_CN.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_zh_CN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_zh_TW.properties b/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_zh_TW.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_zh_TW.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_zh_TW.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_ar.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_ar.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_ar.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_ar.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_aro.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_aro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_aro.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_aro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_az.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_az.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_az.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_az.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_ca.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_ca.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_ca.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_ca.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_ceb.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_ceb.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_ceb.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_ceb.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_co.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_co.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_co.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_co.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_cs.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_cs.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_cs.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_cs.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_de.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_de.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_de.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_de.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_el.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_el.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_el.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_el.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_en.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_en.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_en.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_en.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_es_ES.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_es_ES.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_es_ES.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_es_ES.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_eu.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_eu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_eu.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_eu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_fa.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_fa.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_fa.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_fa.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_fi.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_fi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_fi.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_fi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_fil.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_fil.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_fil.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_fil.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_fr.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_fr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_fr.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_fr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_hi.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_hi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_hi.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_hi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_hu.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_hu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_hu.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_hu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_id.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_id.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_id.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_id.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_in.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_in.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_in.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_in.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_it.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_it.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_it.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_it.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_ja.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_ja.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_ja.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_ja.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_kab.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_kab.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_kab.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_kab.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_ko.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_ko.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_ko.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_ko.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_lt.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_lt.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_lt.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_lt.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_ms.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_ms.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_ms.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_ms.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_nl.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_nl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_nl.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_nl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_no.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_no.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_no.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_no.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_pcm.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_pcm.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_pcm.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_pcm.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_pl.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_pl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_pl.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_pl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_pt_BR.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_pt_BR.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_pt_BR.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_pt_BR.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_pt_PT.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_pt_PT.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_pt_PT.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_pt_PT.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_ro.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_ro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_ro.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_ro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_ru.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_ru.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_ru.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_ru.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_sk.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_sk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_sk.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_sk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_sl.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_sl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_sl.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_sl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_sq.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_sq.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_sq.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_sq.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_sv_SE.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_sv_SE.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_sv_SE.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_sv_SE.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_th.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_th.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_th.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_th.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_tl.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_tl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_tl.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_tl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_tr.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_tr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_tr.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_tr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_uk.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_uk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_uk.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_uk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_ur_IN.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_ur_IN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_ur_IN.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_ur_IN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_vi.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_vi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_vi.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_vi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_zh_CN.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_zh_CN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_zh_CN.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_zh_CN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_zh_TW.properties b/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_zh_TW.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_zh_TW.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_zh_TW.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_ar.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_ar.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_ar.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_ar.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_aro.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_aro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_aro.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_aro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_az.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_az.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_az.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_az.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_ca.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_ca.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_ca.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_ca.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_ceb.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_ceb.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_ceb.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_ceb.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_co.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_co.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_co.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_co.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_cs.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_cs.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_cs.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_cs.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_de.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_de.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_de.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_de.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_el.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_el.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_el.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_el.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_en.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_en.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_en.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_en.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_es_ES.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_es_ES.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_es_ES.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_es_ES.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_eu.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_eu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_eu.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_eu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_fa.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_fa.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_fa.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_fa.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_fi.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_fi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_fi.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_fi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_fil.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_fil.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_fil.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_fil.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_fr.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_fr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_fr.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_fr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_hi.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_hi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_hi.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_hi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_hu.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_hu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_hu.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_hu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_id.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_id.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_id.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_id.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_in.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_in.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_in.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_in.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_it.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_it.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_it.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_it.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_ja.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_ja.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_ja.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_ja.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_kab.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_kab.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_kab.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_kab.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_ko.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_ko.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_ko.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_ko.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_lt.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_lt.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_lt.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_lt.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_ms.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_ms.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_ms.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_ms.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_nl.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_nl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_nl.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_nl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_no.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_no.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_no.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_no.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_pcm.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_pcm.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_pcm.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_pcm.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_pl.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_pl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_pl.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_pl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_pt_BR.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_pt_BR.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_pt_BR.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_pt_BR.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_pt_PT.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_pt_PT.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_pt_PT.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_pt_PT.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_ro.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_ro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_ro.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_ro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_ru.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_ru.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_ru.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_ru.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_sk.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_sk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_sk.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_sk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_sl.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_sl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_sl.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_sl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_sq.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_sq.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_sq.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_sq.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_sv_SE.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_sv_SE.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_sv_SE.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_sv_SE.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_th.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_th.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_th.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_th.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_tl.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_tl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_tl.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_tl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_tr.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_tr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_tr.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_tr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_uk.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_uk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_uk.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_uk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_ur_IN.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_ur_IN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_ur_IN.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_ur_IN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_vi.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_vi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_vi.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_vi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_zh_CN.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_zh_CN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_zh_CN.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_zh_CN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_zh_TW.properties b/webapp/src/main/resources/locale/portlet/social/ProfileHeader_zh_TW.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_zh_TW.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileHeader_zh_TW.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_ar.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_ar.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_ar.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_ar.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_aro.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_aro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_aro.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_aro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_az.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_az.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_az.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_az.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_ca.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_ca.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_ca.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_ca.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_ceb.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_ceb.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_ceb.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_ceb.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_co.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_co.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_co.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_co.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_cs.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_cs.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_cs.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_cs.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_de.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_de.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_de.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_de.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_el.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_el.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_el.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_el.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_en.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_en.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_en.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_en.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_es_ES.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_es_ES.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_es_ES.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_es_ES.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_eu.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_eu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_eu.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_eu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_fa.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_fa.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_fa.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_fa.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_fi.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_fi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_fi.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_fi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_fil.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_fil.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_fil.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_fil.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_fr.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_fr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_fr.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_fr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_hi.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_hi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_hi.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_hi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_hu.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_hu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_hu.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_hu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_id.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_id.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_id.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_id.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_in.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_in.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_in.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_in.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_it.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_it.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_it.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_it.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_ja.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_ja.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_ja.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_ja.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_kab.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_kab.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_kab.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_kab.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_ko.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_ko.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_ko.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_ko.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_lt.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_lt.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_lt.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_lt.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_ms.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_ms.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_ms.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_ms.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_nl.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_nl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_nl.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_nl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_no.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_no.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_no.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_no.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_pcm.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_pcm.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_pcm.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_pcm.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_pl.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_pl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_pl.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_pl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_pt_BR.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_pt_BR.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_pt_BR.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_pt_BR.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_pt_PT.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_pt_PT.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_pt_PT.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_pt_PT.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_ro.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_ro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_ro.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_ro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_ru.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_ru.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_ru.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_ru.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_sk.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_sk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_sk.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_sk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_sl.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_sl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_sl.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_sl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_sq.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_sq.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_sq.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_sq.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_sv_SE.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_sv_SE.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_sv_SE.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_sv_SE.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_th.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_th.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_th.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_th.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_tl.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_tl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_tl.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_tl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_tr.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_tr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_tr.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_tr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_uk.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_uk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_uk.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_uk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_ur_IN.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_ur_IN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_ur_IN.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_ur_IN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_vi.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_vi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_vi.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_vi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_zh_CN.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_zh_CN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_zh_CN.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_zh_CN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_zh_TW.properties b/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_zh_TW.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_zh_TW.properties rename to webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_zh_TW.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ar.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ar.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ar.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ar.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_aro.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_aro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_aro.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_aro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_az.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_az.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_az.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_az.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ca.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ca.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ca.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ca.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ceb.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ceb.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ceb.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ceb.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_co.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_co.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_co.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_co.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_cs.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_cs.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_cs.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_cs.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_de.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_de.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_de.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_de.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_el.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_el.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_el.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_el.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_en.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_en.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_en.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_en.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_es_ES.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_es_ES.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_es_ES.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_es_ES.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_eu.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_eu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_eu.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_eu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_fa.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_fa.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_fa.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_fa.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_fi.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_fi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_fi.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_fi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_fil.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_fil.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_fil.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_fil.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_fr.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_fr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_fr.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_fr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_hi.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_hi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_hi.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_hi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_hu.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_hu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_hu.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_hu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_id.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_id.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_id.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_id.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_in.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_in.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_in.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_in.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_it.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_it.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_it.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_it.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ja.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ja.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ja.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ja.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_kab.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_kab.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_kab.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_kab.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ko.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ko.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ko.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ko.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_lt.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_lt.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_lt.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_lt.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ms.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ms.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ms.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ms.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_nl.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_nl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_nl.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_nl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_no.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_no.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_no.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_no.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_pcm.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_pcm.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_pcm.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_pcm.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_pl.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_pl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_pl.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_pl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_pt_BR.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_pt_BR.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_pt_BR.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_pt_BR.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_pt_PT.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_pt_PT.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_pt_PT.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_pt_PT.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ro.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ro.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ru.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ru.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ru.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ru.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_sk.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_sk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_sk.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_sk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_sl.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_sl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_sl.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_sl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_sq.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_sq.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_sq.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_sq.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_sv_SE.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_sv_SE.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_sv_SE.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_sv_SE.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_th.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_th.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_th.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_th.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_tl.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_tl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_tl.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_tl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_tr.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_tr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_tr.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_tr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_uk.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_uk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_uk.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_uk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ur_IN.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ur_IN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ur_IN.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_ur_IN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_vi.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_vi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_vi.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_vi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_zh_CN.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_zh_CN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_zh_CN.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_zh_CN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_zh_TW.properties b/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_zh_TW.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_zh_TW.properties rename to webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_zh_TW.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ar.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ar.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ar.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ar.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_aro.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_aro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_aro.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_aro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_az.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_az.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_az.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_az.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ca.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ca.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ca.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ca.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ceb.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ceb.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ceb.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ceb.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_co.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_co.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_co.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_co.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_cs.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_cs.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_cs.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_cs.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_de.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_de.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_de.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_de.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_el.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_el.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_el.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_el.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_en.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_en.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_en.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_en.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_es_ES.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_es_ES.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_es_ES.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_es_ES.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_eu.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_eu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_eu.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_eu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_fa.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_fa.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_fa.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_fa.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_fi.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_fi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_fi.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_fi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_fil.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_fil.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_fil.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_fil.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_fr.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_fr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_fr.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_fr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_hi.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_hi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_hi.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_hi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_hu.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_hu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_hu.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_hu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_id.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_id.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_id.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_id.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_in.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_in.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_in.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_in.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_it.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_it.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_it.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_it.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ja.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ja.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ja.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ja.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_kab.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_kab.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_kab.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_kab.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ko.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ko.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ko.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ko.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_lt.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_lt.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_lt.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_lt.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ms.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ms.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ms.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ms.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_nl.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_nl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_nl.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_nl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_no.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_no.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_no.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_no.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_pcm.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_pcm.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_pcm.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_pcm.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_pl.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_pl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_pl.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_pl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_pt_BR.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_pt_BR.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_pt_BR.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_pt_BR.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_pt_PT.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_pt_PT.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_pt_PT.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_pt_PT.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ro.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ro.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ru.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ru.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ru.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ru.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_sk.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_sk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_sk.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_sk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_sl.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_sl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_sl.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_sl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_sq.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_sq.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_sq.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_sq.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_sv_SE.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_sv_SE.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_sv_SE.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_sv_SE.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_th.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_th.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_th.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_th.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_tl.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_tl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_tl.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_tl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_tr.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_tr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_tr.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_tr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_uk.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_uk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_uk.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_uk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ur_IN.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ur_IN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ur_IN.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_ur_IN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_vi.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_vi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_vi.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_vi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_zh_CN.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_zh_CN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_zh_CN.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_zh_CN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_zh_TW.properties b/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_zh_TW.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_zh_TW.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_zh_TW.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_ar.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ar.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_ar.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ar.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_aro.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_aro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_aro.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_aro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_az.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_az.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_az.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_az.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_ca.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ca.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_ca.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ca.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_ceb.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ceb.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_ceb.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ceb.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_co.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_co.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_co.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_co.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_cs.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_cs.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_cs.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_cs.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_de.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_de.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_de.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_de.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_el.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_el.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_el.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_el.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_en.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_en.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_en.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_en.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_es_ES.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_es_ES.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_es_ES.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_es_ES.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_eu.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_eu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_eu.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_eu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_fa.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_fa.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_fa.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_fa.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_fi.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_fi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_fi.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_fi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_fil.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_fil.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_fil.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_fil.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_fr.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_fr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_fr.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_fr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_hi.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_hi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_hi.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_hi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_hu.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_hu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_hu.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_hu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_id.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_id.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_id.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_id.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_in.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_in.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_in.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_in.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_it.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_it.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_it.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_it.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_ja.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ja.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_ja.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ja.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_kab.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_kab.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_kab.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_kab.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_ko.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ko.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_ko.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ko.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_lt.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_lt.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_lt.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_lt.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_ms.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ms.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_ms.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ms.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_nl.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_nl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_nl.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_nl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_no.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_no.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_no.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_no.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_pcm.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_pcm.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_pcm.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_pcm.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_pl.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_pl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_pl.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_pl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_pt_BR.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_pt_BR.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_pt_BR.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_pt_BR.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_pt_PT.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_pt_PT.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_pt_PT.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_pt_PT.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_ro.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_ro.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_ru.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ru.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_ru.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ru.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_sk.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_sk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_sk.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_sk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_sl.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_sl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_sl.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_sl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_sq.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_sq.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_sq.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_sq.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_sv_SE.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_sv_SE.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_sv_SE.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_sv_SE.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_th.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_th.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_th.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_th.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_tl.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_tl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_tl.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_tl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_tr.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_tr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_tr.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_tr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_uk.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_uk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_uk.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_uk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_ur_IN.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ur_IN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_ur_IN.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_ur_IN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_vi.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_vi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_vi.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_vi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_zh_CN.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_zh_CN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_zh_CN.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_zh_CN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_zh_TW.properties b/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_zh_TW.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_zh_TW.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesListApplication_zh_TW.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_ar.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_ar.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_ar.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_ar.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_aro.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_aro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_aro.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_aro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_az.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_az.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_az.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_az.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_ca.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_ca.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_ca.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_ca.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_ceb.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_ceb.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_ceb.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_ceb.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_co.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_co.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_co.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_co.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_cs.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_cs.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_cs.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_cs.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_de.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_de.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_de.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_de.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_el.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_el.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_el.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_el.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_en.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_en.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_en.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_en.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_es_ES.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_es_ES.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_es_ES.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_es_ES.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_eu.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_eu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_eu.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_eu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_fa.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_fa.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_fa.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_fa.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_fi.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_fi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_fi.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_fi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_fil.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_fil.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_fil.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_fil.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_fr.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_fr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_fr.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_fr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_hi.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_hi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_hi.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_hi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_hu.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_hu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_hu.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_hu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_id.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_id.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_id.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_id.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_in.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_in.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_in.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_in.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_it.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_it.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_it.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_it.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_ja.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_ja.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_ja.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_ja.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_kab.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_kab.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_kab.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_kab.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_ko.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_ko.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_ko.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_ko.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_lt.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_lt.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_lt.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_lt.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_ms.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_ms.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_ms.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_ms.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_nl.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_nl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_nl.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_nl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_no.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_no.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_no.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_no.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_pcm.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_pcm.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_pcm.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_pcm.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_pl.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_pl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_pl.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_pl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_pt_BR.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_pt_BR.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_pt_BR.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_pt_BR.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_pt_PT.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_pt_PT.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_pt_PT.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_pt_PT.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_ro.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_ro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_ro.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_ro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_ru.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_ru.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_ru.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_ru.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_sk.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_sk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_sk.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_sk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_sl.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_sl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_sl.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_sl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_sq.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_sq.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_sq.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_sq.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_sv_SE.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_sv_SE.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_sv_SE.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_sv_SE.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_th.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_th.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_th.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_th.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_tl.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_tl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_tl.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_tl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_tr.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_tr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_tr.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_tr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_uk.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_uk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_uk.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_uk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_ur_IN.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_ur_IN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_ur_IN.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_ur_IN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_vi.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_vi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_vi.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_vi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_zh_CN.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_zh_CN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_zh_CN.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_zh_CN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_zh_TW.properties b/webapp/src/main/resources/locale/portlet/social/SpacesOverview_zh_TW.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_zh_TW.properties rename to webapp/src/main/resources/locale/portlet/social/SpacesOverview_zh_TW.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_ar.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_ar.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_ar.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_ar.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_aro.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_aro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_aro.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_aro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_az.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_az.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_az.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_az.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_ca.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_ca.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_ca.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_ca.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_ceb.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_ceb.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_ceb.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_ceb.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_co.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_co.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_co.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_co.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_cs.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_cs.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_cs.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_cs.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_de.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_de.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_de.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_de.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_el.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_el.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_el.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_el.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_en.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_en.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_en.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_en.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_es_ES.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_es_ES.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_es_ES.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_es_ES.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_eu.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_eu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_eu.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_eu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_fa.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_fa.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_fa.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_fa.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_fi.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_fi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_fi.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_fi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_fil.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_fil.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_fil.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_fil.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_fr.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_fr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_fr.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_fr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_hi.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_hi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_hi.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_hi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_hu.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_hu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_hu.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_hu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_id.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_id.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_id.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_id.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_in.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_in.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_in.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_in.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_it.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_it.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_it.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_it.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_ja.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_ja.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_ja.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_ja.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_kab.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_kab.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_kab.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_kab.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_ko.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_ko.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_ko.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_ko.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_lt.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_lt.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_lt.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_lt.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_ms.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_ms.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_ms.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_ms.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_nl.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_nl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_nl.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_nl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_no.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_no.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_no.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_no.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_pcm.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_pcm.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_pcm.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_pcm.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_pl.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_pl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_pl.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_pl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_pt_BR.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_pt_BR.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_pt_BR.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_pt_BR.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_pt_PT.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_pt_PT.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_pt_PT.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_pt_PT.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_ro.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_ro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_ro.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_ro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_ru.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_ru.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_ru.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_ru.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_sk.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_sk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_sk.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_sk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_sl.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_sl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_sl.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_sl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_sq.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_sq.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_sq.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_sq.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_sv_SE.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_sv_SE.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_sv_SE.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_sv_SE.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_th.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_th.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_th.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_th.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_tl.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_tl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_tl.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_tl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_tr.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_tr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_tr.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_tr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_uk.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_uk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_uk.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_uk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_ur_IN.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_ur_IN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_ur_IN.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_ur_IN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_vi.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_vi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_vi.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_vi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_zh_CN.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_zh_CN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_zh_CN.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_zh_CN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_zh_TW.properties b/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_zh_TW.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_zh_TW.properties rename to webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_zh_TW.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_ar.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_ar.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_ar.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_ar.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_aro.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_aro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_aro.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_aro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_az.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_az.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_az.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_az.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_ca.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_ca.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_ca.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_ca.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_ceb.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_ceb.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_ceb.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_ceb.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_co.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_co.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_co.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_co.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_cs.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_cs.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_cs.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_cs.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_de.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_de.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_de.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_de.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_el.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_el.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_el.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_el.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_en.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_en.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_en.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_en.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_es_ES.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_es_ES.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_es_ES.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_es_ES.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_eu.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_eu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_eu.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_eu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_fa.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_fa.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_fa.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_fa.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_fi.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_fi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_fi.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_fi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_fil.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_fil.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_fil.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_fil.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_fr.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_fr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_fr.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_fr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_hi.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_hi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_hi.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_hi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_hu.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_hu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_hu.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_hu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_id.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_id.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_id.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_id.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_in.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_in.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_in.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_in.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_it.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_it.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_it.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_it.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_ja.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_ja.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_ja.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_ja.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_kab.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_kab.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_kab.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_kab.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_ko.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_ko.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_ko.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_ko.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_lt.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_lt.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_lt.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_lt.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_ms.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_ms.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_ms.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_ms.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_nl.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_nl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_nl.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_nl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_no.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_no.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_no.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_no.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_pcm.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_pcm.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_pcm.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_pcm.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_pl.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_pl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_pl.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_pl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_pt_BR.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_pt_BR.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_pt_BR.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_pt_BR.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_pt_PT.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_pt_PT.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_pt_PT.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_pt_PT.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_ro.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_ro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_ro.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_ro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_ru.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_ru.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_ru.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_ru.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_sk.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_sk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_sk.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_sk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_sl.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_sl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_sl.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_sl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_sq.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_sq.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_sq.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_sq.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_sv_SE.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_sv_SE.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_sv_SE.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_sv_SE.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_th.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_th.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_th.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_th.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_tl.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_tl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_tl.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_tl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_tr.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_tr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_tr.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_tr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_uk.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_uk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_uk.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_uk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_ur_IN.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_ur_IN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_ur_IN.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_ur_IN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_vi.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_vi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_vi.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_vi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_zh_CN.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_zh_CN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_zh_CN.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_zh_CN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_zh_TW.properties b/webapp/src/main/resources/locale/portlet/social/UserPopup_zh_TW.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_zh_TW.properties rename to webapp/src/main/resources/locale/portlet/social/UserPopup_zh_TW.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_ar.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_ar.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_ar.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_ar.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_aro.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_aro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_aro.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_aro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_az.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_az.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_az.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_az.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_ca.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_ca.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_ca.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_ca.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_ceb.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_ceb.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_ceb.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_ceb.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_co.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_co.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_co.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_co.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_cs.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_cs.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_cs.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_cs.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_de.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_de.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_de.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_de.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_el.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_el.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_el.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_el.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_en.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_en.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_en.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_en.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_es_ES.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_es_ES.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_es_ES.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_es_ES.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_eu.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_eu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_eu.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_eu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_fa.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_fa.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_fa.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_fa.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_fi.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_fi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_fi.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_fi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_fil.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_fil.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_fil.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_fil.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_fr.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_fr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_fr.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_fr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_hi.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_hi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_hi.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_hi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_hu.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_hu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_hu.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_hu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_id.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_id.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_id.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_id.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_in.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_in.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_in.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_in.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_it.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_it.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_it.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_it.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_ja.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_ja.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_ja.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_ja.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_kab.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_kab.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_kab.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_kab.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_ko.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_ko.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_ko.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_ko.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_lt.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_lt.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_lt.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_lt.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_ms.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_ms.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_ms.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_ms.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_nl.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_nl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_nl.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_nl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_no.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_no.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_no.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_no.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_pcm.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_pcm.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_pcm.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_pcm.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_pl.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_pl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_pl.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_pl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_pt_BR.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_pt_BR.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_pt_BR.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_pt_BR.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_pt_PT.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_pt_PT.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_pt_PT.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_pt_PT.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_ro.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_ro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_ro.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_ro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_ru.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_ru.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_ru.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_ru.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_sk.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_sk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_sk.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_sk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_sl.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_sl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_sl.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_sl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_sq.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_sq.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_sq.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_sq.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_sv_SE.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_sv_SE.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_sv_SE.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_sv_SE.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_th.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_th.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_th.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_th.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_tl.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_tl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_tl.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_tl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_tr.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_tr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_tr.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_tr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_uk.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_uk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_uk.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_uk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_ur_IN.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_ur_IN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_ur_IN.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_ur_IN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_vi.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_vi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_vi.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_vi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_zh_CN.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_zh_CN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_zh_CN.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_zh_CN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_zh_TW.properties b/webapp/src/main/resources/locale/portlet/social/UserSettings_zh_TW.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_zh_TW.properties rename to webapp/src/main/resources/locale/portlet/social/UserSettings_zh_TW.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_ar.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_ar.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_ar.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_ar.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_aro.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_aro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_aro.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_aro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_az.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_az.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_az.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_az.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_ca.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_ca.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_ca.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_ca.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_ceb.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_ceb.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_ceb.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_ceb.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_co.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_co.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_co.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_co.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_cs.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_cs.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_cs.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_cs.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_de.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_de.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_de.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_de.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_el.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_el.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_el.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_el.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_en.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_en.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_en.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_en.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_es_ES.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_es_ES.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_es_ES.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_es_ES.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_eu.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_eu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_eu.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_eu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_fa.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_fa.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_fa.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_fa.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_fi.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_fi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_fi.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_fi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_fil.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_fil.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_fil.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_fil.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_fr.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_fr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_fr.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_fr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_he.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_he.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_he.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_he.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_hi.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_hi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_hi.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_hi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_hu.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_hu.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_hu.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_hu.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_id.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_id.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_id.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_id.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_in.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_in.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_in.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_in.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_it.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_it.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_it.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_it.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_ja.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_ja.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_ja.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_ja.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_kab.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_kab.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_kab.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_kab.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_ko.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_ko.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_ko.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_ko.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_lt.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_lt.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_lt.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_lt.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_ms.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_ms.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_ms.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_ms.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_nl.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_nl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_nl.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_nl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_no.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_no.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_no.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_no.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_pcm.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_pcm.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_pcm.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_pcm.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_pl.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_pl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_pl.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_pl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_pt_BR.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_pt_BR.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_pt_BR.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_pt_BR.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_pt_PT.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_pt_PT.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_pt_PT.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_pt_PT.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_ro.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_ro.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_ro.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_ro.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_ru.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_ru.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_ru.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_ru.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_sk.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_sk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_sk.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_sk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_sl.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_sl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_sl.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_sl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_sq.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_sq.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_sq.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_sq.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_sv_SE.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_sv_SE.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_sv_SE.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_sv_SE.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_th.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_th.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_th.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_th.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_tl.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_tl.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_tl.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_tl.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_tr.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_tr.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_tr.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_tr.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_uk.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_uk.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_uk.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_uk.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_ur_IN.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_ur_IN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_ur_IN.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_ur_IN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_vi.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_vi.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_vi.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_vi.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_zh_CN.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_zh_CN.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_zh_CN.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_zh_CN.properties diff --git a/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_zh_TW.properties b/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_zh_TW.properties similarity index 100% rename from webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_zh_TW.properties rename to webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_zh_TW.properties diff --git a/webapp/portlet/src/main/webapp/META-INF/context.xml b/webapp/src/main/webapp/META-INF/context.xml similarity index 100% rename from webapp/portlet/src/main/webapp/META-INF/context.xml rename to webapp/src/main/webapp/META-INF/context.xml diff --git a/extension/war/src/main/webapp/WEB-INF/conf/configuration.xml b/webapp/src/main/webapp/WEB-INF/conf/configuration.xml similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/conf/configuration.xml rename to webapp/src/main/webapp/WEB-INF/conf/configuration.xml diff --git a/webapp/src/main/webapp/WEB-INF/conf/social-extension/ckeditor/attach-image-plugin.js b/webapp/src/main/webapp/WEB-INF/conf/social-extension/ckeditor/attach-image-plugin.js new file mode 100644 index 00000000000..4301e2d3bfa --- /dev/null +++ b/webapp/src/main/webapp/WEB-INF/conf/social-extension/ckeditor/attach-image-plugin.js @@ -0,0 +1 @@ + CKEDITOR.plugins.addExternal('attachImage', '/social/js/ckeditorPlugins/attachImage/', 'plugin.js'); \ No newline at end of file diff --git a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/ckeditor/config.js b/webapp/src/main/webapp/WEB-INF/conf/social-extension/ckeditor/config.js similarity index 98% rename from extension/war/src/main/webapp/WEB-INF/conf/social-extension/ckeditor/config.js rename to webapp/src/main/webapp/WEB-INF/conf/social-extension/ckeditor/config.js index 989d9d53389..664f83a43c3 100644 --- a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/ckeditor/config.js +++ b/webapp/src/main/webapp/WEB-INF/conf/social-extension/ckeditor/config.js @@ -24,7 +24,7 @@ CKEDITOR.editorConfig = function(config) { CKEDITOR.plugins.addExternal('tagSuggester', '/commons-extension/eXoPlugins/tagSuggester/', 'plugin.js'); CKEDITOR.plugins.addExternal('formatOption', '/commons-extension/eXoPlugins/formatOption/', 'plugin.js'); CKEDITOR.plugins.addExternal('googleDocPastePlugin', '/commons-extension/eXoPlugins/googleDocPastePlugin/', 'plugin.js'); - CKEDITOR.plugins.addExternal('linkBalloon', '/social-portlet/js/ckeditorPlugins/linkBalloon/', 'plugin.js'); + CKEDITOR.plugins.addExternal('linkBalloon', '/social/js/ckeditorPlugins/linkBalloon/', 'plugin.js'); const embedBaseApiEndpoint = '@JVMProp{io.meeds.iframely.url://ckeditor.iframe.ly/api/oembed?omit_script=1}'; CKEDITOR.config.embed_provider = embedBaseApiEndpoint + (embedBaseApiEndpoint.includes('?') ? '&' : '?') + 'url={url}&callback={callback}'; diff --git a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/organization/organization-configuration.xml b/webapp/src/main/webapp/WEB-INF/conf/social-extension/organization/organization-configuration.xml similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/conf/social-extension/organization/organization-configuration.xml rename to webapp/src/main/webapp/WEB-INF/conf/social-extension/organization/organization-configuration.xml diff --git a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/portal/dynamic-container-configuration.xml b/webapp/src/main/webapp/WEB-INF/conf/social-extension/portal/dynamic-container-configuration.xml similarity index 96% rename from extension/war/src/main/webapp/WEB-INF/conf/social-extension/portal/dynamic-container-configuration.xml rename to webapp/src/main/webapp/WEB-INF/conf/social-extension/portal/dynamic-container-configuration.xml index f5fd2c729a9..61bdd3c1db9 100644 --- a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/portal/dynamic-container-configuration.xml +++ b/webapp/src/main/webapp/WEB-INF/conf/social-extension/portal/dynamic-container-configuration.xml @@ -21,7 +21,7 @@ - social-portlet/HamburgerMenu + social/HamburgerMenu @@ -68,7 +68,7 @@ - social-portlet/Search + social/Search @@ -115,7 +115,7 @@ - social-portlet/TopBarLogo + social/TopBarLogo @@ -162,7 +162,7 @@ - social-portlet/TopBarNotification + social/TopBarNotification @@ -209,7 +209,7 @@ - social-portlet/TopBarFavorites + social/TopBarFavorites @@ -256,7 +256,7 @@ - social-portlet/DrawersOverlay + social/DrawersOverlay @@ -300,7 +300,7 @@ - social-portlet/TopBarMenu + social/TopBarMenu @@ -344,7 +344,7 @@ - social-portlet/Popover + social/Popover @@ -391,7 +391,7 @@ - social-portlet/PlatformSettings + social/PlatformSettings diff --git a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/portal/social-portal-configuration.xml b/webapp/src/main/webapp/WEB-INF/conf/social-extension/portal/social-portal-configuration.xml similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/conf/social-extension/portal/social-portal-configuration.xml rename to webapp/src/main/webapp/WEB-INF/conf/social-extension/portal/social-portal-configuration.xml diff --git a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/portal/upgrade-plugins-configuration.xml b/webapp/src/main/webapp/WEB-INF/conf/social-extension/portal/upgrade-plugins-configuration.xml similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/conf/social-extension/portal/upgrade-plugins-configuration.xml rename to webapp/src/main/webapp/WEB-INF/conf/social-extension/portal/upgrade-plugins-configuration.xml diff --git a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/cache-configuration.xml b/webapp/src/main/webapp/WEB-INF/conf/social-extension/social/cache-configuration.xml similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/cache-configuration.xml rename to webapp/src/main/webapp/WEB-INF/conf/social-extension/social/cache-configuration.xml diff --git a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/ckeditor-configuration.xml b/webapp/src/main/webapp/WEB-INF/conf/social-extension/social/ckeditor-configuration.xml similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/ckeditor-configuration.xml rename to webapp/src/main/webapp/WEB-INF/conf/social-extension/social/ckeditor-configuration.xml diff --git a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/common-configuration.xml b/webapp/src/main/webapp/WEB-INF/conf/social-extension/social/common-configuration.xml similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/common-configuration.xml rename to webapp/src/main/webapp/WEB-INF/conf/social-extension/social/common-configuration.xml diff --git a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/component-plugins-configuration.xml b/webapp/src/main/webapp/WEB-INF/conf/social-extension/social/component-plugins-configuration.xml similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/component-plugins-configuration.xml rename to webapp/src/main/webapp/WEB-INF/conf/social-extension/social/component-plugins-configuration.xml diff --git a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/core-configuration.xml b/webapp/src/main/webapp/WEB-INF/conf/social-extension/social/core-configuration.xml similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/core-configuration.xml rename to webapp/src/main/webapp/WEB-INF/conf/social-extension/social/core-configuration.xml diff --git a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/indexing-configuration.xml b/webapp/src/main/webapp/WEB-INF/conf/social-extension/social/indexing-configuration.xml similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/indexing-configuration.xml rename to webapp/src/main/webapp/WEB-INF/conf/social-extension/social/indexing-configuration.xml diff --git a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/metadata-plugins-configuration.xml b/webapp/src/main/webapp/WEB-INF/conf/social-extension/social/metadata-plugins-configuration.xml similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/metadata-plugins-configuration.xml rename to webapp/src/main/webapp/WEB-INF/conf/social-extension/social/metadata-plugins-configuration.xml diff --git a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/notification-configuration.xml b/webapp/src/main/webapp/WEB-INF/conf/social-extension/social/notification-configuration.xml similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/notification-configuration.xml rename to webapp/src/main/webapp/WEB-INF/conf/social-extension/social/notification-configuration.xml diff --git a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/notification-plugins-configuration.xml b/webapp/src/main/webapp/WEB-INF/conf/social-extension/social/notification-plugins-configuration.xml similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/notification-plugins-configuration.xml rename to webapp/src/main/webapp/WEB-INF/conf/social-extension/social/notification-plugins-configuration.xml diff --git a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/permlink-configuration.xml b/webapp/src/main/webapp/WEB-INF/conf/social-extension/social/permlink-configuration.xml similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/permlink-configuration.xml rename to webapp/src/main/webapp/WEB-INF/conf/social-extension/social/permlink-configuration.xml diff --git a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/profileproperty/profile-property-configuration.xml b/webapp/src/main/webapp/WEB-INF/conf/social-extension/social/profileproperty/profile-property-configuration.xml similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/profileproperty/profile-property-configuration.xml rename to webapp/src/main/webapp/WEB-INF/conf/social-extension/social/profileproperty/profile-property-configuration.xml diff --git a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/search-configuration.xml b/webapp/src/main/webapp/WEB-INF/conf/social-extension/social/search-configuration.xml similarity index 98% rename from extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/search-configuration.xml rename to webapp/src/main/webapp/WEB-INF/conf/social-extension/social/search-configuration.xml index e925242b145..4b241f21660 100644 --- a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/search-configuration.xml +++ b/webapp/src/main/webapp/WEB-INF/conf/social-extension/social/search-configuration.xml @@ -91,7 +91,7 @@ SHARED/PeopleSearchResultCard - social-portlet/ProfileSearch + social/ProfileSearch locale.portlet.social.PeopleListApplication @@ -170,7 +170,7 @@ SHARED/ActivitySearchResultCard - social-portlet/ActivitySearch + social/ActivitySearch activity-search-result-card diff --git a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/search/activities-search-query.json b/webapp/src/main/webapp/WEB-INF/conf/social-extension/social/search/activities-search-query.json similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/search/activities-search-query.json rename to webapp/src/main/webapp/WEB-INF/conf/social-extension/social/search/activities-search-query.json diff --git a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/search/spaces-count-query.json b/webapp/src/main/webapp/WEB-INF/conf/social-extension/social/search/spaces-count-query.json similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/search/spaces-count-query.json rename to webapp/src/main/webapp/WEB-INF/conf/social-extension/social/search/spaces-count-query.json diff --git a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/search/spaces-search-query.json b/webapp/src/main/webapp/WEB-INF/conf/social-extension/social/search/spaces-search-query.json similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/search/spaces-search-query.json rename to webapp/src/main/webapp/WEB-INF/conf/social-extension/social/search/spaces-search-query.json diff --git a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/service-configuration.xml b/webapp/src/main/webapp/WEB-INF/conf/social-extension/social/service-configuration.xml similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/service-configuration.xml rename to webapp/src/main/webapp/WEB-INF/conf/social-extension/social/service-configuration.xml diff --git a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/social-configuration.xml b/webapp/src/main/webapp/WEB-INF/conf/social-extension/social/social-configuration.xml similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/social-configuration.xml rename to webapp/src/main/webapp/WEB-INF/conf/social-extension/social/social-configuration.xml diff --git a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/space-template/communication/banner.png b/webapp/src/main/webapp/WEB-INF/conf/social-extension/social/space-template/communication/banner.png similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/space-template/communication/banner.png rename to webapp/src/main/webapp/WEB-INF/conf/social-extension/social/space-template/communication/banner.png diff --git a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/space-template/community/banner.png b/webapp/src/main/webapp/WEB-INF/conf/social-extension/social/space-template/community/banner.png similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/space-template/community/banner.png rename to webapp/src/main/webapp/WEB-INF/conf/social-extension/social/space-template/community/banner.png diff --git a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/space-template/project/banner.png b/webapp/src/main/webapp/WEB-INF/conf/social-extension/social/space-template/project/banner.png similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/space-template/project/banner.png rename to webapp/src/main/webapp/WEB-INF/conf/social-extension/social/space-template/project/banner.png diff --git a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/space-template/team/banner.png b/webapp/src/main/webapp/WEB-INF/conf/social-extension/social/space-template/team/banner.png similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/space-template/team/banner.png rename to webapp/src/main/webapp/WEB-INF/conf/social-extension/social/space-template/team/banner.png diff --git a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/spaces-templates-configuration.xml b/webapp/src/main/webapp/WEB-INF/conf/social-extension/social/spaces-templates-configuration.xml similarity index 96% rename from extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/spaces-templates-configuration.xml rename to webapp/src/main/webapp/WEB-INF/conf/social-extension/social/spaces-templates-configuration.xml index 1ecbdcd10b8..a6a79b94825 100644 --- a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/spaces-templates-configuration.xml +++ b/webapp/src/main/webapp/WEB-INF/conf/social-extension/social/spaces-templates-configuration.xml @@ -64,7 +64,7 @@ - social-portlet + social SpaceActivityStreamPortlet @@ -82,7 +82,7 @@ - social-portlet + social SpaceSettingPortlet @@ -114,7 +114,7 @@ - social-portlet + social MembersPortlet @@ -174,7 +174,7 @@ - social-portlet + social SpaceActivityStreamPortlet @@ -192,7 +192,7 @@ - social-portlet + social MembersPortlet @@ -217,7 +217,7 @@ - social-portlet + social SpaceSettingPortlet @@ -285,7 +285,7 @@ - social-portlet + social SpaceActivityStreamPortlet @@ -303,7 +303,7 @@ - social-portlet + social MembersPortlet @@ -328,7 +328,7 @@ - social-portlet + social SpaceSettingPortlet @@ -396,7 +396,7 @@ - social-portlet + social SpaceActivityStreamPortlet @@ -414,7 +414,7 @@ - social-portlet + social MembersPortlet @@ -439,7 +439,7 @@ - social-portlet + social SpaceSettingPortlet diff --git a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/upgrade-configuration.xml b/webapp/src/main/webapp/WEB-INF/conf/social-extension/social/upgrade-configuration.xml similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/upgrade-configuration.xml rename to webapp/src/main/webapp/WEB-INF/conf/social-extension/social/upgrade-configuration.xml diff --git a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/websocket-configuration.xml b/webapp/src/main/webapp/WEB-INF/conf/social-extension/social/websocket-configuration.xml similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/websocket-configuration.xml rename to webapp/src/main/webapp/WEB-INF/conf/social-extension/social/websocket-configuration.xml diff --git a/extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/webui-configuration.xml b/webapp/src/main/webapp/WEB-INF/conf/social-extension/social/webui-configuration.xml similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/conf/social-extension/social/webui-configuration.xml rename to webapp/src/main/webapp/WEB-INF/conf/social-extension/social/webui-configuration.xml diff --git a/webapp/portlet/src/main/webapp/WEB-INF/gatein-resources.xml b/webapp/src/main/webapp/WEB-INF/gatein-resources.xml similarity index 97% rename from webapp/portlet/src/main/webapp/WEB-INF/gatein-resources.xml rename to webapp/src/main/webapp/WEB-INF/gatein-resources.xml index e1cccdfdda7..ebd4521927e 100644 --- a/webapp/portlet/src/main/webapp/WEB-INF/gatein-resources.xml +++ b/webapp/src/main/webapp/WEB-INF/gatein-resources.xml @@ -29,21 +29,21 @@ - social-portlet + social GeneralSettings Enterprise ImageCropper - social-portlet + social SpaceBannerPortlet Enterprise ImageCropper - social-portlet + social HamburgerMenu Enterprise /skin/css/portlet/HamburgerMenu/Style.css @@ -51,14 +51,14 @@ - social-portlet + social PeopleList Enterprise PeopleList - social-portlet + social ProfileAboutMe Enterprise /skin/css/portlet/ProfileAboutMe/Style.css @@ -66,14 +66,14 @@ - social-portlet + social SpaceSettingPortlet Enterprise ImageCropper - social-portlet + social Image Enterprise 1 @@ -81,7 +81,7 @@ - social-portlet + social SpaceActivityStreamPortlet Enterprise /skin/css/portlet/ActivityStream/Style.css @@ -89,7 +89,7 @@ - social-portlet + social UserActivityStreamPortlet Enterprise /skin/css/portlet/ActivityStream/Style.css @@ -97,7 +97,7 @@ - social-portlet + social SpacesAdministration Enterprise /skin/css/portlet/SpacesAdministration/Style.css @@ -105,7 +105,7 @@ - social-portlet + social SpaceMenuPortlet Enterprise /skin/css/portlet/SpaceHeader/Style.css @@ -114,7 +114,7 @@ - social-portlet + social SpaceTopbarMenu Enterprise /skin/css/portlet/SpaceMenu/Style.css @@ -122,21 +122,21 @@ - social-portlet + social MembersPortlet Enterprise PeopleList - social-portlet + social SpaceWidgetMembers Enterprise PeopleList - social-portlet + social ProfileHeader Enterprise /skin/css/portlet/ProfileHeader/Style.css @@ -145,7 +145,7 @@ - social-portlet + social Search Enterprise /skin/css/portlet/Search/Style.css @@ -153,7 +153,7 @@ - social-portlet + social ProfileContactInformation Enterprise /skin/css/portlet/ProfileContactInformation/Style.css @@ -162,7 +162,7 @@ - social-portlet + social ProfileWorkExperience Enterprise /skin/css/portlet/ProfileWorkExperience/Style.css @@ -170,7 +170,7 @@ - social-portlet + social SpaceInfos Enterprise /skin/css/portlet/SpaceInfos/Style.css @@ -178,7 +178,7 @@ - social-portlet + social GettingStarted Enterprise /skin/css/portlet/GettingStarted/Style.css @@ -186,7 +186,7 @@ - social-portlet + social ExternalSpacesList Enterprise /skin/css/portlet/SpacesListExternal/Style.css @@ -194,7 +194,7 @@ - social-portlet + social SuggestionsPeopleAndSpace Enterprise /skin/css/portlet/SuggestionsPeopleAndSpace/Style.css @@ -202,7 +202,7 @@ - social-portlet + social SpacesOverview Enterprise /skin/css/portlet/SpacesOverview/Style.css @@ -210,7 +210,7 @@ - social-portlet + social PeopleOverview Enterprise /skin/css/portlet/PeopleOverview/Style.css @@ -218,7 +218,7 @@ - social-portlet + social IDMUsersManagement Enterprise /skin/css/portlet/IDMUsersManagement/Style.css @@ -226,7 +226,7 @@ - social-portlet + social IDMGroupsManagement Enterprise /skin/css/portlet/IDMGroupsManagement/Style.css @@ -234,7 +234,7 @@ - social-portlet + social IDMMembershipTypesManagement Enterprise /skin/css/portlet/IDMMembershipTypesManagement/Style.css @@ -243,7 +243,7 @@ - social-portlet + social TopBarMenu Enterprise /skin/css/portlet/TopBarMenu/Style.css @@ -252,7 +252,7 @@ - social-portlet + social ProfileSettingsPortlet Enterprise /skin/css/portlet/ProfileSettings/Style.css @@ -261,7 +261,7 @@ - social-portlet + social TopBarNotification Enterprise /skin/css/portlet/TopBarNotification/Style.css @@ -271,7 +271,7 @@ - social-portlet + social ProfileSearch Enterprise @@ -280,7 +280,7 @@ - social-portlet + social ActivitySearch Enterprise @@ -305,14 +305,14 @@ - social-portlet + social VerticalMenu Enterprise /skin/css/portlet/VerticalMenu/Style.css - social-portlet + social OrganizationalChart Enterprise /skin/css/portlet/organizational-chart/Style.css diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/externalRegistration/init_account.jsp b/webapp/src/main/webapp/WEB-INF/jsp/externalRegistration/init_account.jsp similarity index 100% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/externalRegistration/init_account.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/externalRegistration/init_account.jsp diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/forgotpassword/forgot_password.jsp b/webapp/src/main/webapp/WEB-INF/jsp/forgotpassword/forgot_password.jsp similarity index 100% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/forgotpassword/forgot_password.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/forgotpassword/forgot_password.jsp diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/login/login.jsp b/webapp/src/main/webapp/WEB-INF/jsp/login/login.jsp similarity index 100% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/login/login.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/login/login.jsp diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/login/oauth_invitation.jsp b/webapp/src/main/webapp/WEB-INF/jsp/login/oauth_invitation.jsp similarity index 97% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/login/oauth_invitation.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/login/oauth_invitation.jsp index 3484052a0c1..f6acbc028b4 100644 --- a/webapp/portlet/src/main/webapp/WEB-INF/jsp/login/oauth_invitation.jsp +++ b/webapp/src/main/webapp/WEB-INF/jsp/login/oauth_invitation.jsp @@ -75,8 +75,8 @@ <%}%> <%}%> - - + +
diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/login/oauth_register.jsp b/webapp/src/main/webapp/WEB-INF/jsp/login/oauth_register.jsp similarity index 98% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/login/oauth_register.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/login/oauth_register.jsp index 1d3900faf0f..ac7bf89c69c 100644 --- a/webapp/portlet/src/main/webapp/WEB-INF/jsp/login/oauth_register.jsp +++ b/webapp/src/main/webapp/WEB-INF/jsp/login/oauth_register.jsp @@ -93,8 +93,8 @@ <%}%> <%}%> - - + +
diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/onboarding/reset_password.jsp b/webapp/src/main/webapp/WEB-INF/jsp/onboarding/reset_password.jsp similarity index 100% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/onboarding/reset_password.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/onboarding/reset_password.jsp diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/activityStream.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/activityStream.jsp similarity index 100% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/activityStream.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/portlet/activityStream.jsp diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/breadcrumb.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/breadcrumb.jsp similarity index 81% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/breadcrumb.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/portlet/breadcrumb.jsp index 440aa318855..9a4bbb88596 100644 --- a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/breadcrumb.jsp +++ b/webapp/src/main/webapp/WEB-INF/jsp/portlet/breadcrumb.jsp @@ -6,7 +6,7 @@
\ No newline at end of file diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/generalSettings.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/generalSettings.jsp similarity index 93% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/generalSettings.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/portlet/generalSettings.jsp index 03165abe8db..cdb638eb1b0 100644 --- a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/generalSettings.jsp +++ b/webapp/src/main/webapp/WEB-INF/jsp/portlet/generalSettings.jsp @@ -33,7 +33,7 @@ class="v-application v-application--is-ltr theme--light" id="generalSettings">
\ No newline at end of file diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/gettingStarted.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/gettingStarted.jsp similarity index 98% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/gettingStarted.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/portlet/gettingStarted.jsp index 62dc630362f..df054c33d85 100644 --- a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/gettingStarted.jsp +++ b/webapp/src/main/webapp/WEB-INF/jsp/portlet/gettingStarted.jsp @@ -87,6 +87,6 @@ <% } %> \ No newline at end of file diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/hamburgerMenu.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/hamburgerMenu.jsp similarity index 97% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/hamburgerMenu.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/portlet/hamburgerMenu.jsp index 8a14b4e138d..da5a2795ce0 100644 --- a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/hamburgerMenu.jsp +++ b/webapp/src/main/webapp/WEB-INF/jsp/portlet/hamburgerMenu.jsp @@ -58,7 +58,7 @@ diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/image.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/image.jsp similarity index 91% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/image.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/portlet/image.jsp index fe6f6cb4faf..784ecbb5626 100644 --- a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/image.jsp +++ b/webapp/src/main/webapp/WEB-INF/jsp/portlet/image.jsp @@ -42,7 +42,7 @@ class="v-application transparent v-application--is-ltr theme--light" flat="" id="<%=id%>"> \ No newline at end of file diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/links.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/links.jsp similarity index 82% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/links.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/portlet/links.jsp index 7ebde5ff9df..d8b5f2b5c7a 100644 --- a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/links.jsp +++ b/webapp/src/main/webapp/WEB-INF/jsp/portlet/links.jsp @@ -10,7 +10,7 @@ class="v-application transparent v-application--is-ltr theme--light" flat="" id="<%=id%>"> \ No newline at end of file diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/organizationalChart.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/organizationalChart.jsp similarity index 98% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/organizationalChart.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/portlet/organizationalChart.jsp index aa9d01d5bcc..314255c9b8b 100644 --- a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/organizationalChart.jsp +++ b/webapp/src/main/webapp/WEB-INF/jsp/portlet/organizationalChart.jsp @@ -80,7 +80,7 @@ class="v-application transparent v-application--is-ltr theme--light"> <% if (propertySetting.isActive()) { %> diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/peopleOverview.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/peopleOverview.jsp similarity index 100% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/peopleOverview.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/portlet/peopleOverview.jsp diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/platformSettings.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/platformSettings.jsp similarity index 94% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/platformSettings.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/portlet/platformSettings.jsp index bade55cbabb..9f1b30112ba 100644 --- a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/platformSettings.jsp +++ b/webapp/src/main/webapp/WEB-INF/jsp/portlet/platformSettings.jsp @@ -22,7 +22,7 @@ diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/profileAboutMe.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/profileAboutMe.jsp similarity index 84% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/profileAboutMe.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/portlet/profileAboutMe.jsp index 22d5a69408b..17271a1aa7f 100644 --- a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/profileAboutMe.jsp +++ b/webapp/src/main/webapp/WEB-INF/jsp/portlet/profileAboutMe.jsp @@ -8,7 +8,7 @@ id="ProfileAboutMe"> \ No newline at end of file diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/profileContactInformation.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/profileContactInformation.jsp similarity index 95% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/profileContactInformation.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/portlet/profileContactInformation.jsp index f1239af47fd..07be356fd00 100644 --- a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/profileContactInformation.jsp +++ b/webapp/src/main/webapp/WEB-INF/jsp/portlet/profileContactInformation.jsp @@ -21,7 +21,7 @@ id="ProfileContactInformation"> diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/profileHeader.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/profileHeader.jsp similarity index 88% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/profileHeader.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/portlet/profileHeader.jsp index 17df4fcb9ba..ff5e6a34e0d 100644 --- a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/profileHeader.jsp +++ b/webapp/src/main/webapp/WEB-INF/jsp/portlet/profileHeader.jsp @@ -12,7 +12,7 @@ id="ProfileHeader"> \ No newline at end of file diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/profileSettings.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/profileSettings.jsp similarity index 94% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/profileSettings.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/portlet/profileSettings.jsp index 15d526f6c4d..1a21a34aa48 100644 --- a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/profileSettings.jsp +++ b/webapp/src/main/webapp/WEB-INF/jsp/portlet/profileSettings.jsp @@ -32,7 +32,7 @@ id="profileSettings" flat=""> diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/profileWorkExperience.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/profileWorkExperience.jsp similarity index 84% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/profileWorkExperience.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/portlet/profileWorkExperience.jsp index ec325b2715d..6367e11b029 100644 --- a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/profileWorkExperience.jsp +++ b/webapp/src/main/webapp/WEB-INF/jsp/portlet/profileWorkExperience.jsp @@ -8,7 +8,7 @@ id="ProfileWorkExperience"> \ No newline at end of file diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/search.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/search.jsp similarity index 96% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/search.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/portlet/search.jsp index c8eecb96c48..1a90dc84c6b 100644 --- a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/search.jsp +++ b/webapp/src/main/webapp/WEB-INF/jsp/portlet/search.jsp @@ -54,7 +54,7 @@ type="button" title="<%=tooltip%>" class="transparent v-btn v-btn--flat v-btn--icon v-btn--round theme--light v-size--default" - onclick="Vue.startApp('PORTLET/social-portlet/Search', 'init')"> + onclick="Vue.startApp('PORTLET/social/Search', 'init')"> @@ -63,7 +63,7 @@ <% if (rcontext.getRequestURI().endsWith("/search") || rcontext.getRequestURI().equals("search")) { %> <% } %> diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/spaceAccess.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/spaceAccess.jsp similarity index 96% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/spaceAccess.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/portlet/spaceAccess.jsp index d34e68f7025..19150802138 100644 --- a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/spaceAccess.jsp +++ b/webapp/src/main/webapp/WEB-INF/jsp/portlet/spaceAccess.jsp @@ -26,7 +26,7 @@ "originalUri": "<%=originalUri%>" } \ No newline at end of file diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/spaceHeader.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/spaceHeader.jsp similarity index 94% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/spaceHeader.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/portlet/spaceHeader.jsp index b83f40523ee..f0938e80e4d 100644 --- a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/spaceHeader.jsp +++ b/webapp/src/main/webapp/WEB-INF/jsp/portlet/spaceHeader.jsp @@ -67,7 +67,7 @@ "selectedNavigationUri": "<%=selectedUri%>" } <% } diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/spaceInformation.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/spaceInformation.jsp similarity index 100% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/spaceInformation.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/portlet/spaceInformation.jsp diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/spaceMembers.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/spaceMembers.jsp similarity index 96% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/spaceMembers.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/portlet/spaceMembers.jsp index 0c08f892692..f5339714d54 100644 --- a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/spaceMembers.jsp +++ b/webapp/src/main/webapp/WEB-INF/jsp/portlet/spaceMembers.jsp @@ -31,7 +31,7 @@ class="v-application transparent v-application--is-ltr theme--light singlePageApplication" id="spaceMembersApplication" flat=""> diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/spaceMenu.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/spaceMenu.jsp similarity index 97% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/spaceMenu.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/portlet/spaceMenu.jsp index 93377b3ae93..c6e21ef5c97 100644 --- a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/spaceMenu.jsp +++ b/webapp/src/main/webapp/WEB-INF/jsp/portlet/spaceMenu.jsp @@ -52,7 +52,7 @@ if (navigations != null) { "selectedNavigationUri": "<%=selectedUri%>" } diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/spaceWidgetDescription.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/spaceWidgetDescription.jsp similarity index 90% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/spaceWidgetDescription.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/portlet/spaceWidgetDescription.jsp index 07d062897f9..33f67c3cca6 100644 --- a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/spaceWidgetDescription.jsp +++ b/webapp/src/main/webapp/WEB-INF/jsp/portlet/spaceWidgetDescription.jsp @@ -34,7 +34,7 @@ id="SpaceDescriptionApplication"> diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/spaceWidgetManagers.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/spaceWidgetManagers.jsp similarity index 98% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/spaceWidgetManagers.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/portlet/spaceWidgetManagers.jsp index dc47a0ac2e8..17f2eb0b6d7 100644 --- a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/spaceWidgetManagers.jsp +++ b/webapp/src/main/webapp/WEB-INF/jsp/portlet/spaceWidgetManagers.jsp @@ -54,7 +54,7 @@ id="SpaceManagersApplication" flat=""> diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/spaceWidgetMembers.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/spaceWidgetMembers.jsp similarity index 98% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/spaceWidgetMembers.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/portlet/spaceWidgetMembers.jsp index 0cf058936a4..3a18ae6a686 100644 --- a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/spaceWidgetMembers.jsp +++ b/webapp/src/main/webapp/WEB-INF/jsp/portlet/spaceWidgetMembers.jsp @@ -63,7 +63,7 @@ id="SpaceMembersApplication" flat=""> diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/spacesList.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/spacesList.jsp similarity index 93% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/spacesList.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/portlet/spacesList.jsp index 2a607a9ff30..98d318c2df0 100644 --- a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/spacesList.jsp +++ b/webapp/src/main/webapp/WEB-INF/jsp/portlet/spacesList.jsp @@ -15,7 +15,7 @@ class="v-application transparent v-application--is-ltr theme--light" id="spacesListApplication" flat=""> diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/suggestions.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/suggestions.jsp similarity index 90% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/suggestions.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/portlet/suggestions.jsp index a32e59a2b5e..72a20f1e511 100644 --- a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/suggestions.jsp +++ b/webapp/src/main/webapp/WEB-INF/jsp/portlet/suggestions.jsp @@ -14,7 +14,7 @@ class="v-application hiddenable-widget transparent v-application--is-ltr theme--light" id="SuggestionsPeopleAndSpace" flat=""> diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/topBarMenu.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/topBarMenu.jsp similarity index 89% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/topBarMenu.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/portlet/topBarMenu.jsp index 144ecd40394..b6655652875 100644 --- a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/topBarMenu.jsp +++ b/webapp/src/main/webapp/WEB-INF/jsp/portlet/topBarMenu.jsp @@ -13,7 +13,7 @@ if (window.topBarMenuHtml) { document.querySelector('#topBarMenu').innerHTML = window.topBarMenuHtml; } - require(['PORTLET/social-portlet/TopBarMenu'], app => app.init('<%=cacheId%>')); + require(['PORTLET/social/TopBarMenu'], app => app.init('<%=cacheId%>')); } diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/topBarPublishSite.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/topBarPublishSite.jsp similarity index 93% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/topBarPublishSite.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/portlet/topBarPublishSite.jsp index 6f157022e46..b3066cb8add 100644 --- a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/topBarPublishSite.jsp +++ b/webapp/src/main/webapp/WEB-INF/jsp/portlet/topBarPublishSite.jsp @@ -33,7 +33,7 @@ class="v-application border-box-sizing theme--light" id="topBarPublishSite"> diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/topbarLogin.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/topbarLogin.jsp similarity index 97% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/topbarLogin.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/portlet/topbarLogin.jsp index f6256cd3720..04531030fc3 100644 --- a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/topbarLogin.jsp +++ b/webapp/src/main/webapp/WEB-INF/jsp/portlet/topbarLogin.jsp @@ -51,7 +51,7 @@ <% } %> diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/userSettingLanguage.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/userSettingLanguage.jsp similarity index 90% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/userSettingLanguage.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/portlet/userSettingLanguage.jsp index 7d3b3af7245..c048db3d179 100644 --- a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/userSettingLanguage.jsp +++ b/webapp/src/main/webapp/WEB-INF/jsp/portlet/userSettingLanguage.jsp @@ -31,7 +31,7 @@ \ No newline at end of file diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/userSettingNotifications.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/userSettingNotifications.jsp similarity index 96% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/userSettingNotifications.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/portlet/userSettingNotifications.jsp index 2bd4e0cef76..f7a75489964 100644 --- a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/userSettingNotifications.jsp +++ b/webapp/src/main/webapp/WEB-INF/jsp/portlet/userSettingNotifications.jsp @@ -33,7 +33,7 @@ class="v-application v-application--is-ltr theme--light" id="UserSettingNotifications"> diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/userSettingSecurity.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/userSettingSecurity.jsp similarity index 90% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/userSettingSecurity.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/portlet/userSettingSecurity.jsp index 8ad78eea64d..382fd5f9a31 100644 --- a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/userSettingSecurity.jsp +++ b/webapp/src/main/webapp/WEB-INF/jsp/portlet/userSettingSecurity.jsp @@ -13,7 +13,7 @@ id="UserSettingSecurity"> diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/whoIsOnline.jsp b/webapp/src/main/webapp/WEB-INF/jsp/portlet/whoIsOnline.jsp similarity index 97% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/whoIsOnline.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/portlet/whoIsOnline.jsp index 21d2a42d8d8..fdd5d768ce0 100644 --- a/webapp/portlet/src/main/webapp/WEB-INF/jsp/portlet/whoIsOnline.jsp +++ b/webapp/src/main/webapp/WEB-INF/jsp/portlet/whoIsOnline.jsp @@ -52,7 +52,7 @@ id="OnlinePortlet"> diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/register/register.jsp b/webapp/src/main/webapp/WEB-INF/jsp/register/register.jsp similarity index 100% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/register/register.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/register/register.jsp diff --git a/webapp/portlet/src/main/webapp/WEB-INF/jsp/welcome-screens/accountSetup.jsp b/webapp/src/main/webapp/WEB-INF/jsp/welcome-screens/accountSetup.jsp similarity index 96% rename from webapp/portlet/src/main/webapp/WEB-INF/jsp/welcome-screens/accountSetup.jsp rename to webapp/src/main/webapp/WEB-INF/jsp/welcome-screens/accountSetup.jsp index e8dd0bcaeae..dab1c571b45 100644 --- a/webapp/portlet/src/main/webapp/WEB-INF/jsp/welcome-screens/accountSetup.jsp +++ b/webapp/src/main/webapp/WEB-INF/jsp/welcome-screens/accountSetup.jsp @@ -69,11 +69,11 @@ - + - - + +
diff --git a/extension/war/src/main/webapp/WEB-INF/notification/templates/ActivityCommentPlugin.gtmpl b/webapp/src/main/webapp/WEB-INF/notification/templates/ActivityCommentPlugin.gtmpl similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/notification/templates/ActivityCommentPlugin.gtmpl rename to webapp/src/main/webapp/WEB-INF/notification/templates/ActivityCommentPlugin.gtmpl diff --git a/extension/war/src/main/webapp/WEB-INF/notification/templates/ActivityMentionPlugin.gtmpl b/webapp/src/main/webapp/WEB-INF/notification/templates/ActivityMentionPlugin.gtmpl similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/notification/templates/ActivityMentionPlugin.gtmpl rename to webapp/src/main/webapp/WEB-INF/notification/templates/ActivityMentionPlugin.gtmpl diff --git a/extension/war/src/main/webapp/WEB-INF/notification/templates/ActivityReplyToCommentPlugin.gtmpl b/webapp/src/main/webapp/WEB-INF/notification/templates/ActivityReplyToCommentPlugin.gtmpl similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/notification/templates/ActivityReplyToCommentPlugin.gtmpl rename to webapp/src/main/webapp/WEB-INF/notification/templates/ActivityReplyToCommentPlugin.gtmpl diff --git a/extension/war/src/main/webapp/WEB-INF/notification/templates/EditActivityPlugin.gtmpl b/webapp/src/main/webapp/WEB-INF/notification/templates/EditActivityPlugin.gtmpl similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/notification/templates/EditActivityPlugin.gtmpl rename to webapp/src/main/webapp/WEB-INF/notification/templates/EditActivityPlugin.gtmpl diff --git a/extension/war/src/main/webapp/WEB-INF/notification/templates/EditCommentPlugin.gtmpl b/webapp/src/main/webapp/WEB-INF/notification/templates/EditCommentPlugin.gtmpl similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/notification/templates/EditCommentPlugin.gtmpl rename to webapp/src/main/webapp/WEB-INF/notification/templates/EditCommentPlugin.gtmpl diff --git a/extension/war/src/main/webapp/WEB-INF/notification/templates/LikeCommentPlugin.gtmpl b/webapp/src/main/webapp/WEB-INF/notification/templates/LikeCommentPlugin.gtmpl similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/notification/templates/LikeCommentPlugin.gtmpl rename to webapp/src/main/webapp/WEB-INF/notification/templates/LikeCommentPlugin.gtmpl diff --git a/extension/war/src/main/webapp/WEB-INF/notification/templates/LikePlugin.gtmpl b/webapp/src/main/webapp/WEB-INF/notification/templates/LikePlugin.gtmpl similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/notification/templates/LikePlugin.gtmpl rename to webapp/src/main/webapp/WEB-INF/notification/templates/LikePlugin.gtmpl diff --git a/extension/war/src/main/webapp/WEB-INF/notification/templates/NewUserPlugin.gtmpl b/webapp/src/main/webapp/WEB-INF/notification/templates/NewUserPlugin.gtmpl similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/notification/templates/NewUserPlugin.gtmpl rename to webapp/src/main/webapp/WEB-INF/notification/templates/NewUserPlugin.gtmpl diff --git a/extension/war/src/main/webapp/WEB-INF/notification/templates/PostActivityPlugin.gtmpl b/webapp/src/main/webapp/WEB-INF/notification/templates/PostActivityPlugin.gtmpl similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/notification/templates/PostActivityPlugin.gtmpl rename to webapp/src/main/webapp/WEB-INF/notification/templates/PostActivityPlugin.gtmpl diff --git a/extension/war/src/main/webapp/WEB-INF/notification/templates/PostActivitySpaceStreamPlugin.gtmpl b/webapp/src/main/webapp/WEB-INF/notification/templates/PostActivitySpaceStreamPlugin.gtmpl similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/notification/templates/PostActivitySpaceStreamPlugin.gtmpl rename to webapp/src/main/webapp/WEB-INF/notification/templates/PostActivitySpaceStreamPlugin.gtmpl diff --git a/extension/war/src/main/webapp/WEB-INF/notification/templates/RelationshipReceivedRequestPlugin.gtmpl b/webapp/src/main/webapp/WEB-INF/notification/templates/RelationshipReceivedRequestPlugin.gtmpl similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/notification/templates/RelationshipReceivedRequestPlugin.gtmpl rename to webapp/src/main/webapp/WEB-INF/notification/templates/RelationshipReceivedRequestPlugin.gtmpl diff --git a/extension/war/src/main/webapp/WEB-INF/notification/templates/RequestJoinSpacePlugin.gtmpl b/webapp/src/main/webapp/WEB-INF/notification/templates/RequestJoinSpacePlugin.gtmpl similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/notification/templates/RequestJoinSpacePlugin.gtmpl rename to webapp/src/main/webapp/WEB-INF/notification/templates/RequestJoinSpacePlugin.gtmpl diff --git a/extension/war/src/main/webapp/WEB-INF/notification/templates/SharedActivitySpaceStreamPlugin.gtmpl b/webapp/src/main/webapp/WEB-INF/notification/templates/SharedActivitySpaceStreamPlugin.gtmpl similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/notification/templates/SharedActivitySpaceStreamPlugin.gtmpl rename to webapp/src/main/webapp/WEB-INF/notification/templates/SharedActivitySpaceStreamPlugin.gtmpl diff --git a/extension/war/src/main/webapp/WEB-INF/notification/templates/SpaceInvitationPlugin.gtmpl b/webapp/src/main/webapp/WEB-INF/notification/templates/SpaceInvitationPlugin.gtmpl similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/notification/templates/SpaceInvitationPlugin.gtmpl rename to webapp/src/main/webapp/WEB-INF/notification/templates/SpaceInvitationPlugin.gtmpl diff --git a/extension/war/src/main/webapp/WEB-INF/notification/templates/activities/DefaultActivity.gtmpl b/webapp/src/main/webapp/WEB-INF/notification/templates/activities/DefaultActivity.gtmpl similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/notification/templates/activities/DefaultActivity.gtmpl rename to webapp/src/main/webapp/WEB-INF/notification/templates/activities/DefaultActivity.gtmpl diff --git a/extension/war/src/main/webapp/WEB-INF/notification/templates/activities/NotificationLinkActivity.gtmpl b/webapp/src/main/webapp/WEB-INF/notification/templates/activities/NotificationLinkActivity.gtmpl similarity index 100% rename from extension/war/src/main/webapp/WEB-INF/notification/templates/activities/NotificationLinkActivity.gtmpl rename to webapp/src/main/webapp/WEB-INF/notification/templates/activities/NotificationLinkActivity.gtmpl diff --git a/webapp/portlet/src/main/webapp/WEB-INF/portlet.xml b/webapp/src/main/webapp/WEB-INF/portlet.xml similarity index 99% rename from webapp/portlet/src/main/webapp/WEB-INF/portlet.xml rename to webapp/src/main/webapp/WEB-INF/portlet.xml index fa185911221..6dfc8971117 100644 --- a/webapp/portlet/src/main/webapp/WEB-INF/portlet.xml +++ b/webapp/src/main/webapp/WEB-INF/portlet.xml @@ -180,7 +180,7 @@ js-manager-jsModule - PORTLET/social-portlet/SpaceInfos + PORTLET/social/SpaceInfos text/html @@ -777,7 +777,7 @@ js-manager-jsModule - PORTLET/social-portlet/PeopleOverview + PORTLET/social/PeopleOverview prefetch.resources diff --git a/webapp/portlet/src/main/webapp/WEB-INF/web.xml b/webapp/src/main/webapp/WEB-INF/web.xml similarity index 98% rename from webapp/portlet/src/main/webapp/WEB-INF/web.xml rename to webapp/src/main/webapp/WEB-INF/web.xml index d39dc35fbcb..9153c029056 100644 --- a/webapp/portlet/src/main/webapp/WEB-INF/web.xml +++ b/webapp/src/main/webapp/WEB-INF/web.xml @@ -25,7 +25,7 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"> - social-portlet + social diff --git a/webapp/portlet/src/main/webapp/groovy/social/webui/UISocialPortalApplicationHead.gtmpl b/webapp/src/main/webapp/groovy/social/webui/UISocialPortalApplicationHead.gtmpl similarity index 100% rename from webapp/portlet/src/main/webapp/groovy/social/webui/UISocialPortalApplicationHead.gtmpl rename to webapp/src/main/webapp/groovy/social/webui/UISocialPortalApplicationHead.gtmpl diff --git a/webapp/portlet/src/main/webapp/groovy/social/webui/UISocialPreloadHead.gtmpl b/webapp/src/main/webapp/groovy/social/webui/UISocialPreloadHead.gtmpl similarity index 100% rename from webapp/portlet/src/main/webapp/groovy/social/webui/UISocialPreloadHead.gtmpl rename to webapp/src/main/webapp/groovy/social/webui/UISocialPreloadHead.gtmpl diff --git a/webapp/portlet/src/main/webapp/html/blank.html b/webapp/src/main/webapp/html/blank.html similarity index 100% rename from webapp/portlet/src/main/webapp/html/blank.html rename to webapp/src/main/webapp/html/blank.html diff --git a/webapp/portlet/src/main/webapp/html/drawersOverlay.html b/webapp/src/main/webapp/html/drawersOverlay.html similarity index 100% rename from webapp/portlet/src/main/webapp/html/drawersOverlay.html rename to webapp/src/main/webapp/html/drawersOverlay.html diff --git a/webapp/portlet/src/main/webapp/html/externalSpaceList.html b/webapp/src/main/webapp/html/externalSpaceList.html similarity index 72% rename from webapp/portlet/src/main/webapp/html/externalSpaceList.html rename to webapp/src/main/webapp/html/externalSpaceList.html index 99abc2ebac6..9ea87d6c48c 100644 --- a/webapp/portlet/src/main/webapp/html/externalSpaceList.html +++ b/webapp/src/main/webapp/html/externalSpaceList.html @@ -3,7 +3,7 @@ class="v-application v-application--is-ltr theme--light" id="ExternalSpacesListPortlet"> diff --git a/webapp/portlet/src/main/webapp/html/idmGroupsManagement.html b/webapp/src/main/webapp/html/idmGroupsManagement.html similarity index 71% rename from webapp/portlet/src/main/webapp/html/idmGroupsManagement.html rename to webapp/src/main/webapp/html/idmGroupsManagement.html index e4673e23a63..12ef5405c68 100644 --- a/webapp/portlet/src/main/webapp/html/idmGroupsManagement.html +++ b/webapp/src/main/webapp/html/idmGroupsManagement.html @@ -3,7 +3,7 @@ class="v-application v-application--is-ltr theme--light" id="GroupsManagement"> \ No newline at end of file diff --git a/webapp/portlet/src/main/webapp/html/idmMembershipTypesManagement.html b/webapp/src/main/webapp/html/idmMembershipTypesManagement.html similarity index 69% rename from webapp/portlet/src/main/webapp/html/idmMembershipTypesManagement.html rename to webapp/src/main/webapp/html/idmMembershipTypesManagement.html index 02812b61034..f23b2eb2106 100644 --- a/webapp/portlet/src/main/webapp/html/idmMembershipTypesManagement.html +++ b/webapp/src/main/webapp/html/idmMembershipTypesManagement.html @@ -3,7 +3,7 @@ class="v-application v-application--is-ltr theme--light" id="MembershipTypesManagement"> \ No newline at end of file diff --git a/webapp/portlet/src/main/webapp/html/idmUsersManagement.html b/webapp/src/main/webapp/html/idmUsersManagement.html similarity index 71% rename from webapp/portlet/src/main/webapp/html/idmUsersManagement.html rename to webapp/src/main/webapp/html/idmUsersManagement.html index 8d6cd45fa14..3ee5432c140 100644 --- a/webapp/portlet/src/main/webapp/html/idmUsersManagement.html +++ b/webapp/src/main/webapp/html/idmUsersManagement.html @@ -3,7 +3,7 @@ class="v-application white v-application--is-ltr theme--light" id="UsersManagement"> \ No newline at end of file diff --git a/webapp/portlet/src/main/webapp/html/notificationAdministration.html b/webapp/src/main/webapp/html/notificationAdministration.html similarity index 70% rename from webapp/portlet/src/main/webapp/html/notificationAdministration.html rename to webapp/src/main/webapp/html/notificationAdministration.html index a537baed890..9763a27b370 100644 --- a/webapp/portlet/src/main/webapp/html/notificationAdministration.html +++ b/webapp/src/main/webapp/html/notificationAdministration.html @@ -1,7 +1,7 @@
diff --git a/webapp/portlet/src/main/webapp/html/pageNotFound.html b/webapp/src/main/webapp/html/pageNotFound.html similarity index 83% rename from webapp/portlet/src/main/webapp/html/pageNotFound.html rename to webapp/src/main/webapp/html/pageNotFound.html index d5036cfb151..803665a7e8a 100644 --- a/webapp/portlet/src/main/webapp/html/pageNotFound.html +++ b/webapp/src/main/webapp/html/pageNotFound.html @@ -3,7 +3,7 @@ class="v-application transparent v-application--is-ltr theme--light singlePageApplication" id="PageNotFound"> diff --git a/webapp/portlet/src/main/webapp/html/spacesAdministration.html b/webapp/src/main/webapp/html/spacesAdministration.html similarity index 71% rename from webapp/portlet/src/main/webapp/html/spacesAdministration.html rename to webapp/src/main/webapp/html/spacesAdministration.html index 3a58c9168d8..ddcbfcee67c 100644 --- a/webapp/portlet/src/main/webapp/html/spacesAdministration.html +++ b/webapp/src/main/webapp/html/spacesAdministration.html @@ -3,7 +3,7 @@ class="v-application white v-application--is-ltr theme--light spacesAdministration" id="spacesAdministration">
\ No newline at end of file diff --git a/webapp/portlet/src/main/webapp/html/spacesOverview.html b/webapp/src/main/webapp/html/spacesOverview.html similarity index 70% rename from webapp/portlet/src/main/webapp/html/spacesOverview.html rename to webapp/src/main/webapp/html/spacesOverview.html index 282f272ed68..b8eb178cd75 100644 --- a/webapp/portlet/src/main/webapp/html/spacesOverview.html +++ b/webapp/src/main/webapp/html/spacesOverview.html @@ -3,7 +3,7 @@ class="v-application v-application--is-ltr theme--light" id="SpacesOverview"> diff --git a/webapp/portlet/src/main/webapp/html/topbarFavorites.html b/webapp/src/main/webapp/html/topbarFavorites.html similarity index 86% rename from webapp/portlet/src/main/webapp/html/topbarFavorites.html rename to webapp/src/main/webapp/html/topbarFavorites.html index 2917b2f69ef..4c7f1483256 100644 --- a/webapp/portlet/src/main/webapp/html/topbarFavorites.html +++ b/webapp/src/main/webapp/html/topbarFavorites.html @@ -8,7 +8,7 @@ aria-label="Favorites" type="button" class="icon-default-color v-btn v-btn--flat v-btn--icon v-btn--round theme--light v-size--default" - onclick="require(['PORTLET/social-portlet/TopBarFavorites'], app => app.init())"> + onclick="require(['PORTLET/social/TopBarFavorites'], app => app.init())"> diff --git a/webapp/portlet/src/main/webapp/html/topbarPreview.html b/webapp/src/main/webapp/html/topbarPreview.html similarity index 70% rename from webapp/portlet/src/main/webapp/html/topbarPreview.html rename to webapp/src/main/webapp/html/topbarPreview.html index 8fae46308d5..1690c7fccde 100644 --- a/webapp/portlet/src/main/webapp/html/topbarPreview.html +++ b/webapp/src/main/webapp/html/topbarPreview.html @@ -3,7 +3,7 @@ class="v-application border-box-sizing theme--light" id="topbarPreview"> diff --git a/webapp/portlet/src/main/webapp/html/verticalMenu.html b/webapp/src/main/webapp/html/verticalMenu.html similarity index 66% rename from webapp/portlet/src/main/webapp/html/verticalMenu.html rename to webapp/src/main/webapp/html/verticalMenu.html index 6ee35ce5108..19bb84958e7 100644 --- a/webapp/portlet/src/main/webapp/html/verticalMenu.html +++ b/webapp/src/main/webapp/html/verticalMenu.html @@ -2,7 +2,7 @@
\ No newline at end of file diff --git a/webapp/portlet/src/main/webapp/images/cadre.png b/webapp/src/main/webapp/images/cadre.png similarity index 100% rename from webapp/portlet/src/main/webapp/images/cadre.png rename to webapp/src/main/webapp/images/cadre.png diff --git a/webapp/portlet/src/main/webapp/images/deprecated/space-access/denyIcon.png b/webapp/src/main/webapp/images/deprecated/space-access/denyIcon.png similarity index 100% rename from webapp/portlet/src/main/webapp/images/deprecated/space-access/denyIcon.png rename to webapp/src/main/webapp/images/deprecated/space-access/denyIcon.png diff --git a/webapp/portlet/src/main/webapp/images/deprecated/space-access/lockIcon.png b/webapp/src/main/webapp/images/deprecated/space-access/lockIcon.png similarity index 100% rename from webapp/portlet/src/main/webapp/images/deprecated/space-access/lockIcon.png rename to webapp/src/main/webapp/images/deprecated/space-access/lockIcon.png diff --git a/webapp/portlet/src/main/webapp/images/deprecated/space-access/texture.png b/webapp/src/main/webapp/images/deprecated/space-access/texture.png similarity index 100% rename from webapp/portlet/src/main/webapp/images/deprecated/space-access/texture.png rename to webapp/src/main/webapp/images/deprecated/space-access/texture.png diff --git a/webapp/portlet/src/main/webapp/images/deprecated/space-access/warningIcon.png b/webapp/src/main/webapp/images/deprecated/space-access/warningIcon.png similarity index 100% rename from webapp/portlet/src/main/webapp/images/deprecated/space-access/warningIcon.png rename to webapp/src/main/webapp/images/deprecated/space-access/warningIcon.png diff --git a/webapp/portlet/src/main/webapp/images/deprecated/welcome-screen/uiIconsColor.png b/webapp/src/main/webapp/images/deprecated/welcome-screen/uiIconsColor.png similarity index 100% rename from webapp/portlet/src/main/webapp/images/deprecated/welcome-screen/uiIconsColor.png rename to webapp/src/main/webapp/images/deprecated/welcome-screen/uiIconsColor.png diff --git a/webapp/portlet/src/main/webapp/images/emptyCol1.webp b/webapp/src/main/webapp/images/emptyCol1.webp similarity index 100% rename from webapp/portlet/src/main/webapp/images/emptyCol1.webp rename to webapp/src/main/webapp/images/emptyCol1.webp diff --git a/webapp/portlet/src/main/webapp/images/emptyCol2.webp b/webapp/src/main/webapp/images/emptyCol2.webp similarity index 100% rename from webapp/portlet/src/main/webapp/images/emptyCol2.webp rename to webapp/src/main/webapp/images/emptyCol2.webp diff --git a/webapp/portlet/src/main/webapp/images/emptyCol3.webp b/webapp/src/main/webapp/images/emptyCol3.webp similarity index 100% rename from webapp/portlet/src/main/webapp/images/emptyCol3.webp rename to webapp/src/main/webapp/images/emptyCol3.webp diff --git a/webapp/portlet/src/main/webapp/images/empty_pin_stream.png b/webapp/src/main/webapp/images/empty_pin_stream.png similarity index 100% rename from webapp/portlet/src/main/webapp/images/empty_pin_stream.png rename to webapp/src/main/webapp/images/empty_pin_stream.png diff --git a/webapp/portlet/src/main/webapp/images/link.jpg b/webapp/src/main/webapp/images/link.jpg similarity index 100% rename from webapp/portlet/src/main/webapp/images/link.jpg rename to webapp/src/main/webapp/images/link.jpg diff --git a/webapp/portlet/src/main/webapp/js/BodyScrollListener.js b/webapp/src/main/webapp/js/BodyScrollListener.js similarity index 100% rename from webapp/portlet/src/main/webapp/js/BodyScrollListener.js rename to webapp/src/main/webapp/js/BodyScrollListener.js diff --git a/webapp/portlet/src/main/webapp/js/ExtendedDomPurify.js b/webapp/src/main/webapp/js/ExtendedDomPurify.js similarity index 100% rename from webapp/portlet/src/main/webapp/js/ExtendedDomPurify.js rename to webapp/src/main/webapp/js/ExtendedDomPurify.js diff --git a/webapp/portlet/src/main/webapp/js/MobileSwipeContainer.js b/webapp/src/main/webapp/js/MobileSwipeContainer.js similarity index 100% rename from webapp/portlet/src/main/webapp/js/MobileSwipeContainer.js rename to webapp/src/main/webapp/js/MobileSwipeContainer.js diff --git a/webapp/portlet/src/main/webapp/js/TopbarLoading.js b/webapp/src/main/webapp/js/TopbarLoading.js similarity index 100% rename from webapp/portlet/src/main/webapp/js/TopbarLoading.js rename to webapp/src/main/webapp/js/TopbarLoading.js diff --git a/webapp/portlet/src/main/webapp/js/ckeditorPlugins/attachImage/icons/attachImage.png b/webapp/src/main/webapp/js/ckeditorPlugins/attachImage/icons/attachImage.png similarity index 100% rename from webapp/portlet/src/main/webapp/js/ckeditorPlugins/attachImage/icons/attachImage.png rename to webapp/src/main/webapp/js/ckeditorPlugins/attachImage/icons/attachImage.png diff --git a/webapp/portlet/src/main/webapp/js/ckeditorPlugins/attachImage/lang/en.js b/webapp/src/main/webapp/js/ckeditorPlugins/attachImage/lang/en.js similarity index 100% rename from webapp/portlet/src/main/webapp/js/ckeditorPlugins/attachImage/lang/en.js rename to webapp/src/main/webapp/js/ckeditorPlugins/attachImage/lang/en.js diff --git a/webapp/portlet/src/main/webapp/js/ckeditorPlugins/attachImage/lang/fr.js b/webapp/src/main/webapp/js/ckeditorPlugins/attachImage/lang/fr.js similarity index 100% rename from webapp/portlet/src/main/webapp/js/ckeditorPlugins/attachImage/lang/fr.js rename to webapp/src/main/webapp/js/ckeditorPlugins/attachImage/lang/fr.js diff --git a/webapp/portlet/src/main/webapp/js/ckeditorPlugins/attachImage/plugin.js b/webapp/src/main/webapp/js/ckeditorPlugins/attachImage/plugin.js similarity index 100% rename from webapp/portlet/src/main/webapp/js/ckeditorPlugins/attachImage/plugin.js rename to webapp/src/main/webapp/js/ckeditorPlugins/attachImage/plugin.js diff --git a/webapp/portlet/src/main/webapp/js/ckeditorPlugins/linkBalloon/icons/addLink.png b/webapp/src/main/webapp/js/ckeditorPlugins/linkBalloon/icons/addLink.png similarity index 100% rename from webapp/portlet/src/main/webapp/js/ckeditorPlugins/linkBalloon/icons/addLink.png rename to webapp/src/main/webapp/js/ckeditorPlugins/linkBalloon/icons/addLink.png diff --git a/webapp/portlet/src/main/webapp/js/ckeditorPlugins/linkBalloon/icons/removeLink.png b/webapp/src/main/webapp/js/ckeditorPlugins/linkBalloon/icons/removeLink.png similarity index 100% rename from webapp/portlet/src/main/webapp/js/ckeditorPlugins/linkBalloon/icons/removeLink.png rename to webapp/src/main/webapp/js/ckeditorPlugins/linkBalloon/icons/removeLink.png diff --git a/webapp/portlet/src/main/webapp/js/ckeditorPlugins/linkBalloon/lang/en.js b/webapp/src/main/webapp/js/ckeditorPlugins/linkBalloon/lang/en.js similarity index 100% rename from webapp/portlet/src/main/webapp/js/ckeditorPlugins/linkBalloon/lang/en.js rename to webapp/src/main/webapp/js/ckeditorPlugins/linkBalloon/lang/en.js diff --git a/webapp/portlet/src/main/webapp/js/ckeditorPlugins/linkBalloon/lang/fr.js b/webapp/src/main/webapp/js/ckeditorPlugins/linkBalloon/lang/fr.js similarity index 100% rename from webapp/portlet/src/main/webapp/js/ckeditorPlugins/linkBalloon/lang/fr.js rename to webapp/src/main/webapp/js/ckeditorPlugins/linkBalloon/lang/fr.js diff --git a/webapp/portlet/src/main/webapp/js/ckeditorPlugins/linkBalloon/plugin.js b/webapp/src/main/webapp/js/ckeditorPlugins/linkBalloon/plugin.js similarity index 100% rename from webapp/portlet/src/main/webapp/js/ckeditorPlugins/linkBalloon/plugin.js rename to webapp/src/main/webapp/js/ckeditorPlugins/linkBalloon/plugin.js diff --git a/webapp/portlet/src/main/webapp/js/extensionRegistry.js b/webapp/src/main/webapp/js/extensionRegistry.js similarity index 100% rename from webapp/portlet/src/main/webapp/js/extensionRegistry.js rename to webapp/src/main/webapp/js/extensionRegistry.js diff --git a/webapp/portlet/src/main/webapp/js/lib/autolinker.min.js b/webapp/src/main/webapp/js/lib/autolinker.min.js similarity index 100% rename from webapp/portlet/src/main/webapp/js/lib/autolinker.min.js rename to webapp/src/main/webapp/js/lib/autolinker.min.js diff --git a/webapp/portlet/src/main/webapp/js/lib/cropper.min.js b/webapp/src/main/webapp/js/lib/cropper.min.js similarity index 100% rename from webapp/portlet/src/main/webapp/js/lib/cropper.min.js rename to webapp/src/main/webapp/js/lib/cropper.min.js diff --git a/webapp/portlet/src/main/webapp/js/lib/deprecated/switch-button.js b/webapp/src/main/webapp/js/lib/deprecated/switch-button.js similarity index 100% rename from webapp/portlet/src/main/webapp/js/lib/deprecated/switch-button.js rename to webapp/src/main/webapp/js/lib/deprecated/switch-button.js diff --git a/webapp/portlet/src/main/webapp/js/lib/echarts.min.js b/webapp/src/main/webapp/js/lib/echarts.min.js similarity index 100% rename from webapp/portlet/src/main/webapp/js/lib/echarts.min.js rename to webapp/src/main/webapp/js/lib/echarts.min.js diff --git a/webapp/portlet/src/main/webapp/js/lib/html2canvas.min.js b/webapp/src/main/webapp/js/lib/html2canvas.min.js similarity index 100% rename from webapp/portlet/src/main/webapp/js/lib/html2canvas.min.js rename to webapp/src/main/webapp/js/lib/html2canvas.min.js diff --git a/webapp/portlet/src/main/webapp/js/lib/jquery-3.2.1.js b/webapp/src/main/webapp/js/lib/jquery-3.2.1.js similarity index 100% rename from webapp/portlet/src/main/webapp/js/lib/jquery-3.2.1.js rename to webapp/src/main/webapp/js/lib/jquery-3.2.1.js diff --git a/webapp/portlet/src/main/webapp/js/lib/jquery.atwho.js b/webapp/src/main/webapp/js/lib/jquery.atwho.js similarity index 100% rename from webapp/portlet/src/main/webapp/js/lib/jquery.atwho.js rename to webapp/src/main/webapp/js/lib/jquery.atwho.js diff --git a/webapp/portlet/src/main/webapp/js/lib/jquery.caret.js b/webapp/src/main/webapp/js/lib/jquery.caret.js similarity index 100% rename from webapp/portlet/src/main/webapp/js/lib/jquery.caret.js rename to webapp/src/main/webapp/js/lib/jquery.caret.js diff --git a/webapp/portlet/src/main/webapp/js/lib/jquery.exomentions.js b/webapp/src/main/webapp/js/lib/jquery.exomentions.js similarity index 100% rename from webapp/portlet/src/main/webapp/js/lib/jquery.exomentions.js rename to webapp/src/main/webapp/js/lib/jquery.exomentions.js diff --git a/webapp/portlet/src/main/webapp/js/lib/jspdf.min.js b/webapp/src/main/webapp/js/lib/jspdf.min.js similarity index 100% rename from webapp/portlet/src/main/webapp/js/lib/jspdf.min.js rename to webapp/src/main/webapp/js/lib/jspdf.min.js diff --git a/webapp/portlet/src/main/webapp/js/lib/purify.min.js b/webapp/src/main/webapp/js/lib/purify.min.js similarity index 100% rename from webapp/portlet/src/main/webapp/js/lib/purify.min.js rename to webapp/src/main/webapp/js/lib/purify.min.js diff --git a/webapp/portlet/src/main/webapp/js/lib/require.js b/webapp/src/main/webapp/js/lib/require.js similarity index 100% rename from webapp/portlet/src/main/webapp/js/lib/require.js rename to webapp/src/main/webapp/js/lib/require.js diff --git a/webapp/portlet/src/main/webapp/js/lib/selectize.js b/webapp/src/main/webapp/js/lib/selectize.js similarity index 100% rename from webapp/portlet/src/main/webapp/js/lib/selectize.js rename to webapp/src/main/webapp/js/lib/selectize.js diff --git a/webapp/portlet/src/main/webapp/js/lib/sortable.min.js b/webapp/src/main/webapp/js/lib/sortable.min.js similarity index 100% rename from webapp/portlet/src/main/webapp/js/lib/sortable.min.js rename to webapp/src/main/webapp/js/lib/sortable.min.js diff --git a/webapp/portlet/src/main/webapp/js/lib/underscore.js b/webapp/src/main/webapp/js/lib/underscore.js similarity index 100% rename from webapp/portlet/src/main/webapp/js/lib/underscore.js rename to webapp/src/main/webapp/js/lib/underscore.js diff --git a/webapp/portlet/src/main/webapp/js/lib/vue-i18n.min.js b/webapp/src/main/webapp/js/lib/vue-i18n.min.js similarity index 100% rename from webapp/portlet/src/main/webapp/js/lib/vue-i18n.min.js rename to webapp/src/main/webapp/js/lib/vue-i18n.min.js diff --git a/webapp/portlet/src/main/webapp/js/lib/vue.min.js b/webapp/src/main/webapp/js/lib/vue.min.js similarity index 100% rename from webapp/portlet/src/main/webapp/js/lib/vue.min.js rename to webapp/src/main/webapp/js/lib/vue.min.js diff --git a/webapp/portlet/src/main/webapp/js/lib/vueDraggable.min.js b/webapp/src/main/webapp/js/lib/vueDraggable.min.js similarity index 100% rename from webapp/portlet/src/main/webapp/js/lib/vueDraggable.min.js rename to webapp/src/main/webapp/js/lib/vueDraggable.min.js diff --git a/webapp/portlet/src/main/webapp/js/lib/vuetify.min.js b/webapp/src/main/webapp/js/lib/vuetify.min.js similarity index 100% rename from webapp/portlet/src/main/webapp/js/lib/vuetify.min.js rename to webapp/src/main/webapp/js/lib/vuetify.min.js diff --git a/webapp/portlet/src/main/webapp/js/portal.js b/webapp/src/main/webapp/js/portal.js similarity index 100% rename from webapp/portlet/src/main/webapp/js/portal.js rename to webapp/src/main/webapp/js/portal.js diff --git a/webapp/portlet/src/main/webapp/js/sanitize-html-directive.js b/webapp/src/main/webapp/js/sanitize-html-directive.js similarity index 100% rename from webapp/portlet/src/main/webapp/js/sanitize-html-directive.js rename to webapp/src/main/webapp/js/sanitize-html-directive.js diff --git a/webapp/portlet/src/main/webapp/js/suggester.js b/webapp/src/main/webapp/js/suggester.js similarity index 100% rename from webapp/portlet/src/main/webapp/js/suggester.js rename to webapp/src/main/webapp/js/suggester.js diff --git a/webapp/portlet/src/main/webapp/js/tag.suggester.js b/webapp/src/main/webapp/js/tag.suggester.js similarity index 100% rename from webapp/portlet/src/main/webapp/js/tag.suggester.js rename to webapp/src/main/webapp/js/tag.suggester.js diff --git a/webapp/portlet/src/main/webapp/js/vue-i18n-wrapper.js b/webapp/src/main/webapp/js/vue-i18n-wrapper.js similarity index 100% rename from webapp/portlet/src/main/webapp/js/vue-i18n-wrapper.js rename to webapp/src/main/webapp/js/vue-i18n-wrapper.js diff --git a/webapp/portlet/src/main/webapp/js/welcome-screens/accountSetup.js b/webapp/src/main/webapp/js/welcome-screens/accountSetup.js similarity index 100% rename from webapp/portlet/src/main/webapp/js/welcome-screens/accountSetup.js rename to webapp/src/main/webapp/js/welcome-screens/accountSetup.js diff --git a/webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/Breadcrumb.png b/webapp/src/main/webapp/skin/DefaultSkin/portletIcons/Breadcrumb.png similarity index 100% rename from webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/Breadcrumb.png rename to webapp/src/main/webapp/skin/DefaultSkin/portletIcons/Breadcrumb.png diff --git a/webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/ExternalSpacesList.png b/webapp/src/main/webapp/skin/DefaultSkin/portletIcons/ExternalSpacesList.png similarity index 100% rename from webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/ExternalSpacesList.png rename to webapp/src/main/webapp/skin/DefaultSkin/portletIcons/ExternalSpacesList.png diff --git a/webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/Image.png b/webapp/src/main/webapp/skin/DefaultSkin/portletIcons/Image.png similarity index 100% rename from webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/Image.png rename to webapp/src/main/webapp/skin/DefaultSkin/portletIcons/Image.png diff --git a/webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/Links.png b/webapp/src/main/webapp/skin/DefaultSkin/portletIcons/Links.png similarity index 100% rename from webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/Links.png rename to webapp/src/main/webapp/skin/DefaultSkin/portletIcons/Links.png diff --git a/webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/MembersPortlet.png b/webapp/src/main/webapp/skin/DefaultSkin/portletIcons/MembersPortlet.png similarity index 100% rename from webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/MembersPortlet.png rename to webapp/src/main/webapp/skin/DefaultSkin/portletIcons/MembersPortlet.png diff --git a/webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/OrganizationalChart.png b/webapp/src/main/webapp/skin/DefaultSkin/portletIcons/OrganizationalChart.png similarity index 100% rename from webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/OrganizationalChart.png rename to webapp/src/main/webapp/skin/DefaultSkin/portletIcons/OrganizationalChart.png diff --git a/webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/PeopleOverview.png b/webapp/src/main/webapp/skin/DefaultSkin/portletIcons/PeopleOverview.png similarity index 100% rename from webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/PeopleOverview.png rename to webapp/src/main/webapp/skin/DefaultSkin/portletIcons/PeopleOverview.png diff --git a/webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/SpaceActivityStreamPortlet.png b/webapp/src/main/webapp/skin/DefaultSkin/portletIcons/SpaceActivityStreamPortlet.png similarity index 100% rename from webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/SpaceActivityStreamPortlet.png rename to webapp/src/main/webapp/skin/DefaultSkin/portletIcons/SpaceActivityStreamPortlet.png diff --git a/webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/SpaceInfos.png b/webapp/src/main/webapp/skin/DefaultSkin/portletIcons/SpaceInfos.png similarity index 100% rename from webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/SpaceInfos.png rename to webapp/src/main/webapp/skin/DefaultSkin/portletIcons/SpaceInfos.png diff --git a/webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/SpaceMenuPortlet.png b/webapp/src/main/webapp/skin/DefaultSkin/portletIcons/SpaceMenuPortlet.png similarity index 100% rename from webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/SpaceMenuPortlet.png rename to webapp/src/main/webapp/skin/DefaultSkin/portletIcons/SpaceMenuPortlet.png diff --git a/webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/SpaceSettingPortlet.png b/webapp/src/main/webapp/skin/DefaultSkin/portletIcons/SpaceSettingPortlet.png similarity index 100% rename from webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/SpaceSettingPortlet.png rename to webapp/src/main/webapp/skin/DefaultSkin/portletIcons/SpaceSettingPortlet.png diff --git a/webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/SpacesOverview.png b/webapp/src/main/webapp/skin/DefaultSkin/portletIcons/SpacesOverview.png similarity index 100% rename from webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/SpacesOverview.png rename to webapp/src/main/webapp/skin/DefaultSkin/portletIcons/SpacesOverview.png diff --git a/webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/SuggestionsPeopleAndSpace.png b/webapp/src/main/webapp/skin/DefaultSkin/portletIcons/SuggestionsPeopleAndSpace.png similarity index 100% rename from webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/SuggestionsPeopleAndSpace.png rename to webapp/src/main/webapp/skin/DefaultSkin/portletIcons/SuggestionsPeopleAndSpace.png diff --git a/webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/TopBarLogin.png b/webapp/src/main/webapp/skin/DefaultSkin/portletIcons/TopBarLogin.png similarity index 100% rename from webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/TopBarLogin.png rename to webapp/src/main/webapp/skin/DefaultSkin/portletIcons/TopBarLogin.png diff --git a/webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/TopBarLogo.png b/webapp/src/main/webapp/skin/DefaultSkin/portletIcons/TopBarLogo.png similarity index 100% rename from webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/TopBarLogo.png rename to webapp/src/main/webapp/skin/DefaultSkin/portletIcons/TopBarLogo.png diff --git a/webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/TopBarPreview.png b/webapp/src/main/webapp/skin/DefaultSkin/portletIcons/TopBarPreview.png similarity index 100% rename from webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/TopBarPreview.png rename to webapp/src/main/webapp/skin/DefaultSkin/portletIcons/TopBarPreview.png diff --git a/webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/TopBarPublishSite.png b/webapp/src/main/webapp/skin/DefaultSkin/portletIcons/TopBarPublishSite.png similarity index 100% rename from webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/TopBarPublishSite.png rename to webapp/src/main/webapp/skin/DefaultSkin/portletIcons/TopBarPublishSite.png diff --git a/webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/VerticalMenu.png b/webapp/src/main/webapp/skin/DefaultSkin/portletIcons/VerticalMenu.png similarity index 100% rename from webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/VerticalMenu.png rename to webapp/src/main/webapp/skin/DefaultSkin/portletIcons/VerticalMenu.png diff --git a/webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/WhoIsOnLinePortlet.png b/webapp/src/main/webapp/skin/DefaultSkin/portletIcons/WhoIsOnLinePortlet.png similarity index 100% rename from webapp/portlet/src/main/webapp/skin/DefaultSkin/portletIcons/WhoIsOnLinePortlet.png rename to webapp/src/main/webapp/skin/DefaultSkin/portletIcons/WhoIsOnLinePortlet.png diff --git a/webapp/portlet/src/main/webapp/skin/css/welcome-screens/jquery.qtip.min.css b/webapp/src/main/webapp/skin/css/welcome-screens/jquery.qtip.min.css similarity index 100% rename from webapp/portlet/src/main/webapp/skin/css/welcome-screens/jquery.qtip.min.css rename to webapp/src/main/webapp/skin/css/welcome-screens/jquery.qtip.min.css diff --git a/webapp/portlet/src/main/webapp/skin/less/common/AdministrationSite/Style.less b/webapp/src/main/webapp/skin/less/common/AdministrationSite/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/common/AdministrationSite/Style.less rename to webapp/src/main/webapp/skin/less/common/AdministrationSite/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/common/Notification/Style.less b/webapp/src/main/webapp/skin/less/common/Notification/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/common/Notification/Style.less rename to webapp/src/main/webapp/skin/less/common/Notification/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/common/PeopleList/Style.less b/webapp/src/main/webapp/skin/less/common/PeopleList/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/common/PeopleList/Style.less rename to webapp/src/main/webapp/skin/less/common/PeopleList/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/common/ProfileCard/Style-mobile.less b/webapp/src/main/webapp/skin/less/common/ProfileCard/Style-mobile.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/common/ProfileCard/Style-mobile.less rename to webapp/src/main/webapp/skin/less/common/ProfileCard/Style-mobile.less diff --git a/webapp/portlet/src/main/webapp/skin/less/common/ProfileCard/Style.less b/webapp/src/main/webapp/skin/less/common/ProfileCard/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/common/ProfileCard/Style.less rename to webapp/src/main/webapp/skin/less/common/ProfileCard/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/common/UserCard/Style.less b/webapp/src/main/webapp/skin/less/common/UserCard/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/common/UserCard/Style.less rename to webapp/src/main/webapp/skin/less/common/UserCard/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/common/siteDetails/Style.less b/webapp/src/main/webapp/skin/less/common/siteDetails/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/common/siteDetails/Style.less rename to webapp/src/main/webapp/skin/less/common/siteDetails/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/Style.less b/webapp/src/main/webapp/skin/less/deprecated/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/Style.less rename to webapp/src/main/webapp/skin/less/deprecated/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/bootstrap.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/bootstrap.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/bootstrap.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/bootstrap.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/accordion.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/accordion.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/accordion.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/accordion.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/alerts.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/alerts.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/alerts.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/alerts.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/bootstrap.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/bootstrap.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/bootstrap.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/bootstrap.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/breadcrumbs.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/breadcrumbs.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/breadcrumbs.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/breadcrumbs.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/button-groups.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/button-groups.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/button-groups.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/button-groups.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/buttons.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/buttons.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/buttons.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/buttons.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/carousel.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/carousel.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/carousel.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/carousel.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/close.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/close.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/close.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/close.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/code.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/code.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/code.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/code.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/component-animations.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/component-animations.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/component-animations.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/component-animations.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/dropdowns.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/dropdowns.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/dropdowns.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/dropdowns.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/forms.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/forms.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/forms.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/forms.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/grid.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/grid.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/grid.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/grid.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/hero-unit.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/hero-unit.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/hero-unit.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/hero-unit.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/labels-badges.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/labels-badges.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/labels-badges.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/labels-badges.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/layouts.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/layouts.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/layouts.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/layouts.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/media.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/media.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/media.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/media.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/mixins.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/mixins.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/mixins.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/mixins.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/modals.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/modals.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/modals.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/modals.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/navbar.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/navbar.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/navbar.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/navbar.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/navs.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/navs.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/navs.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/navs.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/pager.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/pager.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/pager.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/pager.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/pagination.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/pagination.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/pagination.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/pagination.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/popovers.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/popovers.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/popovers.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/popovers.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/progress-bars.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/progress-bars.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/progress-bars.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/progress-bars.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/reset.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/reset.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/reset.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/reset.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/responsive-1200px-min.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/responsive-1200px-min.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/responsive-1200px-min.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/responsive-1200px-min.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/responsive-767px-max.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/responsive-767px-max.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/responsive-767px-max.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/responsive-767px-max.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/responsive-768px-979px.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/responsive-768px-979px.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/responsive-768px-979px.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/responsive-768px-979px.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/responsive-navbar.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/responsive-navbar.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/responsive-navbar.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/responsive-navbar.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/responsive-utilities.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/responsive-utilities.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/responsive-utilities.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/responsive-utilities.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/responsive.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/responsive.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/responsive.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/responsive.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/scaffolding.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/scaffolding.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/scaffolding.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/scaffolding.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/sprites.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/sprites.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/sprites.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/sprites.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/tables.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/tables.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/tables.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/tables.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/thumbnails.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/thumbnails.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/thumbnails.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/thumbnails.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/tooltip.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/tooltip.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/tooltip.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/tooltip.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/type.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/type.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/type.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/type.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/utilities.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/utilities.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/utilities.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/utilities.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/variables.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/variables.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/variables.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/variables.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/wells.less b/webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/wells.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/bootstrap/less/wells.less rename to webapp/src/main/webapp/skin/less/deprecated/bootstrap/less/wells.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/webui/Buttons/Style.less b/webapp/src/main/webapp/skin/less/deprecated/webui/Buttons/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/webui/Buttons/Style.less rename to webapp/src/main/webapp/skin/less/deprecated/webui/Buttons/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/webui/Checkbox/Style.less b/webapp/src/main/webapp/skin/less/deprecated/webui/Checkbox/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/webui/Checkbox/Style.less rename to webapp/src/main/webapp/skin/less/deprecated/webui/Checkbox/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/webui/Form/Style.less b/webapp/src/main/webapp/skin/less/deprecated/webui/Form/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/webui/Form/Style.less rename to webapp/src/main/webapp/skin/less/deprecated/webui/Form/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/webui/Grid/Style.less b/webapp/src/main/webapp/skin/less/deprecated/webui/Grid/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/webui/Grid/Style.less rename to webapp/src/main/webapp/skin/less/deprecated/webui/Grid/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/webui/Grid/tables.less b/webapp/src/main/webapp/skin/less/deprecated/webui/Grid/tables.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/webui/Grid/tables.less rename to webapp/src/main/webapp/skin/less/deprecated/webui/Grid/tables.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/webui/Popup/Style.less b/webapp/src/main/webapp/skin/less/deprecated/webui/Popup/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/webui/Popup/Style.less rename to webapp/src/main/webapp/skin/less/deprecated/webui/Popup/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/webui/SearchInput/Style.less b/webapp/src/main/webapp/skin/less/deprecated/webui/SearchInput/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/webui/SearchInput/Style.less rename to webapp/src/main/webapp/skin/less/deprecated/webui/SearchInput/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/webui/Selectize/Style.less b/webapp/src/main/webapp/skin/less/deprecated/webui/Selectize/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/webui/Selectize/Style.less rename to webapp/src/main/webapp/skin/less/deprecated/webui/Selectize/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/deprecated/webui/webui.less b/webapp/src/main/webapp/skin/less/deprecated/webui/webui.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/deprecated/webui/webui.less rename to webapp/src/main/webapp/skin/less/deprecated/webui/webui.less diff --git a/webapp/portlet/src/main/webapp/skin/less/portlet/ActivitySearch/Style.less b/webapp/src/main/webapp/skin/less/portlet/ActivitySearch/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/portlet/ActivitySearch/Style.less rename to webapp/src/main/webapp/skin/less/portlet/ActivitySearch/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/portlet/ActivityStream/Style.less b/webapp/src/main/webapp/skin/less/portlet/ActivityStream/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/portlet/ActivityStream/Style.less rename to webapp/src/main/webapp/skin/less/portlet/ActivityStream/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/portlet/GettingStarted/Style.less b/webapp/src/main/webapp/skin/less/portlet/GettingStarted/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/portlet/GettingStarted/Style.less rename to webapp/src/main/webapp/skin/less/portlet/GettingStarted/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/portlet/HamburgerMenu/Style.less b/webapp/src/main/webapp/skin/less/portlet/HamburgerMenu/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/portlet/HamburgerMenu/Style.less rename to webapp/src/main/webapp/skin/less/portlet/HamburgerMenu/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/portlet/IDMGroupsManagement/Style.less b/webapp/src/main/webapp/skin/less/portlet/IDMGroupsManagement/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/portlet/IDMGroupsManagement/Style.less rename to webapp/src/main/webapp/skin/less/portlet/IDMGroupsManagement/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/portlet/IDMMembershipTypesManagement/Style.less b/webapp/src/main/webapp/skin/less/portlet/IDMMembershipTypesManagement/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/portlet/IDMMembershipTypesManagement/Style.less rename to webapp/src/main/webapp/skin/less/portlet/IDMMembershipTypesManagement/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/portlet/IDMUsersManagement/Style.less b/webapp/src/main/webapp/skin/less/portlet/IDMUsersManagement/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/portlet/IDMUsersManagement/Style.less rename to webapp/src/main/webapp/skin/less/portlet/IDMUsersManagement/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/portlet/PeopleList/Style.less b/webapp/src/main/webapp/skin/less/portlet/PeopleList/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/portlet/PeopleList/Style.less rename to webapp/src/main/webapp/skin/less/portlet/PeopleList/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/portlet/PeopleOverview/Style.less b/webapp/src/main/webapp/skin/less/portlet/PeopleOverview/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/portlet/PeopleOverview/Style.less rename to webapp/src/main/webapp/skin/less/portlet/PeopleOverview/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/portlet/ProfileAboutMe/Style.less b/webapp/src/main/webapp/skin/less/portlet/ProfileAboutMe/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/portlet/ProfileAboutMe/Style.less rename to webapp/src/main/webapp/skin/less/portlet/ProfileAboutMe/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/portlet/ProfileContactInformation/Style.less b/webapp/src/main/webapp/skin/less/portlet/ProfileContactInformation/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/portlet/ProfileContactInformation/Style.less rename to webapp/src/main/webapp/skin/less/portlet/ProfileContactInformation/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/portlet/ProfileHeader/Style.less b/webapp/src/main/webapp/skin/less/portlet/ProfileHeader/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/portlet/ProfileHeader/Style.less rename to webapp/src/main/webapp/skin/less/portlet/ProfileHeader/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/portlet/ProfileSearch/Style.less b/webapp/src/main/webapp/skin/less/portlet/ProfileSearch/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/portlet/ProfileSearch/Style.less rename to webapp/src/main/webapp/skin/less/portlet/ProfileSearch/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/portlet/ProfileSettings/Style.less b/webapp/src/main/webapp/skin/less/portlet/ProfileSettings/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/portlet/ProfileSettings/Style.less rename to webapp/src/main/webapp/skin/less/portlet/ProfileSettings/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/portlet/ProfileWorkExperience/Style.less b/webapp/src/main/webapp/skin/less/portlet/ProfileWorkExperience/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/portlet/ProfileWorkExperience/Style.less rename to webapp/src/main/webapp/skin/less/portlet/ProfileWorkExperience/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/portlet/Search/Style.less b/webapp/src/main/webapp/skin/less/portlet/Search/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/portlet/Search/Style.less rename to webapp/src/main/webapp/skin/less/portlet/Search/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/portlet/SpaceHeader/Style.less b/webapp/src/main/webapp/skin/less/portlet/SpaceHeader/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/portlet/SpaceHeader/Style.less rename to webapp/src/main/webapp/skin/less/portlet/SpaceHeader/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/portlet/SpaceInfos/Style.less b/webapp/src/main/webapp/skin/less/portlet/SpaceInfos/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/portlet/SpaceInfos/Style.less rename to webapp/src/main/webapp/skin/less/portlet/SpaceInfos/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/portlet/SpaceMenu/Style.less b/webapp/src/main/webapp/skin/less/portlet/SpaceMenu/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/portlet/SpaceMenu/Style.less rename to webapp/src/main/webapp/skin/less/portlet/SpaceMenu/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/portlet/SpacesAdministration/Style.less b/webapp/src/main/webapp/skin/less/portlet/SpacesAdministration/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/portlet/SpacesAdministration/Style.less rename to webapp/src/main/webapp/skin/less/portlet/SpacesAdministration/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/portlet/SpacesListExternal/Style.less b/webapp/src/main/webapp/skin/less/portlet/SpacesListExternal/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/portlet/SpacesListExternal/Style.less rename to webapp/src/main/webapp/skin/less/portlet/SpacesListExternal/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/portlet/SpacesOverview/Style.less b/webapp/src/main/webapp/skin/less/portlet/SpacesOverview/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/portlet/SpacesOverview/Style.less rename to webapp/src/main/webapp/skin/less/portlet/SpacesOverview/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/portlet/SuggestionsPeopleAndSpace/Style.less b/webapp/src/main/webapp/skin/less/portlet/SuggestionsPeopleAndSpace/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/portlet/SuggestionsPeopleAndSpace/Style.less rename to webapp/src/main/webapp/skin/less/portlet/SuggestionsPeopleAndSpace/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/portlet/TopBarMenu/Style.less b/webapp/src/main/webapp/skin/less/portlet/TopBarMenu/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/portlet/TopBarMenu/Style.less rename to webapp/src/main/webapp/skin/less/portlet/TopBarMenu/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/portlet/TopBarNotification/Style.less b/webapp/src/main/webapp/skin/less/portlet/TopBarNotification/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/portlet/TopBarNotification/Style.less rename to webapp/src/main/webapp/skin/less/portlet/TopBarNotification/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/portlet/VerticalMenu/Style.less b/webapp/src/main/webapp/skin/less/portlet/VerticalMenu/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/portlet/VerticalMenu/Style.less rename to webapp/src/main/webapp/skin/less/portlet/VerticalMenu/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/portlet/organizational-chart/Style.less b/webapp/src/main/webapp/skin/less/portlet/organizational-chart/Style.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/portlet/organizational-chart/Style.less rename to webapp/src/main/webapp/skin/less/portlet/organizational-chart/Style.less diff --git a/webapp/portlet/src/main/webapp/skin/less/standalone-pages/AccountSetup.less b/webapp/src/main/webapp/skin/less/standalone-pages/AccountSetup.less similarity index 95% rename from webapp/portlet/src/main/webapp/skin/less/standalone-pages/AccountSetup.less rename to webapp/src/main/webapp/skin/less/standalone-pages/AccountSetup.less index e06d8def4b5..d3768fd40a1 100644 --- a/webapp/portlet/src/main/webapp/skin/less/standalone-pages/AccountSetup.less +++ b/webapp/src/main/webapp/skin/less/standalone-pages/AccountSetup.less @@ -157,11 +157,11 @@ a { margin: 10px 0 15px; } .uiIconError { - background: url("/social-portlet/images/deprecated/welcome-screen/uiIconsColor.png") no-repeat scroll left top transparent; + background: url("/social/images/deprecated/welcome-screen/uiIconsColor.png") no-repeat scroll left top transparent; padding-left: 20px; } .uiIconWarning { - background: url("/social-portlet/images/deprecated/welcome-screen/uiIconsColor.png") no-repeat -20px top transparent; + background: url("/social/images/deprecated/welcome-screen/uiIconsColor.png") no-repeat -20px top transparent; padding-left: 20px; } } diff --git a/webapp/portlet/src/main/webapp/skin/less/standalone-pages/Login.less b/webapp/src/main/webapp/skin/less/standalone-pages/Login.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/standalone-pages/Login.less rename to webapp/src/main/webapp/skin/less/standalone-pages/Login.less diff --git a/webapp/portlet/src/main/webapp/skin/less/standalone-pages/OAuth.less b/webapp/src/main/webapp/skin/less/standalone-pages/OAuth.less similarity index 100% rename from webapp/portlet/src/main/webapp/skin/less/standalone-pages/OAuth.less rename to webapp/src/main/webapp/skin/less/standalone-pages/OAuth.less diff --git a/webapp/portlet/src/main/webapp/tld/portlet_2_0.tld b/webapp/src/main/webapp/tld/portlet_2_0.tld similarity index 100% rename from webapp/portlet/src/main/webapp/tld/portlet_2_0.tld rename to webapp/src/main/webapp/tld/portlet_2_0.tld diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-reactions/components/ActivityLikerItem.vue b/webapp/src/main/webapp/vue-apps/activity-reactions/components/ActivityLikerItem.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-reactions/components/ActivityLikerItem.vue rename to webapp/src/main/webapp/vue-apps/activity-reactions/components/ActivityLikerItem.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-reactions/components/ActivityLikesList.vue b/webapp/src/main/webapp/vue-apps/activity-reactions/components/ActivityLikesList.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-reactions/components/ActivityLikesList.vue rename to webapp/src/main/webapp/vue-apps/activity-reactions/components/ActivityLikesList.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-reactions/components/ActivityReactions.vue b/webapp/src/main/webapp/vue-apps/activity-reactions/components/ActivityReactions.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-reactions/components/ActivityReactions.vue rename to webapp/src/main/webapp/vue-apps/activity-reactions/components/ActivityReactions.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-reactions/components/ActivityReactionsApp.vue b/webapp/src/main/webapp/vue-apps/activity-reactions/components/ActivityReactionsApp.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-reactions/components/ActivityReactionsApp.vue rename to webapp/src/main/webapp/vue-apps/activity-reactions/components/ActivityReactionsApp.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-reactions/components/ActivityReactionsDrawer.vue b/webapp/src/main/webapp/vue-apps/activity-reactions/components/ActivityReactionsDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-reactions/components/ActivityReactionsDrawer.vue rename to webapp/src/main/webapp/vue-apps/activity-reactions/components/ActivityReactionsDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-reactions/components/ActivityReactionsListItems.vue b/webapp/src/main/webapp/vue-apps/activity-reactions/components/ActivityReactionsListItems.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-reactions/components/ActivityReactionsListItems.vue rename to webapp/src/main/webapp/vue-apps/activity-reactions/components/ActivityReactionsListItems.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-reactions/components/ActivityReactionsMobile.vue b/webapp/src/main/webapp/vue-apps/activity-reactions/components/ActivityReactionsMobile.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-reactions/components/ActivityReactionsMobile.vue rename to webapp/src/main/webapp/vue-apps/activity-reactions/components/ActivityReactionsMobile.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-reactions/extensions.js b/webapp/src/main/webapp/vue-apps/activity-reactions/extensions.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-reactions/extensions.js rename to webapp/src/main/webapp/vue-apps/activity-reactions/extensions.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-reactions/initComponents.js b/webapp/src/main/webapp/vue-apps/activity-reactions/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-reactions/initComponents.js rename to webapp/src/main/webapp/vue-apps/activity-reactions/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-reactions/main.js b/webapp/src/main/webapp/vue-apps/activity-reactions/main.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-reactions/main.js rename to webapp/src/main/webapp/vue-apps/activity-reactions/main.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/ActivityStream.vue b/webapp/src/main/webapp/vue-apps/activity-stream/components/ActivityStream.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/ActivityStream.vue rename to webapp/src/main/webapp/vue-apps/activity-stream/components/ActivityStream.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/ActivityStreamActivity.vue b/webapp/src/main/webapp/vue-apps/activity-stream/components/activity/ActivityStreamActivity.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/ActivityStreamActivity.vue rename to webapp/src/main/webapp/vue-apps/activity-stream/components/activity/ActivityStreamActivity.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/ActivityStreamLoader.vue b/webapp/src/main/webapp/vue-apps/activity-stream/components/activity/ActivityStreamLoader.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/ActivityStreamLoader.vue rename to webapp/src/main/webapp/vue-apps/activity-stream/components/activity/ActivityStreamLoader.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/content/ActivityBody.vue b/webapp/src/main/webapp/vue-apps/activity-stream/components/activity/content/ActivityBody.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/content/ActivityBody.vue rename to webapp/src/main/webapp/vue-apps/activity-stream/components/activity/content/ActivityBody.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/content/ActivityEmbeddedHTML.vue b/webapp/src/main/webapp/vue-apps/activity-stream/components/activity/content/ActivityEmbeddedHTML.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/content/ActivityEmbeddedHTML.vue rename to webapp/src/main/webapp/vue-apps/activity-stream/components/activity/content/ActivityEmbeddedHTML.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/content/ActivityImageAttachments.vue b/webapp/src/main/webapp/vue-apps/activity-stream/components/activity/content/ActivityImageAttachments.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/content/ActivityImageAttachments.vue rename to webapp/src/main/webapp/vue-apps/activity-stream/components/activity/content/ActivityImageAttachments.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/content/ActivityLink.vue b/webapp/src/main/webapp/vue-apps/activity-stream/components/activity/content/ActivityLink.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/content/ActivityLink.vue rename to webapp/src/main/webapp/vue-apps/activity-stream/components/activity/content/ActivityLink.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/content/ActivityShare.vue b/webapp/src/main/webapp/vue-apps/activity-stream/components/activity/content/ActivityShare.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/content/ActivityShare.vue rename to webapp/src/main/webapp/vue-apps/activity-stream/components/activity/content/ActivityShare.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/footer/ActivityActions.vue b/webapp/src/main/webapp/vue-apps/activity-stream/components/activity/footer/ActivityActions.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/footer/ActivityActions.vue rename to webapp/src/main/webapp/vue-apps/activity-stream/components/activity/footer/ActivityActions.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/footer/ActivityFooter.vue b/webapp/src/main/webapp/vue-apps/activity-stream/components/activity/footer/ActivityFooter.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/footer/ActivityFooter.vue rename to webapp/src/main/webapp/vue-apps/activity-stream/components/activity/footer/ActivityFooter.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/footer/ActivityShareInformation.vue b/webapp/src/main/webapp/vue-apps/activity-stream/components/activity/footer/ActivityShareInformation.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/footer/ActivityShareInformation.vue rename to webapp/src/main/webapp/vue-apps/activity-stream/components/activity/footer/ActivityShareInformation.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/footer/actions/ActivityCommentAction.vue b/webapp/src/main/webapp/vue-apps/activity-stream/components/activity/footer/actions/ActivityCommentAction.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/footer/actions/ActivityCommentAction.vue rename to webapp/src/main/webapp/vue-apps/activity-stream/components/activity/footer/actions/ActivityCommentAction.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/footer/actions/ActivityFavoriteAction.vue b/webapp/src/main/webapp/vue-apps/activity-stream/components/activity/footer/actions/ActivityFavoriteAction.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/footer/actions/ActivityFavoriteAction.vue rename to webapp/src/main/webapp/vue-apps/activity-stream/components/activity/footer/actions/ActivityFavoriteAction.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/footer/actions/ActivityLikeAction.vue b/webapp/src/main/webapp/vue-apps/activity-stream/components/activity/footer/actions/ActivityLikeAction.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/footer/actions/ActivityLikeAction.vue rename to webapp/src/main/webapp/vue-apps/activity-stream/components/activity/footer/actions/ActivityLikeAction.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/footer/actions/ActivityShareAction.vue b/webapp/src/main/webapp/vue-apps/activity-stream/components/activity/footer/actions/ActivityShareAction.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/footer/actions/ActivityShareAction.vue rename to webapp/src/main/webapp/vue-apps/activity-stream/components/activity/footer/actions/ActivityShareAction.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/header/ActivityHead.vue b/webapp/src/main/webapp/vue-apps/activity-stream/components/activity/header/ActivityHead.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/header/ActivityHead.vue rename to webapp/src/main/webapp/vue-apps/activity-stream/components/activity/header/ActivityHead.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/header/ActivityHeadMenu.vue b/webapp/src/main/webapp/vue-apps/activity-stream/components/activity/header/ActivityHeadMenu.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/header/ActivityHeadMenu.vue rename to webapp/src/main/webapp/vue-apps/activity-stream/components/activity/header/ActivityHeadMenu.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/header/ActivityHeadTime.vue b/webapp/src/main/webapp/vue-apps/activity-stream/components/activity/header/ActivityHeadTime.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/header/ActivityHeadTime.vue rename to webapp/src/main/webapp/vue-apps/activity-stream/components/activity/header/ActivityHeadTime.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/header/ActivityMobileHead.vue b/webapp/src/main/webapp/vue-apps/activity-stream/components/activity/header/ActivityMobileHead.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/header/ActivityMobileHead.vue rename to webapp/src/main/webapp/vue-apps/activity-stream/components/activity/header/ActivityMobileHead.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/list/ActivityStreamList.vue b/webapp/src/main/webapp/vue-apps/activity-stream/components/activity/list/ActivityStreamList.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/activity/list/ActivityStreamList.vue rename to webapp/src/main/webapp/vue-apps/activity-stream/components/activity/list/ActivityStreamList.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/comment/ActivityComment.vue b/webapp/src/main/webapp/vue-apps/activity-stream/components/comment/ActivityComment.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/comment/ActivityComment.vue rename to webapp/src/main/webapp/vue-apps/activity-stream/components/comment/ActivityComment.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/comment/content/ActivityCommentBodyText.vue b/webapp/src/main/webapp/vue-apps/activity-stream/components/comment/content/ActivityCommentBodyText.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/comment/content/ActivityCommentBodyText.vue rename to webapp/src/main/webapp/vue-apps/activity-stream/components/comment/content/ActivityCommentBodyText.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/comment/content/ActivityCommentRichText.vue b/webapp/src/main/webapp/vue-apps/activity-stream/components/comment/content/ActivityCommentRichText.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/comment/content/ActivityCommentRichText.vue rename to webapp/src/main/webapp/vue-apps/activity-stream/components/comment/content/ActivityCommentRichText.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/comment/footer/ActivityCommentActions.vue b/webapp/src/main/webapp/vue-apps/activity-stream/components/comment/footer/ActivityCommentActions.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/comment/footer/ActivityCommentActions.vue rename to webapp/src/main/webapp/vue-apps/activity-stream/components/comment/footer/ActivityCommentActions.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/comment/footer/ActivityCommentTime.vue b/webapp/src/main/webapp/vue-apps/activity-stream/components/comment/footer/ActivityCommentTime.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/comment/footer/ActivityCommentTime.vue rename to webapp/src/main/webapp/vue-apps/activity-stream/components/comment/footer/ActivityCommentTime.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/comment/footer/actions/ActivityCommentLikeAction.vue b/webapp/src/main/webapp/vue-apps/activity-stream/components/comment/footer/actions/ActivityCommentLikeAction.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/comment/footer/actions/ActivityCommentLikeAction.vue rename to webapp/src/main/webapp/vue-apps/activity-stream/components/comment/footer/actions/ActivityCommentLikeAction.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/comment/footer/actions/ActivityCommentReplyAction.vue b/webapp/src/main/webapp/vue-apps/activity-stream/components/comment/footer/actions/ActivityCommentReplyAction.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/comment/footer/actions/ActivityCommentReplyAction.vue rename to webapp/src/main/webapp/vue-apps/activity-stream/components/comment/footer/actions/ActivityCommentReplyAction.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/comment/header/ActivityCommentMenu.vue b/webapp/src/main/webapp/vue-apps/activity-stream/components/comment/header/ActivityCommentMenu.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/comment/header/ActivityCommentMenu.vue rename to webapp/src/main/webapp/vue-apps/activity-stream/components/comment/header/ActivityCommentMenu.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/comment/list/ActivityComments.vue b/webapp/src/main/webapp/vue-apps/activity-stream/components/comment/list/ActivityComments.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/comment/list/ActivityComments.vue rename to webapp/src/main/webapp/vue-apps/activity-stream/components/comment/list/ActivityComments.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/comment/list/ActivityCommentsDrawer.vue b/webapp/src/main/webapp/vue-apps/activity-stream/components/comment/list/ActivityCommentsDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/comment/list/ActivityCommentsDrawer.vue rename to webapp/src/main/webapp/vue-apps/activity-stream/components/comment/list/ActivityCommentsDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/comment/list/ActivityCommentsPreview.vue b/webapp/src/main/webapp/vue-apps/activity-stream/components/comment/list/ActivityCommentsPreview.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/comment/list/ActivityCommentsPreview.vue rename to webapp/src/main/webapp/vue-apps/activity-stream/components/comment/list/ActivityCommentsPreview.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/common/ActivityStreamConfirm.vue b/webapp/src/main/webapp/vue-apps/activity-stream/components/common/ActivityStreamConfirm.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/common/ActivityStreamConfirm.vue rename to webapp/src/main/webapp/vue-apps/activity-stream/components/common/ActivityStreamConfirm.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/common/ActivityStreamUpdater.vue b/webapp/src/main/webapp/vue-apps/activity-stream/components/common/ActivityStreamUpdater.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/common/ActivityStreamUpdater.vue rename to webapp/src/main/webapp/vue-apps/activity-stream/components/common/ActivityStreamUpdater.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/empty-stream/ActivityNotFound.vue b/webapp/src/main/webapp/vue-apps/activity-stream/components/empty-stream/ActivityNotFound.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/empty-stream/ActivityNotFound.vue rename to webapp/src/main/webapp/vue-apps/activity-stream/components/empty-stream/ActivityNotFound.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/empty-stream/ActivityStreamEmptyMessage.vue b/webapp/src/main/webapp/vue-apps/activity-stream/components/empty-stream/ActivityStreamEmptyMessage.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/empty-stream/ActivityStreamEmptyMessage.vue rename to webapp/src/main/webapp/vue-apps/activity-stream/components/empty-stream/ActivityStreamEmptyMessage.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/empty-stream/ActivityStreamEmptyMessageCard.vue b/webapp/src/main/webapp/vue-apps/activity-stream/components/empty-stream/ActivityStreamEmptyMessageCard.vue similarity index 96% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/empty-stream/ActivityStreamEmptyMessageCard.vue rename to webapp/src/main/webapp/vue-apps/activity-stream/components/empty-stream/ActivityStreamEmptyMessageCard.vue index 704f2ec64af..4c9245e21cf 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/components/empty-stream/ActivityStreamEmptyMessageCard.vue +++ b/webapp/src/main/webapp/vue-apps/activity-stream/components/empty-stream/ActivityStreamEmptyMessageCard.vue @@ -27,7 +27,7 @@ click: () => $emit('apply'), }"> activity && activity.templateParams && activity.templateParams.description || '', - getThumbnail: activity => activity && activity.templateParams && activity.templateParams.image || '/social-portlet/images/link.jpg', + getThumbnail: activity => activity && activity.templateParams && activity.templateParams.image || '/social/images/link.jpg', isDefaultThumbnail: activity => !(activity && activity.templateParams && activity.templateParams.image && activity.templateParams.image.length > 0), getPreviewWidth: activity => activity && activity.templateParams && activity.templateParams.previewWidth || 0, getPreviewHeight: activity => activity && activity.templateParams && activity.templateParams.previewHeight || 0, diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/initComponents.js b/webapp/src/main/webapp/vue-apps/activity-stream/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/initComponents.js rename to webapp/src/main/webapp/vue-apps/activity-stream/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/js/ActivityConstants.js b/webapp/src/main/webapp/vue-apps/activity-stream/js/ActivityConstants.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/js/ActivityConstants.js rename to webapp/src/main/webapp/vue-apps/activity-stream/js/ActivityConstants.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/js/ActivityUtils.js b/webapp/src/main/webapp/vue-apps/activity-stream/js/ActivityUtils.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/js/ActivityUtils.js rename to webapp/src/main/webapp/vue-apps/activity-stream/js/ActivityUtils.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/js/WebSocket.js b/webapp/src/main/webapp/vue-apps/activity-stream/js/WebSocket.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/js/WebSocket.js rename to webapp/src/main/webapp/vue-apps/activity-stream/js/WebSocket.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/main.js b/webapp/src/main/webapp/vue-apps/activity-stream/main.js similarity index 92% rename from webapp/portlet/src/main/webapp/vue-apps/activity-stream/main.js rename to webapp/src/main/webapp/vue-apps/activity-stream/main.js index 1703a7dc365..620e8c5b897 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/activity-stream/main.js +++ b/webapp/src/main/webapp/vue-apps/activity-stream/main.js @@ -47,9 +47,9 @@ const appId = 'ActivityStream'; // Attention!!! when changing this, the list of preloaded // URLs has to change in JSP as well const urls = [ - `/social-portlet/i18n/locale.portlet.Portlets?lang=${lang}`, - `/social-portlet/i18n/locale.commons.Commons?lang=${lang}`, - `/social-portlet/i18n/locale.social.Webui?lang=${lang}`, + `/social/i18n/locale.portlet.Portlets?lang=${lang}`, + `/social/i18n/locale.commons.Commons?lang=${lang}`, + `/social/i18n/locale.social.Webui?lang=${lang}`, ]; export function init(maxFileSize) { diff --git a/webapp/portlet/src/main/webapp/vue-apps/animations/components/ConfetiAnimation.vue b/webapp/src/main/webapp/vue-apps/animations/components/ConfetiAnimation.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/animations/components/ConfetiAnimation.vue rename to webapp/src/main/webapp/vue-apps/animations/components/ConfetiAnimation.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/animations/initComponents.js b/webapp/src/main/webapp/vue-apps/animations/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/animations/initComponents.js rename to webapp/src/main/webapp/vue-apps/animations/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/animations/main.js b/webapp/src/main/webapp/vue-apps/animations/main.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/animations/main.js rename to webapp/src/main/webapp/vue-apps/animations/main.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/application-toolbar/components/ApplicationToolbar.vue b/webapp/src/main/webapp/vue-apps/application-toolbar/components/ApplicationToolbar.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/application-toolbar/components/ApplicationToolbar.vue rename to webapp/src/main/webapp/vue-apps/application-toolbar/components/ApplicationToolbar.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/application-toolbar/initComponents.js b/webapp/src/main/webapp/vue-apps/application-toolbar/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/application-toolbar/initComponents.js rename to webapp/src/main/webapp/vue-apps/application-toolbar/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/application-toolbar/main.js b/webapp/src/main/webapp/vue-apps/application-toolbar/main.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/application-toolbar/main.js rename to webapp/src/main/webapp/vue-apps/application-toolbar/main.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/attach-image/components/form/ImageAttachmentCropDrawer.vue b/webapp/src/main/webapp/vue-apps/attach-image/components/form/ImageAttachmentCropDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/attach-image/components/form/ImageAttachmentCropDrawer.vue rename to webapp/src/main/webapp/vue-apps/attach-image/components/form/ImageAttachmentCropDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/attach-image/components/form/ImageInput.vue b/webapp/src/main/webapp/vue-apps/attach-image/components/form/ImageInput.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/attach-image/components/form/ImageInput.vue rename to webapp/src/main/webapp/vue-apps/attach-image/components/form/ImageInput.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/attach-image/components/form/ImageInputItem.vue b/webapp/src/main/webapp/vue-apps/attach-image/components/form/ImageInputItem.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/attach-image/components/form/ImageInputItem.vue rename to webapp/src/main/webapp/vue-apps/attach-image/components/form/ImageInputItem.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/attach-image/components/form/ImageInputItems.vue b/webapp/src/main/webapp/vue-apps/attach-image/components/form/ImageInputItems.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/attach-image/components/form/ImageInputItems.vue rename to webapp/src/main/webapp/vue-apps/attach-image/components/form/ImageInputItems.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/attach-image/components/form/ImageInputMultiUpload.vue b/webapp/src/main/webapp/vue-apps/attach-image/components/form/ImageInputMultiUpload.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/attach-image/components/form/ImageInputMultiUpload.vue rename to webapp/src/main/webapp/vue-apps/attach-image/components/form/ImageInputMultiUpload.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/attach-image/components/preview/ImagePreviewDialog.vue b/webapp/src/main/webapp/vue-apps/attach-image/components/preview/ImagePreviewDialog.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/attach-image/components/preview/ImagePreviewDialog.vue rename to webapp/src/main/webapp/vue-apps/attach-image/components/preview/ImagePreviewDialog.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/attach-image/components/preview/ImagePreviewItem.vue b/webapp/src/main/webapp/vue-apps/attach-image/components/preview/ImagePreviewItem.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/attach-image/components/preview/ImagePreviewItem.vue rename to webapp/src/main/webapp/vue-apps/attach-image/components/preview/ImagePreviewItem.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/attach-image/components/view/ImageItem.vue b/webapp/src/main/webapp/vue-apps/attach-image/components/view/ImageItem.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/attach-image/components/view/ImageItem.vue rename to webapp/src/main/webapp/vue-apps/attach-image/components/view/ImageItem.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/attach-image/components/view/ImageItems.vue b/webapp/src/main/webapp/vue-apps/attach-image/components/view/ImageItems.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/attach-image/components/view/ImageItems.vue rename to webapp/src/main/webapp/vue-apps/attach-image/components/view/ImageItems.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/attach-image/initComponents.js b/webapp/src/main/webapp/vue-apps/attach-image/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/attach-image/initComponents.js rename to webapp/src/main/webapp/vue-apps/attach-image/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/attach-image/js/FileAttachmentService.js b/webapp/src/main/webapp/vue-apps/attach-image/js/FileAttachmentService.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/attach-image/js/FileAttachmentService.js rename to webapp/src/main/webapp/vue-apps/attach-image/js/FileAttachmentService.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/attach-image/main.js b/webapp/src/main/webapp/vue-apps/attach-image/main.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/attach-image/main.js rename to webapp/src/main/webapp/vue-apps/attach-image/main.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/attach-image/services.js b/webapp/src/main/webapp/vue-apps/attach-image/services.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/attach-image/services.js rename to webapp/src/main/webapp/vue-apps/attach-image/services.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/breadcrumb/components/Breadcrumb.vue b/webapp/src/main/webapp/vue-apps/breadcrumb/components/Breadcrumb.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/breadcrumb/components/Breadcrumb.vue rename to webapp/src/main/webapp/vue-apps/breadcrumb/components/Breadcrumb.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/breadcrumb/initComponents.js b/webapp/src/main/webapp/vue-apps/breadcrumb/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/breadcrumb/initComponents.js rename to webapp/src/main/webapp/vue-apps/breadcrumb/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/breadcrumb/main.js b/webapp/src/main/webapp/vue-apps/breadcrumb/main.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/breadcrumb/main.js rename to webapp/src/main/webapp/vue-apps/breadcrumb/main.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/common-font-icon/components/FontIconDrawer.vue b/webapp/src/main/webapp/vue-apps/common-font-icon/components/FontIconDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common-font-icon/components/FontIconDrawer.vue rename to webapp/src/main/webapp/vue-apps/common-font-icon/components/FontIconDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/common-font-icon/components/FontIconInput.vue b/webapp/src/main/webapp/vue-apps/common-font-icon/components/FontIconInput.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common-font-icon/components/FontIconInput.vue rename to webapp/src/main/webapp/vue-apps/common-font-icon/components/FontIconInput.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/common-font-icon/initComponents.js b/webapp/src/main/webapp/vue-apps/common-font-icon/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common-font-icon/initComponents.js rename to webapp/src/main/webapp/vue-apps/common-font-icon/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/common-font-icon/js/fontLibrary.js b/webapp/src/main/webapp/vue-apps/common-font-icon/js/fontLibrary.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common-font-icon/js/fontLibrary.js rename to webapp/src/main/webapp/vue-apps/common-font-icon/js/fontLibrary.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/common-font-icon/main.js b/webapp/src/main/webapp/vue-apps/common-font-icon/main.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common-font-icon/main.js rename to webapp/src/main/webapp/vue-apps/common-font-icon/main.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/common-font-icon/services.js b/webapp/src/main/webapp/vue-apps/common-font-icon/services.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common-font-icon/services.js rename to webapp/src/main/webapp/vue-apps/common-font-icon/services.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/components/ActivityShareDrawer.vue b/webapp/src/main/webapp/vue-apps/common/components/ActivityShareDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/components/ActivityShareDrawer.vue rename to webapp/src/main/webapp/vue-apps/common/components/ActivityShareDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/components/AttachmentsDraggableZone.vue b/webapp/src/main/webapp/vue-apps/common/components/AttachmentsDraggableZone.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/components/AttachmentsDraggableZone.vue rename to webapp/src/main/webapp/vue-apps/common/components/AttachmentsDraggableZone.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/components/CardCarousel.vue b/webapp/src/main/webapp/vue-apps/common/components/CardCarousel.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/components/CardCarousel.vue rename to webapp/src/main/webapp/vue-apps/common/components/CardCarousel.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/components/ChangesReminder.vue b/webapp/src/main/webapp/vue-apps/common/components/ChangesReminder.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/components/ChangesReminder.vue rename to webapp/src/main/webapp/vue-apps/common/components/ChangesReminder.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/components/ConfirmDialog.vue b/webapp/src/main/webapp/vue-apps/common/components/ConfirmDialog.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/components/ConfirmDialog.vue rename to webapp/src/main/webapp/vue-apps/common/components/ConfirmDialog.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/components/DateFormat.vue b/webapp/src/main/webapp/vue-apps/common/components/DateFormat.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/components/DateFormat.vue rename to webapp/src/main/webapp/vue-apps/common/components/DateFormat.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/components/DatePicker.vue b/webapp/src/main/webapp/vue-apps/common/components/DatePicker.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/components/DatePicker.vue rename to webapp/src/main/webapp/vue-apps/common/components/DatePicker.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/components/DrawersOverlay.vue b/webapp/src/main/webapp/vue-apps/common/components/DrawersOverlay.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/components/DrawersOverlay.vue rename to webapp/src/main/webapp/vue-apps/common/components/DrawersOverlay.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/components/DynamicHTMLElement.vue b/webapp/src/main/webapp/vue-apps/common/components/DynamicHTMLElement.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/components/DynamicHTMLElement.vue rename to webapp/src/main/webapp/vue-apps/common/components/DynamicHTMLElement.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/components/ExoDrawer.vue b/webapp/src/main/webapp/vue-apps/common/components/ExoDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/components/ExoDrawer.vue rename to webapp/src/main/webapp/vue-apps/common/components/ExoDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/components/ExoGroupSuggester.vue b/webapp/src/main/webapp/vue-apps/common/components/ExoGroupSuggester.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/components/ExoGroupSuggester.vue rename to webapp/src/main/webapp/vue-apps/common/components/ExoGroupSuggester.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/components/ExoIdentitySuggester.vue b/webapp/src/main/webapp/vue-apps/common/components/ExoIdentitySuggester.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/components/ExoIdentitySuggester.vue rename to webapp/src/main/webapp/vue-apps/common/components/ExoIdentitySuggester.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/components/ExoModal.vue b/webapp/src/main/webapp/vue-apps/common/components/ExoModal.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/components/ExoModal.vue rename to webapp/src/main/webapp/vue-apps/common/components/ExoModal.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/components/ExoNotificationAlert.vue b/webapp/src/main/webapp/vue-apps/common/components/ExoNotificationAlert.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/components/ExoNotificationAlert.vue rename to webapp/src/main/webapp/vue-apps/common/components/ExoNotificationAlert.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/components/ExtendedTextarea.vue b/webapp/src/main/webapp/vue-apps/common/components/ExtendedTextarea.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/components/ExtendedTextarea.vue rename to webapp/src/main/webapp/vue-apps/common/components/ExtendedTextarea.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/components/ExtensionRegistryComponent.vue b/webapp/src/main/webapp/vue-apps/common/components/ExtensionRegistryComponent.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/components/ExtensionRegistryComponent.vue rename to webapp/src/main/webapp/vue-apps/common/components/ExtensionRegistryComponent.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/components/ExtensionRegistryComponents.vue b/webapp/src/main/webapp/vue-apps/common/components/ExtensionRegistryComponents.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/components/ExtensionRegistryComponents.vue rename to webapp/src/main/webapp/vue-apps/common/components/ExtensionRegistryComponents.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/components/FavoriteButton.vue b/webapp/src/main/webapp/vue-apps/common/components/FavoriteButton.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/components/FavoriteButton.vue rename to webapp/src/main/webapp/vue-apps/common/components/FavoriteButton.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/components/HelpDrawer.vue b/webapp/src/main/webapp/vue-apps/common/components/HelpDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/components/HelpDrawer.vue rename to webapp/src/main/webapp/vue-apps/common/components/HelpDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/components/HelpLabel.vue b/webapp/src/main/webapp/vue-apps/common/components/HelpLabel.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/components/HelpLabel.vue rename to webapp/src/main/webapp/vue-apps/common/components/HelpLabel.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/components/HelpTooltip.vue b/webapp/src/main/webapp/vue-apps/common/components/HelpTooltip.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/components/HelpTooltip.vue rename to webapp/src/main/webapp/vue-apps/common/components/HelpTooltip.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/components/Notifications.vue b/webapp/src/main/webapp/vue-apps/common/components/Notifications.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/components/Notifications.vue rename to webapp/src/main/webapp/vue-apps/common/components/Notifications.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/components/NumberInput.vue b/webapp/src/main/webapp/vue-apps/common/components/NumberInput.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/components/NumberInput.vue rename to webapp/src/main/webapp/vue-apps/common/components/NumberInput.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/components/RelativeDateFormat.vue b/webapp/src/main/webapp/vue-apps/common/components/RelativeDateFormat.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/components/RelativeDateFormat.vue rename to webapp/src/main/webapp/vue-apps/common/components/RelativeDateFormat.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/components/RichEditor.vue b/webapp/src/main/webapp/vue-apps/common/components/RichEditor.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/components/RichEditor.vue rename to webapp/src/main/webapp/vue-apps/common/components/RichEditor.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/components/RippleHoverButton.vue b/webapp/src/main/webapp/vue-apps/common/components/RippleHoverButton.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/components/RippleHoverButton.vue rename to webapp/src/main/webapp/vue-apps/common/components/RippleHoverButton.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/components/SpaceAvatar.vue b/webapp/src/main/webapp/vue-apps/common/components/SpaceAvatar.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/components/SpaceAvatar.vue rename to webapp/src/main/webapp/vue-apps/common/components/SpaceAvatar.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/components/TimePicker.vue b/webapp/src/main/webapp/vue-apps/common/components/TimePicker.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/components/TimePicker.vue rename to webapp/src/main/webapp/vue-apps/common/components/TimePicker.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/components/UnreadBadge.vue b/webapp/src/main/webapp/vue-apps/common/components/UnreadBadge.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/components/UnreadBadge.vue rename to webapp/src/main/webapp/vue-apps/common/components/UnreadBadge.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/components/UserAvatar.vue b/webapp/src/main/webapp/vue-apps/common/components/UserAvatar.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/components/UserAvatar.vue rename to webapp/src/main/webapp/vue-apps/common/components/UserAvatar.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/components/UserAvatarsList.vue b/webapp/src/main/webapp/vue-apps/common/components/UserAvatarsList.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/components/UserAvatarsList.vue rename to webapp/src/main/webapp/vue-apps/common/components/UserAvatarsList.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/components/Widget.vue b/webapp/src/main/webapp/vue-apps/common/components/Widget.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/components/Widget.vue rename to webapp/src/main/webapp/vue-apps/common/components/Widget.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/initComponents.js b/webapp/src/main/webapp/vue-apps/common/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/initComponents.js rename to webapp/src/main/webapp/vue-apps/common/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/js/ActivityService.js b/webapp/src/main/webapp/vue-apps/common/js/ActivityService.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/js/ActivityService.js rename to webapp/src/main/webapp/vue-apps/common/js/ActivityService.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/js/DateUtil.js b/webapp/src/main/webapp/vue-apps/common/js/DateUtil.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/js/DateUtil.js rename to webapp/src/main/webapp/vue-apps/common/js/DateUtil.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/js/FavoriteService.js b/webapp/src/main/webapp/vue-apps/common/js/FavoriteService.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/js/FavoriteService.js rename to webapp/src/main/webapp/vue-apps/common/js/FavoriteService.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/js/FeatureService.js b/webapp/src/main/webapp/vue-apps/common/js/FeatureService.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/js/FeatureService.js rename to webapp/src/main/webapp/vue-apps/common/js/FeatureService.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/js/IdentityService.js b/webapp/src/main/webapp/vue-apps/common/js/IdentityService.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/js/IdentityService.js rename to webapp/src/main/webapp/vue-apps/common/js/IdentityService.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/js/NavigationService.js b/webapp/src/main/webapp/vue-apps/common/js/NavigationService.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/js/NavigationService.js rename to webapp/src/main/webapp/vue-apps/common/js/NavigationService.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/js/ObserverService.js b/webapp/src/main/webapp/vue-apps/common/js/ObserverService.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/js/ObserverService.js rename to webapp/src/main/webapp/vue-apps/common/js/ObserverService.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/js/ProfileLabelService.js b/webapp/src/main/webapp/vue-apps/common/js/ProfileLabelService.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/js/ProfileLabelService.js rename to webapp/src/main/webapp/vue-apps/common/js/ProfileLabelService.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/js/ProfileSettingsService.js b/webapp/src/main/webapp/vue-apps/common/js/ProfileSettingsService.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/js/ProfileSettingsService.js rename to webapp/src/main/webapp/vue-apps/common/js/ProfileSettingsService.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/js/SettingService.js b/webapp/src/main/webapp/vue-apps/common/js/SettingService.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/js/SettingService.js rename to webapp/src/main/webapp/vue-apps/common/js/SettingService.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/js/SiteService.js b/webapp/src/main/webapp/vue-apps/common/js/SiteService.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/js/SiteService.js rename to webapp/src/main/webapp/vue-apps/common/js/SiteService.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/js/SpaceService.js b/webapp/src/main/webapp/vue-apps/common/js/SpaceService.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/js/SpaceService.js rename to webapp/src/main/webapp/vue-apps/common/js/SpaceService.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/js/SuggesterService.js b/webapp/src/main/webapp/vue-apps/common/js/SuggesterService.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/js/SuggesterService.js rename to webapp/src/main/webapp/vue-apps/common/js/SuggesterService.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/js/TagService.js b/webapp/src/main/webapp/vue-apps/common/js/TagService.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/js/TagService.js rename to webapp/src/main/webapp/vue-apps/common/js/TagService.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/js/UploadService.js b/webapp/src/main/webapp/vue-apps/common/js/UploadService.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/js/UploadService.js rename to webapp/src/main/webapp/vue-apps/common/js/UploadService.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/js/UserService.js b/webapp/src/main/webapp/vue-apps/common/js/UserService.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/js/UserService.js rename to webapp/src/main/webapp/vue-apps/common/js/UserService.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/js/Utils.js b/webapp/src/main/webapp/vue-apps/common/js/Utils.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/js/Utils.js rename to webapp/src/main/webapp/vue-apps/common/js/Utils.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/js/WebSocket.js b/webapp/src/main/webapp/vue-apps/common/js/WebSocket.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/js/WebSocket.js rename to webapp/src/main/webapp/vue-apps/common/js/WebSocket.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/js/brandingService.js b/webapp/src/main/webapp/vue-apps/common/js/brandingService.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/js/brandingService.js rename to webapp/src/main/webapp/vue-apps/common/js/brandingService.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/js/spacesConstants.js b/webapp/src/main/webapp/vue-apps/common/js/spacesConstants.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/common/js/spacesConstants.js rename to webapp/src/main/webapp/vue-apps/common/js/spacesConstants.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/common/main.js b/webapp/src/main/webapp/vue-apps/common/main.js similarity index 94% rename from webapp/portlet/src/main/webapp/vue-apps/common/main.js rename to webapp/src/main/webapp/vue-apps/common/main.js index 803c66e3909..b95f9eabd94 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/common/main.js +++ b/webapp/src/main/webapp/vue-apps/common/main.js @@ -116,12 +116,12 @@ if (eXo.env.portal.userIdentityId) { const lang = typeof eXo !== 'undefined' ? eXo.env.portal.language : 'en'; const urls = [ - `/social-portlet/i18n/locale.portlet.Portlets?lang=${lang}`, - `/social-portlet/i18n/locale.social.Webui?lang=${lang}`, - `/social-portlet/i18n/locale.commons.Commons?lang=${lang}`, - `/social-portlet/i18n/locale.portlet.social.UserPopup?lang=${lang}`, - `/social-portlet/i18n/locale.portlet.social.SpacesListApplication?lang=${lang}`, - `/social-portlet/i18n/locale.portal?lang=${lang}`, + `/social/i18n/locale.portlet.Portlets?lang=${lang}`, + `/social/i18n/locale.social.Webui?lang=${lang}`, + `/social/i18n/locale.commons.Commons?lang=${lang}`, + `/social/i18n/locale.portlet.social.UserPopup?lang=${lang}`, + `/social/i18n/locale.portlet.social.SpacesListApplication?lang=${lang}`, + `/social/i18n/locale.portal?lang=${lang}`, ]; if (!window.drawersOverlayInitialized) { diff --git a/webapp/portlet/src/main/webapp/vue-apps/complementary-filter/components/ComplementaryFilter.vue b/webapp/src/main/webapp/vue-apps/complementary-filter/components/ComplementaryFilter.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/complementary-filter/components/ComplementaryFilter.vue rename to webapp/src/main/webapp/vue-apps/complementary-filter/components/ComplementaryFilter.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/complementary-filter/components/ComplementaryFilterItem.vue b/webapp/src/main/webapp/vue-apps/complementary-filter/components/ComplementaryFilterItem.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/complementary-filter/components/ComplementaryFilterItem.vue rename to webapp/src/main/webapp/vue-apps/complementary-filter/components/ComplementaryFilterItem.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/complementary-filter/components/ComplementaryFilterItemsDrawer.vue b/webapp/src/main/webapp/vue-apps/complementary-filter/components/ComplementaryFilterItemsDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/complementary-filter/components/ComplementaryFilterItemsDrawer.vue rename to webapp/src/main/webapp/vue-apps/complementary-filter/components/ComplementaryFilterItemsDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/complementary-filter/initComponents.js b/webapp/src/main/webapp/vue-apps/complementary-filter/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/complementary-filter/initComponents.js rename to webapp/src/main/webapp/vue-apps/complementary-filter/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/complementary-filter/js/ComplementaryFilterService.js b/webapp/src/main/webapp/vue-apps/complementary-filter/js/ComplementaryFilterService.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/complementary-filter/js/ComplementaryFilterService.js rename to webapp/src/main/webapp/vue-apps/complementary-filter/js/ComplementaryFilterService.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/complementary-filter/main.js b/webapp/src/main/webapp/vue-apps/complementary-filter/main.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/complementary-filter/main.js rename to webapp/src/main/webapp/vue-apps/complementary-filter/main.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/component-image-crop/components/ImageCropDrawer.vue b/webapp/src/main/webapp/vue-apps/component-image-crop/components/ImageCropDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/component-image-crop/components/ImageCropDrawer.vue rename to webapp/src/main/webapp/vue-apps/component-image-crop/components/ImageCropDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/component-image-crop/initComponents.js b/webapp/src/main/webapp/vue-apps/component-image-crop/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/component-image-crop/initComponents.js rename to webapp/src/main/webapp/vue-apps/component-image-crop/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/component-image-crop/main.js b/webapp/src/main/webapp/vue-apps/component-image-crop/main.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/component-image-crop/main.js rename to webapp/src/main/webapp/vue-apps/component-image-crop/main.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/component-translation-field/components/TranslationDrawer.vue b/webapp/src/main/webapp/vue-apps/component-translation-field/components/TranslationDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/component-translation-field/components/TranslationDrawer.vue rename to webapp/src/main/webapp/vue-apps/component-translation-field/components/TranslationDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/component-translation-field/components/TranslationTextField.vue b/webapp/src/main/webapp/vue-apps/component-translation-field/components/TranslationTextField.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/component-translation-field/components/TranslationTextField.vue rename to webapp/src/main/webapp/vue-apps/component-translation-field/components/TranslationTextField.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/component-translation-field/initComponents.js b/webapp/src/main/webapp/vue-apps/component-translation-field/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/component-translation-field/initComponents.js rename to webapp/src/main/webapp/vue-apps/component-translation-field/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/component-translation-field/js/TranslationService.js b/webapp/src/main/webapp/vue-apps/component-translation-field/js/TranslationService.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/component-translation-field/js/TranslationService.js rename to webapp/src/main/webapp/vue-apps/component-translation-field/js/TranslationService.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/component-translation-field/main.js b/webapp/src/main/webapp/vue-apps/component-translation-field/main.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/component-translation-field/main.js rename to webapp/src/main/webapp/vue-apps/component-translation-field/main.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/external-spaces-list/components/ExternalSpaceItem.vue b/webapp/src/main/webapp/vue-apps/external-spaces-list/components/ExternalSpaceItem.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/external-spaces-list/components/ExternalSpaceItem.vue rename to webapp/src/main/webapp/vue-apps/external-spaces-list/components/ExternalSpaceItem.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/external-spaces-list/components/ExternalSpacesList.vue b/webapp/src/main/webapp/vue-apps/external-spaces-list/components/ExternalSpacesList.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/external-spaces-list/components/ExternalSpacesList.vue rename to webapp/src/main/webapp/vue-apps/external-spaces-list/components/ExternalSpacesList.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/external-spaces-list/components/ExternalSpacesRequestsItems.vue b/webapp/src/main/webapp/vue-apps/external-spaces-list/components/ExternalSpacesRequestsItems.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/external-spaces-list/components/ExternalSpacesRequestsItems.vue rename to webapp/src/main/webapp/vue-apps/external-spaces-list/components/ExternalSpacesRequestsItems.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/external-spaces-list/initComponents.js b/webapp/src/main/webapp/vue-apps/external-spaces-list/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/external-spaces-list/initComponents.js rename to webapp/src/main/webapp/vue-apps/external-spaces-list/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/external-spaces-list/main.js b/webapp/src/main/webapp/vue-apps/external-spaces-list/main.js similarity index 91% rename from webapp/portlet/src/main/webapp/vue-apps/external-spaces-list/main.js rename to webapp/src/main/webapp/vue-apps/external-spaces-list/main.js index fa30b1625a2..b03ab7afdb1 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/external-spaces-list/main.js +++ b/webapp/src/main/webapp/vue-apps/external-spaces-list/main.js @@ -4,7 +4,7 @@ import './initComponents.js'; const lang = typeof eXo !== 'undefined' ? eXo.env.portal.language : 'en'; // should expose the locale ressources as REST API -const url = `/social-portlet/i18n/locale.portlet.social.ExternalSpacesListApplication?lang=${lang}`; +const url = `/social/i18n/locale.portlet.social.ExternalSpacesListApplication?lang=${lang}`; // get overrided components if exists diff --git a/webapp/portlet/src/main/webapp/vue-apps/favorites-list-top-bar/components/ActivityFavoriteItem.vue b/webapp/src/main/webapp/vue-apps/favorites-list-top-bar/components/ActivityFavoriteItem.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/favorites-list-top-bar/components/ActivityFavoriteItem.vue rename to webapp/src/main/webapp/vue-apps/favorites-list-top-bar/components/ActivityFavoriteItem.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/favorites-list-top-bar/components/FavoriteItem.vue b/webapp/src/main/webapp/vue-apps/favorites-list-top-bar/components/FavoriteItem.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/favorites-list-top-bar/components/FavoriteItem.vue rename to webapp/src/main/webapp/vue-apps/favorites-list-top-bar/components/FavoriteItem.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/favorites-list-top-bar/components/SpaceFavoriteItem.vue b/webapp/src/main/webapp/vue-apps/favorites-list-top-bar/components/SpaceFavoriteItem.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/favorites-list-top-bar/components/SpaceFavoriteItem.vue rename to webapp/src/main/webapp/vue-apps/favorites-list-top-bar/components/SpaceFavoriteItem.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/favorites-list-top-bar/components/TopBarFavorites.vue b/webapp/src/main/webapp/vue-apps/favorites-list-top-bar/components/TopBarFavorites.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/favorites-list-top-bar/components/TopBarFavorites.vue rename to webapp/src/main/webapp/vue-apps/favorites-list-top-bar/components/TopBarFavorites.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/favorites-list-top-bar/components/TopBarFavoritesButton.vue b/webapp/src/main/webapp/vue-apps/favorites-list-top-bar/components/TopBarFavoritesButton.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/favorites-list-top-bar/components/TopBarFavoritesButton.vue rename to webapp/src/main/webapp/vue-apps/favorites-list-top-bar/components/TopBarFavoritesButton.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/favorites-list-top-bar/components/TopBarFavoritesDrawer.vue b/webapp/src/main/webapp/vue-apps/favorites-list-top-bar/components/TopBarFavoritesDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/favorites-list-top-bar/components/TopBarFavoritesDrawer.vue rename to webapp/src/main/webapp/vue-apps/favorites-list-top-bar/components/TopBarFavoritesDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/favorites-list-top-bar/extensions.js b/webapp/src/main/webapp/vue-apps/favorites-list-top-bar/extensions.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/favorites-list-top-bar/extensions.js rename to webapp/src/main/webapp/vue-apps/favorites-list-top-bar/extensions.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/favorites-list-top-bar/initComponents.js b/webapp/src/main/webapp/vue-apps/favorites-list-top-bar/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/favorites-list-top-bar/initComponents.js rename to webapp/src/main/webapp/vue-apps/favorites-list-top-bar/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/favorites-list-top-bar/main.js b/webapp/src/main/webapp/vue-apps/favorites-list-top-bar/main.js similarity index 92% rename from webapp/portlet/src/main/webapp/vue-apps/favorites-list-top-bar/main.js rename to webapp/src/main/webapp/vue-apps/favorites-list-top-bar/main.js index 0459c899532..d361b1ec233 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/favorites-list-top-bar/main.js +++ b/webapp/src/main/webapp/vue-apps/favorites-list-top-bar/main.js @@ -12,7 +12,7 @@ if (extensionRegistry) { const appId = 'favoritesListPortlet'; const lang = eXo.env.portal.language; -const url = `/social-portlet/i18n/locale.portlet.Portlets?lang=${lang}`; +const url = `/social/i18n/locale.portlet.Portlets?lang=${lang}`; //getting locale ressources export function init() { diff --git a/webapp/portlet/src/main/webapp/vue-apps/general-settings/components/GeneralSettings.vue b/webapp/src/main/webapp/vue-apps/general-settings/components/GeneralSettings.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/general-settings/components/GeneralSettings.vue rename to webapp/src/main/webapp/vue-apps/general-settings/components/GeneralSettings.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/general-settings/components/branding/SiteBranding.vue b/webapp/src/main/webapp/vue-apps/general-settings/components/branding/SiteBranding.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/general-settings/components/branding/SiteBranding.vue rename to webapp/src/main/webapp/vue-apps/general-settings/components/branding/SiteBranding.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/general-settings/components/branding/SiteBrandingWindow.vue b/webapp/src/main/webapp/vue-apps/general-settings/components/branding/SiteBrandingWindow.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/general-settings/components/branding/SiteBrandingWindow.vue rename to webapp/src/main/webapp/vue-apps/general-settings/components/branding/SiteBrandingWindow.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/general-settings/components/branding/form/BackgroundImageAttachment.vue b/webapp/src/main/webapp/vue-apps/general-settings/components/branding/form/BackgroundImageAttachment.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/general-settings/components/branding/form/BackgroundImageAttachment.vue rename to webapp/src/main/webapp/vue-apps/general-settings/components/branding/form/BackgroundImageAttachment.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/general-settings/components/branding/form/BackgroundInput.vue b/webapp/src/main/webapp/vue-apps/general-settings/components/branding/form/BackgroundInput.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/general-settings/components/branding/form/BackgroundInput.vue rename to webapp/src/main/webapp/vue-apps/general-settings/components/branding/form/BackgroundInput.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/general-settings/components/branding/form/BorderRadiusSelector.vue b/webapp/src/main/webapp/vue-apps/general-settings/components/branding/form/BorderRadiusSelector.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/general-settings/components/branding/form/BorderRadiusSelector.vue rename to webapp/src/main/webapp/vue-apps/general-settings/components/branding/form/BorderRadiusSelector.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/general-settings/components/branding/form/ColorPicker.vue b/webapp/src/main/webapp/vue-apps/general-settings/components/branding/form/ColorPicker.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/general-settings/components/branding/form/ColorPicker.vue rename to webapp/src/main/webapp/vue-apps/general-settings/components/branding/form/ColorPicker.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/general-settings/components/branding/form/CompanyFavicon.vue b/webapp/src/main/webapp/vue-apps/general-settings/components/branding/form/CompanyFavicon.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/general-settings/components/branding/form/CompanyFavicon.vue rename to webapp/src/main/webapp/vue-apps/general-settings/components/branding/form/CompanyFavicon.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/general-settings/components/branding/form/CompanyLogo.vue b/webapp/src/main/webapp/vue-apps/general-settings/components/branding/form/CompanyLogo.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/general-settings/components/branding/form/CompanyLogo.vue rename to webapp/src/main/webapp/vue-apps/general-settings/components/branding/form/CompanyLogo.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/general-settings/components/branding/form/CustomStyleInput.vue b/webapp/src/main/webapp/vue-apps/general-settings/components/branding/form/CustomStyleInput.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/general-settings/components/branding/form/CustomStyleInput.vue rename to webapp/src/main/webapp/vue-apps/general-settings/components/branding/form/CustomStyleInput.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/general-settings/components/branding/form/LoginBackgroundSelector.vue b/webapp/src/main/webapp/vue-apps/general-settings/components/branding/form/LoginBackgroundSelector.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/general-settings/components/branding/form/LoginBackgroundSelector.vue rename to webapp/src/main/webapp/vue-apps/general-settings/components/branding/form/LoginBackgroundSelector.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/general-settings/components/branding/preview/SiteBrandingPreview.vue b/webapp/src/main/webapp/vue-apps/general-settings/components/branding/preview/SiteBrandingPreview.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/general-settings/components/branding/preview/SiteBrandingPreview.vue rename to webapp/src/main/webapp/vue-apps/general-settings/components/branding/preview/SiteBrandingPreview.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/general-settings/components/language/DefaultLanguageDrawer.vue b/webapp/src/main/webapp/vue-apps/general-settings/components/language/DefaultLanguageDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/general-settings/components/language/DefaultLanguageDrawer.vue rename to webapp/src/main/webapp/vue-apps/general-settings/components/language/DefaultLanguageDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/general-settings/components/login-page/LoginBranding.vue b/webapp/src/main/webapp/vue-apps/general-settings/components/login-page/LoginBranding.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/general-settings/components/login-page/LoginBranding.vue rename to webapp/src/main/webapp/vue-apps/general-settings/components/login-page/LoginBranding.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/general-settings/components/public-site/PublicSiteEditDrawer.vue b/webapp/src/main/webapp/vue-apps/general-settings/components/public-site/PublicSiteEditDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/general-settings/components/public-site/PublicSiteEditDrawer.vue rename to webapp/src/main/webapp/vue-apps/general-settings/components/public-site/PublicSiteEditDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/general-settings/components/registration/DefaultSpacesDrawer.vue b/webapp/src/main/webapp/vue-apps/general-settings/components/registration/DefaultSpacesDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/general-settings/components/registration/DefaultSpacesDrawer.vue rename to webapp/src/main/webapp/vue-apps/general-settings/components/registration/DefaultSpacesDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/general-settings/components/registration/HubAccess.vue b/webapp/src/main/webapp/vue-apps/general-settings/components/registration/HubAccess.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/general-settings/components/registration/HubAccess.vue rename to webapp/src/main/webapp/vue-apps/general-settings/components/registration/HubAccess.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/general-settings/initComponents.js b/webapp/src/main/webapp/vue-apps/general-settings/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/general-settings/initComponents.js rename to webapp/src/main/webapp/vue-apps/general-settings/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/general-settings/js/LanguageSettingService.js b/webapp/src/main/webapp/vue-apps/general-settings/js/LanguageSettingService.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/general-settings/js/LanguageSettingService.js rename to webapp/src/main/webapp/vue-apps/general-settings/js/LanguageSettingService.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/general-settings/js/RegistrationService.js b/webapp/src/main/webapp/vue-apps/general-settings/js/RegistrationService.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/general-settings/js/RegistrationService.js rename to webapp/src/main/webapp/vue-apps/general-settings/js/RegistrationService.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/general-settings/main.js b/webapp/src/main/webapp/vue-apps/general-settings/main.js similarity index 92% rename from webapp/portlet/src/main/webapp/vue-apps/general-settings/main.js rename to webapp/src/main/webapp/vue-apps/general-settings/main.js index 586bde38611..175f5c654ec 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/general-settings/main.js +++ b/webapp/src/main/webapp/vue-apps/general-settings/main.js @@ -32,10 +32,10 @@ const lang = window.eXo?.env?.portal?.language || 'en'; // Should expose the locale ressources as REST API const urls = [ - `/social-portlet/i18n/locale.portlet.Login?lang=${lang}`, - `/social-portlet/i18n/locale.portal.login?lang=${lang}`, - `/social-portlet/i18n/locale.portlet.Portlets?lang=${lang}`, - `/social-portlet/i18n/locale.portlet.GeneralSettings?lang=${lang}`, + `/social/i18n/locale.portlet.Login?lang=${lang}`, + `/social/i18n/locale.portal.login?lang=${lang}`, + `/social/i18n/locale.portlet.Portlets?lang=${lang}`, + `/social/i18n/locale.portlet.GeneralSettings?lang=${lang}`, ]; export function init(publicSiteVisible, publicSiteId) { diff --git a/webapp/portlet/src/main/webapp/vue-apps/general-settings/services.js b/webapp/src/main/webapp/vue-apps/general-settings/services.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/general-settings/services.js rename to webapp/src/main/webapp/vue-apps/general-settings/services.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/getting-started/main.js b/webapp/src/main/webapp/vue-apps/getting-started/main.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/getting-started/main.js rename to webapp/src/main/webapp/vue-apps/getting-started/main.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuNavigation.vue b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuNavigation.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuNavigation.vue rename to webapp/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuNavigation.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuNavigationButton.vue b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuNavigationButton.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuNavigationButton.vue rename to webapp/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuNavigationButton.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuNavigationFirstLevel.vue b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuNavigationFirstLevel.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuNavigationFirstLevel.vue rename to webapp/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuNavigationFirstLevel.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuNavigationSecondLevel.vue b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuNavigationSecondLevel.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuNavigationSecondLevel.vue rename to webapp/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuNavigationSecondLevel.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuNavigationThirdLevel.vue b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuNavigationThirdLevel.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuNavigationThirdLevel.vue rename to webapp/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuNavigationThirdLevel.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuParentDrawer.vue b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuParentDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuParentDrawer.vue rename to webapp/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuParentDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuParentSticky.vue b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuParentSticky.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuParentSticky.vue rename to webapp/src/main/webapp/vue-apps/hamburger-menu/components/HamburgerMenuParentSticky.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/profile/ProfileHamburgerNavigation.vue b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/profile/ProfileHamburgerNavigation.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/profile/ProfileHamburgerNavigation.vue rename to webapp/src/main/webapp/vue-apps/hamburger-menu/components/profile/ProfileHamburgerNavigation.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/RecentSpacesHamburgerNavigation.vue b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/RecentSpacesHamburgerNavigation.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/RecentSpacesHamburgerNavigation.vue rename to webapp/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/RecentSpacesHamburgerNavigation.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpaceHamburgerActionMenu.vue b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpaceHamburgerActionMenu.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpaceHamburgerActionMenu.vue rename to webapp/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpaceHamburgerActionMenu.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpaceNavigationItem.vue b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpaceNavigationItem.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpaceNavigationItem.vue rename to webapp/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpaceNavigationItem.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpacePanelHamburgerNavigation.vue b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpacePanelHamburgerNavigation.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpacePanelHamburgerNavigation.vue rename to webapp/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpacePanelHamburgerNavigation.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpacesHamburgerNavigation.vue b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpacesHamburgerNavigation.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpacesHamburgerNavigation.vue rename to webapp/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpacesHamburgerNavigation.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpacesNavigationContent.vue b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpacesNavigationContent.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpacesNavigationContent.vue rename to webapp/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpacesNavigationContent.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpacesNavigationEmpty.vue b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpacesNavigationEmpty.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpacesNavigationEmpty.vue rename to webapp/src/main/webapp/vue-apps/hamburger-menu/components/recent-spaces/SpacesNavigationEmpty.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/site/SiteHamburgerItem.vue b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/site/SiteHamburgerItem.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/site/SiteHamburgerItem.vue rename to webapp/src/main/webapp/vue-apps/hamburger-menu/components/site/SiteHamburgerItem.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/site/SiteHamburgerNavigation.vue b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/site/SiteHamburgerNavigation.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/site/SiteHamburgerNavigation.vue rename to webapp/src/main/webapp/vue-apps/hamburger-menu/components/site/SiteHamburgerNavigation.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/site/SitesHamburger.vue b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/site/SitesHamburger.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/site/SitesHamburger.vue rename to webapp/src/main/webapp/vue-apps/hamburger-menu/components/site/SitesHamburger.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/user/UserHamburgerNavigation.vue b/webapp/src/main/webapp/vue-apps/hamburger-menu/components/user/UserHamburgerNavigation.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/components/user/UserHamburgerNavigation.vue rename to webapp/src/main/webapp/vue-apps/hamburger-menu/components/user/UserHamburgerNavigation.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/extensions.js b/webapp/src/main/webapp/vue-apps/hamburger-menu/extensions.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/extensions.js rename to webapp/src/main/webapp/vue-apps/hamburger-menu/extensions.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/initComponents.js b/webapp/src/main/webapp/vue-apps/hamburger-menu/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/initComponents.js rename to webapp/src/main/webapp/vue-apps/hamburger-menu/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/main.js b/webapp/src/main/webapp/vue-apps/hamburger-menu/main.js similarity index 96% rename from webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/main.js rename to webapp/src/main/webapp/vue-apps/hamburger-menu/main.js index d513fdf84e7..c55a6f91938 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/hamburger-menu/main.js +++ b/webapp/src/main/webapp/vue-apps/hamburger-menu/main.js @@ -32,7 +32,7 @@ if (extensionRegistry) { Vuetify.prototype.preset = eXo.env.portal.vuetifyPreset; const lang = eXo && eXo.env && eXo.env.portal && eXo.env.portal.language || 'en'; -const url = `/social-portlet/i18n/locale.portal.HamburgerMenu?lang=${lang}`; +const url = `/social/i18n/locale.portal.HamburgerMenu?lang=${lang}`; document.dispatchEvent(new CustomEvent('displayTopBarLoading')); diff --git a/webapp/portlet/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagement.vue b/webapp/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagement.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagement.vue rename to webapp/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagement.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementFormDrawer.vue b/webapp/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementFormDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementFormDrawer.vue rename to webapp/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementFormDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementMembershipFormDrawer.vue b/webapp/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementMembershipFormDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementMembershipFormDrawer.vue rename to webapp/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementMembershipFormDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementMembershipList.vue b/webapp/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementMembershipList.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementMembershipList.vue rename to webapp/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementMembershipList.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementMembershipToolbar.vue b/webapp/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementMembershipToolbar.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementMembershipToolbar.vue rename to webapp/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementMembershipToolbar.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementTree.vue b/webapp/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementTree.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementTree.vue rename to webapp/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementTree.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementTreeGroupMenu.vue b/webapp/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementTreeGroupMenu.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementTreeGroupMenu.vue rename to webapp/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementTreeGroupMenu.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementTreeItem.vue b/webapp/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementTreeItem.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementTreeItem.vue rename to webapp/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementTreeItem.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementTreeToolbar.vue b/webapp/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementTreeToolbar.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementTreeToolbar.vue rename to webapp/src/main/webapp/vue-apps/idm-groups-management/components/GroupsManagementTreeToolbar.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/idm-groups-management/initComponents.js b/webapp/src/main/webapp/vue-apps/idm-groups-management/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/idm-groups-management/initComponents.js rename to webapp/src/main/webapp/vue-apps/idm-groups-management/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/idm-groups-management/main.js b/webapp/src/main/webapp/vue-apps/idm-groups-management/main.js similarity index 93% rename from webapp/portlet/src/main/webapp/vue-apps/idm-groups-management/main.js rename to webapp/src/main/webapp/vue-apps/idm-groups-management/main.js index 1b81197a8db..67255b748f7 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/idm-groups-management/main.js +++ b/webapp/src/main/webapp/vue-apps/idm-groups-management/main.js @@ -18,7 +18,7 @@ document.dispatchEvent(new CustomEvent('displayTopBarLoading')); const appId = 'GroupsManagement'; //should expose the locale ressources as REST API -const url = `/social-portlet/i18n/locale.portlet.Portlets?lang=${lang}`; +const url = `/social/i18n/locale.portlet.Portlets?lang=${lang}`; export function init() { exoi18n.loadLanguageAsync(lang, url).then(i18n => { diff --git a/webapp/portlet/src/main/webapp/vue-apps/idm-membership-types-management/components/MembershipTypesManagement.vue b/webapp/src/main/webapp/vue-apps/idm-membership-types-management/components/MembershipTypesManagement.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/idm-membership-types-management/components/MembershipTypesManagement.vue rename to webapp/src/main/webapp/vue-apps/idm-membership-types-management/components/MembershipTypesManagement.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/idm-membership-types-management/components/MembershipTypesManagementFormDrawer.vue b/webapp/src/main/webapp/vue-apps/idm-membership-types-management/components/MembershipTypesManagementFormDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/idm-membership-types-management/components/MembershipTypesManagementFormDrawer.vue rename to webapp/src/main/webapp/vue-apps/idm-membership-types-management/components/MembershipTypesManagementFormDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/idm-membership-types-management/components/MembershipTypesManagementList.vue b/webapp/src/main/webapp/vue-apps/idm-membership-types-management/components/MembershipTypesManagementList.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/idm-membership-types-management/components/MembershipTypesManagementList.vue rename to webapp/src/main/webapp/vue-apps/idm-membership-types-management/components/MembershipTypesManagementList.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/idm-membership-types-management/components/MembershipTypesManagementToolbar.vue b/webapp/src/main/webapp/vue-apps/idm-membership-types-management/components/MembershipTypesManagementToolbar.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/idm-membership-types-management/components/MembershipTypesManagementToolbar.vue rename to webapp/src/main/webapp/vue-apps/idm-membership-types-management/components/MembershipTypesManagementToolbar.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/idm-membership-types-management/initComponents.js b/webapp/src/main/webapp/vue-apps/idm-membership-types-management/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/idm-membership-types-management/initComponents.js rename to webapp/src/main/webapp/vue-apps/idm-membership-types-management/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/idm-membership-types-management/main.js b/webapp/src/main/webapp/vue-apps/idm-membership-types-management/main.js similarity index 93% rename from webapp/portlet/src/main/webapp/vue-apps/idm-membership-types-management/main.js rename to webapp/src/main/webapp/vue-apps/idm-membership-types-management/main.js index b004f42798b..bce09b16842 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/idm-membership-types-management/main.js +++ b/webapp/src/main/webapp/vue-apps/idm-membership-types-management/main.js @@ -18,7 +18,7 @@ const appId = 'MembershipTypesManagement'; const lang = typeof eXo !== 'undefined' ? eXo.env.portal.language : 'en'; //should expose the locale ressources as REST API -const url = `/social-portlet/i18n/locale.portlet.Portlets?lang=${lang}`; +const url = `/social/i18n/locale.portlet.Portlets?lang=${lang}`; export function init() { exoi18n.loadLanguageAsync(lang, url).then(i18n => { diff --git a/webapp/portlet/src/main/webapp/vue-apps/idm-users-management/components/UsersManagement.vue b/webapp/src/main/webapp/vue-apps/idm-users-management/components/UsersManagement.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/idm-users-management/components/UsersManagement.vue rename to webapp/src/main/webapp/vue-apps/idm-users-management/components/UsersManagement.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementFilterDrawer.vue b/webapp/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementFilterDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementFilterDrawer.vue rename to webapp/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementFilterDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementImportCSVButton.vue b/webapp/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementImportCSVButton.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementImportCSVButton.vue rename to webapp/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementImportCSVButton.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementImportCSVErrorMessage.vue b/webapp/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementImportCSVErrorMessage.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementImportCSVErrorMessage.vue rename to webapp/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementImportCSVErrorMessage.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementImportCSVResult.vue b/webapp/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementImportCSVResult.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementImportCSVResult.vue rename to webapp/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementImportCSVResult.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementList.vue b/webapp/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementList.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementList.vue rename to webapp/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementList.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementToolbar.vue b/webapp/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementToolbar.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementToolbar.vue rename to webapp/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementToolbar.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementUserFormDrawer.vue b/webapp/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementUserFormDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementUserFormDrawer.vue rename to webapp/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementUserFormDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementUserMembershipDrawer.vue b/webapp/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementUserMembershipDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementUserMembershipDrawer.vue rename to webapp/src/main/webapp/vue-apps/idm-users-management/components/UsersManagementUserMembershipDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/idm-users-management/initComponents.js b/webapp/src/main/webapp/vue-apps/idm-users-management/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/idm-users-management/initComponents.js rename to webapp/src/main/webapp/vue-apps/idm-users-management/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/idm-users-management/main.js b/webapp/src/main/webapp/vue-apps/idm-users-management/main.js similarity index 93% rename from webapp/portlet/src/main/webapp/vue-apps/idm-users-management/main.js rename to webapp/src/main/webapp/vue-apps/idm-users-management/main.js index 5d644f1fa89..53a8bb63ffd 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/idm-users-management/main.js +++ b/webapp/src/main/webapp/vue-apps/idm-users-management/main.js @@ -18,7 +18,7 @@ const appId = 'UsersManagement'; const lang = typeof eXo !== 'undefined' ? eXo.env.portal.language : 'en'; //should expose the locale ressources as REST API -const url = `/social-portlet/i18n/locale.portlet.Portlets?lang=${lang}`; +const url = `/social/i18n/locale.portlet.Portlets?lang=${lang}`; export function init() { exoi18n.loadLanguageAsync(lang, url).then(i18n => { diff --git a/webapp/portlet/src/main/webapp/vue-apps/image/components/ImageApp.vue b/webapp/src/main/webapp/vue-apps/image/components/ImageApp.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/image/components/ImageApp.vue rename to webapp/src/main/webapp/vue-apps/image/components/ImageApp.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/image/components/settings/ImageSettingsDrawer.vue b/webapp/src/main/webapp/vue-apps/image/components/settings/ImageSettingsDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/image/components/settings/ImageSettingsDrawer.vue rename to webapp/src/main/webapp/vue-apps/image/components/settings/ImageSettingsDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/image/components/settings/ImageSettingsHeader.vue b/webapp/src/main/webapp/vue-apps/image/components/settings/ImageSettingsHeader.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/image/components/settings/ImageSettingsHeader.vue rename to webapp/src/main/webapp/vue-apps/image/components/settings/ImageSettingsHeader.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/image/components/view/ImageView.vue b/webapp/src/main/webapp/vue-apps/image/components/view/ImageView.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/image/components/view/ImageView.vue rename to webapp/src/main/webapp/vue-apps/image/components/view/ImageView.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/image/initComponents.js b/webapp/src/main/webapp/vue-apps/image/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/image/initComponents.js rename to webapp/src/main/webapp/vue-apps/image/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/image/main.js b/webapp/src/main/webapp/vue-apps/image/main.js similarity index 98% rename from webapp/portlet/src/main/webapp/vue-apps/image/main.js rename to webapp/src/main/webapp/vue-apps/image/main.js index b5ff8f7a171..42c8339397d 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/image/main.js +++ b/webapp/src/main/webapp/vue-apps/image/main.js @@ -29,7 +29,7 @@ if (extensionRegistry) { } const lang = eXo.env.portal.language; -const url = `/social-portlet/i18n/locale.portlet.Image?lang=${lang}`; +const url = `/social/i18n/locale.portlet.Image?lang=${lang}`; export function init(appId, name, canEdit, files) { exoi18n.loadLanguageAsync(lang, url) diff --git a/webapp/portlet/src/main/webapp/vue-apps/links/components/LinksApp.vue b/webapp/src/main/webapp/vue-apps/links/components/LinksApp.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/links/components/LinksApp.vue rename to webapp/src/main/webapp/vue-apps/links/components/LinksApp.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/links/components/settings/LinkDisplayPreview.vue b/webapp/src/main/webapp/vue-apps/links/components/settings/LinkDisplayPreview.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/links/components/settings/LinkDisplayPreview.vue rename to webapp/src/main/webapp/vue-apps/links/components/settings/LinkDisplayPreview.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/links/components/settings/LinkFormDrawer.vue b/webapp/src/main/webapp/vue-apps/links/components/settings/LinkFormDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/links/components/settings/LinkFormDrawer.vue rename to webapp/src/main/webapp/vue-apps/links/components/settings/LinkFormDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/links/components/settings/LinkIconInput.vue b/webapp/src/main/webapp/vue-apps/links/components/settings/LinkIconInput.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/links/components/settings/LinkIconInput.vue rename to webapp/src/main/webapp/vue-apps/links/components/settings/LinkIconInput.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/links/components/settings/LinkInput.vue b/webapp/src/main/webapp/vue-apps/links/components/settings/LinkInput.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/links/components/settings/LinkInput.vue rename to webapp/src/main/webapp/vue-apps/links/components/settings/LinkInput.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/links/components/settings/LinkSettingsDrawer.vue b/webapp/src/main/webapp/vue-apps/links/components/settings/LinkSettingsDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/links/components/settings/LinkSettingsDrawer.vue rename to webapp/src/main/webapp/vue-apps/links/components/settings/LinkSettingsDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/links/components/view/LinksCard.vue b/webapp/src/main/webapp/vue-apps/links/components/view/LinksCard.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/links/components/view/LinksCard.vue rename to webapp/src/main/webapp/vue-apps/links/components/view/LinksCard.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/links/components/view/LinksColumn.vue b/webapp/src/main/webapp/vue-apps/links/components/view/LinksColumn.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/links/components/view/LinksColumn.vue rename to webapp/src/main/webapp/vue-apps/links/components/view/LinksColumn.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/links/components/view/LinksHeader.vue b/webapp/src/main/webapp/vue-apps/links/components/view/LinksHeader.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/links/components/view/LinksHeader.vue rename to webapp/src/main/webapp/vue-apps/links/components/view/LinksHeader.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/links/components/view/LinksIcon.vue b/webapp/src/main/webapp/vue-apps/links/components/view/LinksIcon.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/links/components/view/LinksIcon.vue rename to webapp/src/main/webapp/vue-apps/links/components/view/LinksIcon.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/links/components/view/LinksList.vue b/webapp/src/main/webapp/vue-apps/links/components/view/LinksList.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/links/components/view/LinksList.vue rename to webapp/src/main/webapp/vue-apps/links/components/view/LinksList.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/links/initComponents.js b/webapp/src/main/webapp/vue-apps/links/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/links/initComponents.js rename to webapp/src/main/webapp/vue-apps/links/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/links/js/LinkService.js b/webapp/src/main/webapp/vue-apps/links/js/LinkService.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/links/js/LinkService.js rename to webapp/src/main/webapp/vue-apps/links/js/LinkService.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/links/main.js b/webapp/src/main/webapp/vue-apps/links/main.js similarity index 97% rename from webapp/portlet/src/main/webapp/vue-apps/links/main.js rename to webapp/src/main/webapp/vue-apps/links/main.js index fe04bf6483f..8eb22b2a037 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/links/main.js +++ b/webapp/src/main/webapp/vue-apps/links/main.js @@ -30,7 +30,7 @@ if (extensionRegistry) { } const lang = eXo.env.portal.language; -const url = `/social-portlet/i18n/locale.portlet.Links?lang=${lang}`; +const url = `/social/i18n/locale.portlet.Links?lang=${lang}`; export function init(appId, name, canEdit) { exoi18n.loadLanguageAsync(lang, url) diff --git a/webapp/portlet/src/main/webapp/vue-apps/links/services.js b/webapp/src/main/webapp/vue-apps/links/services.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/links/services.js rename to webapp/src/main/webapp/vue-apps/links/services.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/login-common/components/BrandingImage.vue b/webapp/src/main/webapp/vue-apps/login-common/components/BrandingImage.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/login-common/components/BrandingImage.vue rename to webapp/src/main/webapp/vue-apps/login-common/components/BrandingImage.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/login-common/components/Introduction.vue b/webapp/src/main/webapp/vue-apps/login-common/components/Introduction.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/login-common/components/Introduction.vue rename to webapp/src/main/webapp/vue-apps/login-common/components/Introduction.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/login-common/components/PageTemplate.vue b/webapp/src/main/webapp/vue-apps/login-common/components/PageTemplate.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/login-common/components/PageTemplate.vue rename to webapp/src/main/webapp/vue-apps/login-common/components/PageTemplate.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/login-common/initComponents.js b/webapp/src/main/webapp/vue-apps/login-common/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/login-common/initComponents.js rename to webapp/src/main/webapp/vue-apps/login-common/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/login-common/main.js b/webapp/src/main/webapp/vue-apps/login-common/main.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/login-common/main.js rename to webapp/src/main/webapp/vue-apps/login-common/main.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/login-external-onboarding/components/ExternalOnboarding.vue b/webapp/src/main/webapp/vue-apps/login-external-onboarding/components/ExternalOnboarding.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/login-external-onboarding/components/ExternalOnboarding.vue rename to webapp/src/main/webapp/vue-apps/login-external-onboarding/components/ExternalOnboarding.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/login-external-onboarding/components/ExternalOnboardingAlreadyAuthenticated.vue b/webapp/src/main/webapp/vue-apps/login-external-onboarding/components/ExternalOnboardingAlreadyAuthenticated.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/login-external-onboarding/components/ExternalOnboardingAlreadyAuthenticated.vue rename to webapp/src/main/webapp/vue-apps/login-external-onboarding/components/ExternalOnboardingAlreadyAuthenticated.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/login-external-onboarding/components/ExternalOnboardingCreateUserForm.vue b/webapp/src/main/webapp/vue-apps/login-external-onboarding/components/ExternalOnboardingCreateUserForm.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/login-external-onboarding/components/ExternalOnboardingCreateUserForm.vue rename to webapp/src/main/webapp/vue-apps/login-external-onboarding/components/ExternalOnboardingCreateUserForm.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/login-external-onboarding/components/ExternalOnboardingExpired.vue b/webapp/src/main/webapp/vue-apps/login-external-onboarding/components/ExternalOnboardingExpired.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/login-external-onboarding/components/ExternalOnboardingExpired.vue rename to webapp/src/main/webapp/vue-apps/login-external-onboarding/components/ExternalOnboardingExpired.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/login-external-onboarding/components/ExternalOnboardingMain.vue b/webapp/src/main/webapp/vue-apps/login-external-onboarding/components/ExternalOnboardingMain.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/login-external-onboarding/components/ExternalOnboardingMain.vue rename to webapp/src/main/webapp/vue-apps/login-external-onboarding/components/ExternalOnboardingMain.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/login-external-onboarding/initComponents.js b/webapp/src/main/webapp/vue-apps/login-external-onboarding/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/login-external-onboarding/initComponents.js rename to webapp/src/main/webapp/vue-apps/login-external-onboarding/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/login-external-onboarding/main.js b/webapp/src/main/webapp/vue-apps/login-external-onboarding/main.js similarity index 93% rename from webapp/portlet/src/main/webapp/vue-apps/login-external-onboarding/main.js rename to webapp/src/main/webapp/vue-apps/login-external-onboarding/main.js index a90deb665ce..aba2ac8a50b 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/login-external-onboarding/main.js +++ b/webapp/src/main/webapp/vue-apps/login-external-onboarding/main.js @@ -33,8 +33,8 @@ const lang = typeof eXo !== 'undefined' ? eXo.env.portal.language : 'en'; //should expose the locale ressources as REST API const urls = [ - `/social-portlet/i18n/locale.portlet.Login?lang=${lang}`, - `/social-portlet/i18n/locale.portal.login?lang=${lang}` + `/social/i18n/locale.portlet.Login?lang=${lang}`, + `/social/i18n/locale.portal.login?lang=${lang}` ]; export function init(params) { diff --git a/webapp/portlet/src/main/webapp/vue-apps/login-forgot-password/components/ForgotPassword.vue b/webapp/src/main/webapp/vue-apps/login-forgot-password/components/ForgotPassword.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/login-forgot-password/components/ForgotPassword.vue rename to webapp/src/main/webapp/vue-apps/login-forgot-password/components/ForgotPassword.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/login-forgot-password/components/ForgotPasswordEmailForm.vue b/webapp/src/main/webapp/vue-apps/login-forgot-password/components/ForgotPasswordEmailForm.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/login-forgot-password/components/ForgotPasswordEmailForm.vue rename to webapp/src/main/webapp/vue-apps/login-forgot-password/components/ForgotPasswordEmailForm.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/login-forgot-password/components/ForgotPasswordExpired.vue b/webapp/src/main/webapp/vue-apps/login-forgot-password/components/ForgotPasswordExpired.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/login-forgot-password/components/ForgotPasswordExpired.vue rename to webapp/src/main/webapp/vue-apps/login-forgot-password/components/ForgotPasswordExpired.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/login-forgot-password/components/ForgotPasswordMain.vue b/webapp/src/main/webapp/vue-apps/login-forgot-password/components/ForgotPasswordMain.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/login-forgot-password/components/ForgotPasswordMain.vue rename to webapp/src/main/webapp/vue-apps/login-forgot-password/components/ForgotPasswordMain.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/login-forgot-password/components/ForgotPasswordResetForm.vue b/webapp/src/main/webapp/vue-apps/login-forgot-password/components/ForgotPasswordResetForm.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/login-forgot-password/components/ForgotPasswordResetForm.vue rename to webapp/src/main/webapp/vue-apps/login-forgot-password/components/ForgotPasswordResetForm.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/login-forgot-password/initComponents.js b/webapp/src/main/webapp/vue-apps/login-forgot-password/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/login-forgot-password/initComponents.js rename to webapp/src/main/webapp/vue-apps/login-forgot-password/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/login-forgot-password/main.js b/webapp/src/main/webapp/vue-apps/login-forgot-password/main.js similarity index 93% rename from webapp/portlet/src/main/webapp/vue-apps/login-forgot-password/main.js rename to webapp/src/main/webapp/vue-apps/login-forgot-password/main.js index ee3bdb4049f..aa752e807b9 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/login-forgot-password/main.js +++ b/webapp/src/main/webapp/vue-apps/login-forgot-password/main.js @@ -33,8 +33,8 @@ const lang = typeof eXo !== 'undefined' ? eXo.env.portal.language : 'en'; //should expose the locale ressources as REST API const urls = [ - `/social-portlet/i18n/locale.portlet.Login?lang=${lang}`, - `/social-portlet/i18n/locale.portal.login?lang=${lang}` + `/social/i18n/locale.portlet.Login?lang=${lang}`, + `/social/i18n/locale.portal.login?lang=${lang}` ]; export function init(params) { diff --git a/webapp/portlet/src/main/webapp/vue-apps/login-internal-onboarding/components/InternalOnboarding.vue b/webapp/src/main/webapp/vue-apps/login-internal-onboarding/components/InternalOnboarding.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/login-internal-onboarding/components/InternalOnboarding.vue rename to webapp/src/main/webapp/vue-apps/login-internal-onboarding/components/InternalOnboarding.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/login-internal-onboarding/components/InternalOnboardingExpired.vue b/webapp/src/main/webapp/vue-apps/login-internal-onboarding/components/InternalOnboardingExpired.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/login-internal-onboarding/components/InternalOnboardingExpired.vue rename to webapp/src/main/webapp/vue-apps/login-internal-onboarding/components/InternalOnboardingExpired.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/login-internal-onboarding/components/InternalOnboardingMain.vue b/webapp/src/main/webapp/vue-apps/login-internal-onboarding/components/InternalOnboardingMain.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/login-internal-onboarding/components/InternalOnboardingMain.vue rename to webapp/src/main/webapp/vue-apps/login-internal-onboarding/components/InternalOnboardingMain.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/login-internal-onboarding/components/InternalOnboardingResetForm.vue b/webapp/src/main/webapp/vue-apps/login-internal-onboarding/components/InternalOnboardingResetForm.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/login-internal-onboarding/components/InternalOnboardingResetForm.vue rename to webapp/src/main/webapp/vue-apps/login-internal-onboarding/components/InternalOnboardingResetForm.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/login-internal-onboarding/initComponents.js b/webapp/src/main/webapp/vue-apps/login-internal-onboarding/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/login-internal-onboarding/initComponents.js rename to webapp/src/main/webapp/vue-apps/login-internal-onboarding/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/login-internal-onboarding/main.js b/webapp/src/main/webapp/vue-apps/login-internal-onboarding/main.js similarity index 93% rename from webapp/portlet/src/main/webapp/vue-apps/login-internal-onboarding/main.js rename to webapp/src/main/webapp/vue-apps/login-internal-onboarding/main.js index 9bcebc07d2a..0fca56c7bf5 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/login-internal-onboarding/main.js +++ b/webapp/src/main/webapp/vue-apps/login-internal-onboarding/main.js @@ -33,8 +33,8 @@ const lang = typeof eXo !== 'undefined' ? eXo.env.portal.language : 'en'; //should expose the locale ressources as REST API const urls = [ - `/social-portlet/i18n/locale.portlet.Login?lang=${lang}`, - `/social-portlet/i18n/locale.portal.login?lang=${lang}` + `/social/i18n/locale.portlet.Login?lang=${lang}`, + `/social/i18n/locale.portal.login?lang=${lang}` ]; export function init(params) { diff --git a/webapp/portlet/src/main/webapp/vue-apps/login/components/Login.vue b/webapp/src/main/webapp/vue-apps/login/components/Login.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/login/components/Login.vue rename to webapp/src/main/webapp/vue-apps/login/components/Login.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/login/components/LoginMain.vue b/webapp/src/main/webapp/vue-apps/login/components/LoginMain.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/login/components/LoginMain.vue rename to webapp/src/main/webapp/vue-apps/login/components/LoginMain.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/login/components/LoginMainBottomExtensions.vue b/webapp/src/main/webapp/vue-apps/login/components/LoginMainBottomExtensions.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/login/components/LoginMainBottomExtensions.vue rename to webapp/src/main/webapp/vue-apps/login/components/LoginMainBottomExtensions.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/login/components/LoginMainTopExtensions.vue b/webapp/src/main/webapp/vue-apps/login/components/LoginMainTopExtensions.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/login/components/LoginMainTopExtensions.vue rename to webapp/src/main/webapp/vue-apps/login/components/LoginMainTopExtensions.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/login/components/LoginSeparator.vue b/webapp/src/main/webapp/vue-apps/login/components/LoginSeparator.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/login/components/LoginSeparator.vue rename to webapp/src/main/webapp/vue-apps/login/components/LoginSeparator.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/login/components/provider/LoginProviderLink.vue b/webapp/src/main/webapp/vue-apps/login/components/provider/LoginProviderLink.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/login/components/provider/LoginProviderLink.vue rename to webapp/src/main/webapp/vue-apps/login/components/provider/LoginProviderLink.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/login/components/provider/LoginProviderMenuLink.vue b/webapp/src/main/webapp/vue-apps/login/components/provider/LoginProviderMenuLink.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/login/components/provider/LoginProviderMenuLink.vue rename to webapp/src/main/webapp/vue-apps/login/components/provider/LoginProviderMenuLink.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/login/components/provider/LoginProviders.vue b/webapp/src/main/webapp/vue-apps/login/components/provider/LoginProviders.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/login/components/provider/LoginProviders.vue rename to webapp/src/main/webapp/vue-apps/login/components/provider/LoginProviders.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/login/components/provider/LoginProvidersMenu.vue b/webapp/src/main/webapp/vue-apps/login/components/provider/LoginProvidersMenu.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/login/components/provider/LoginProvidersMenu.vue rename to webapp/src/main/webapp/vue-apps/login/components/provider/LoginProvidersMenu.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/login/initComponents.js b/webapp/src/main/webapp/vue-apps/login/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/login/initComponents.js rename to webapp/src/main/webapp/vue-apps/login/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/login/main.js b/webapp/src/main/webapp/vue-apps/login/main.js similarity index 93% rename from webapp/portlet/src/main/webapp/vue-apps/login/main.js rename to webapp/src/main/webapp/vue-apps/login/main.js index cbae2374018..96a06c71316 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/login/main.js +++ b/webapp/src/main/webapp/vue-apps/login/main.js @@ -33,8 +33,8 @@ const lang = typeof eXo !== 'undefined' ? eXo.env.portal.language : 'en'; //should expose the locale ressources as REST API const urls = [ - `/social-portlet/i18n/locale.portlet.Login?lang=${lang}`, - `/social-portlet/i18n/locale.portal.login?lang=${lang}` + `/social/i18n/locale.portlet.Login?lang=${lang}`, + `/social/i18n/locale.portal.login?lang=${lang}` ]; export function init(params) { diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-administration/components/NotificationAdministration.vue b/webapp/src/main/webapp/vue-apps/notification-administration/components/NotificationAdministration.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-administration/components/NotificationAdministration.vue rename to webapp/src/main/webapp/vue-apps/notification-administration/components/NotificationAdministration.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-administration/components/NotificationChannels.vue b/webapp/src/main/webapp/vue-apps/notification-administration/components/NotificationChannels.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-administration/components/NotificationChannels.vue rename to webapp/src/main/webapp/vue-apps/notification-administration/components/NotificationChannels.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-administration/components/NotificationContact.vue b/webapp/src/main/webapp/vue-apps/notification-administration/components/NotificationContact.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-administration/components/NotificationContact.vue rename to webapp/src/main/webapp/vue-apps/notification-administration/components/NotificationContact.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-administration/components/NotificationPlugins.vue b/webapp/src/main/webapp/vue-apps/notification-administration/components/NotificationPlugins.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-administration/components/NotificationPlugins.vue rename to webapp/src/main/webapp/vue-apps/notification-administration/components/NotificationPlugins.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-administration/components/contact/NotificationContactDrawer.vue b/webapp/src/main/webapp/vue-apps/notification-administration/components/contact/NotificationContactDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-administration/components/contact/NotificationContactDrawer.vue rename to webapp/src/main/webapp/vue-apps/notification-administration/components/contact/NotificationContactDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-administration/components/plugin/NotificationPlugin.vue b/webapp/src/main/webapp/vue-apps/notification-administration/components/plugin/NotificationPlugin.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-administration/components/plugin/NotificationPlugin.vue rename to webapp/src/main/webapp/vue-apps/notification-administration/components/plugin/NotificationPlugin.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-administration/components/plugin/NotificationPluginDrawer.vue b/webapp/src/main/webapp/vue-apps/notification-administration/components/plugin/NotificationPluginDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-administration/components/plugin/NotificationPluginDrawer.vue rename to webapp/src/main/webapp/vue-apps/notification-administration/components/plugin/NotificationPluginDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-administration/components/plugin/NotificationPluginGroup.vue b/webapp/src/main/webapp/vue-apps/notification-administration/components/plugin/NotificationPluginGroup.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-administration/components/plugin/NotificationPluginGroup.vue rename to webapp/src/main/webapp/vue-apps/notification-administration/components/plugin/NotificationPluginGroup.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-administration/initComponents.js b/webapp/src/main/webapp/vue-apps/notification-administration/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-administration/initComponents.js rename to webapp/src/main/webapp/vue-apps/notification-administration/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-administration/js/NotificationAdministration.js b/webapp/src/main/webapp/vue-apps/notification-administration/js/NotificationAdministration.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-administration/js/NotificationAdministration.js rename to webapp/src/main/webapp/vue-apps/notification-administration/js/NotificationAdministration.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-administration/main.js b/webapp/src/main/webapp/vue-apps/notification-administration/main.js similarity index 89% rename from webapp/portlet/src/main/webapp/vue-apps/notification-administration/main.js rename to webapp/src/main/webapp/vue-apps/notification-administration/main.js index e13dcaeb285..c91e4f3c531 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/notification-administration/main.js +++ b/webapp/src/main/webapp/vue-apps/notification-administration/main.js @@ -37,9 +37,9 @@ const lang = eXo && eXo.env.portal.language || 'en'; //should expose the locale ressources as REST API const urls = [ - `/social-portlet/i18n/locale.portlet.NotificationAdministration?lang=${lang}`, - `/social-portlet/i18n/locale.portlet.UserNotificationPortlet?lang=${lang}`, - `/social-portlet/i18n/locale.portlet.social.UserSettings?lang=${lang}`, + `/social/i18n/locale.portlet.NotificationAdministration?lang=${lang}`, + `/social/i18n/locale.portlet.UserNotificationPortlet?lang=${lang}`, + `/social/i18n/locale.portlet.social.UserSettings?lang=${lang}`, ]; const appId = 'NotificationAdministration'; diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-administration/services.js b/webapp/src/main/webapp/vue-apps/notification-administration/services.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-administration/services.js rename to webapp/src/main/webapp/vue-apps/notification-administration/services.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/HtmlNotification.vue b/webapp/src/main/webapp/vue-apps/notification-extensions/components/HtmlNotification.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/HtmlNotification.vue rename to webapp/src/main/webapp/vue-apps/notification-extensions/components/HtmlNotification.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/UserEmptyNotifications.vue b/webapp/src/main/webapp/vue-apps/notification-extensions/components/UserEmptyNotifications.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/UserEmptyNotifications.vue rename to webapp/src/main/webapp/vue-apps/notification-extensions/components/UserEmptyNotifications.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/UserNotification.vue b/webapp/src/main/webapp/vue-apps/notification-extensions/components/UserNotification.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/UserNotification.vue rename to webapp/src/main/webapp/vue-apps/notification-extensions/components/UserNotification.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/UserNotificationMenu.vue b/webapp/src/main/webapp/vue-apps/notification-extensions/components/UserNotificationMenu.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/UserNotificationMenu.vue rename to webapp/src/main/webapp/vue-apps/notification-extensions/components/UserNotificationMenu.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/UserNotificationTemplate.vue b/webapp/src/main/webapp/vue-apps/notification-extensions/components/UserNotificationTemplate.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/UserNotificationTemplate.vue rename to webapp/src/main/webapp/vue-apps/notification-extensions/components/UserNotificationTemplate.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/UserNotificationType.vue b/webapp/src/main/webapp/vue-apps/notification-extensions/components/UserNotificationType.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/UserNotificationType.vue rename to webapp/src/main/webapp/vue-apps/notification-extensions/components/UserNotificationType.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/UserNotificationTypes.vue b/webapp/src/main/webapp/vue-apps/notification-extensions/components/UserNotificationTypes.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/UserNotificationTypes.vue rename to webapp/src/main/webapp/vue-apps/notification-extensions/components/UserNotificationTypes.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/UserNotifications.vue b/webapp/src/main/webapp/vue-apps/notification-extensions/components/UserNotifications.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/UserNotifications.vue rename to webapp/src/main/webapp/vue-apps/notification-extensions/components/UserNotifications.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/UserNotificationsList.vue b/webapp/src/main/webapp/vue-apps/notification-extensions/components/UserNotificationsList.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/UserNotificationsList.vue rename to webapp/src/main/webapp/vue-apps/notification-extensions/components/UserNotificationsList.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/plugins/ActivityCommentPlugin.vue b/webapp/src/main/webapp/vue-apps/notification-extensions/components/plugins/ActivityCommentPlugin.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/plugins/ActivityCommentPlugin.vue rename to webapp/src/main/webapp/vue-apps/notification-extensions/components/plugins/ActivityCommentPlugin.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/plugins/ActivityMentionPlugin.vue b/webapp/src/main/webapp/vue-apps/notification-extensions/components/plugins/ActivityMentionPlugin.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/plugins/ActivityMentionPlugin.vue rename to webapp/src/main/webapp/vue-apps/notification-extensions/components/plugins/ActivityMentionPlugin.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/plugins/ActivityReplyToCommentPlugin.vue b/webapp/src/main/webapp/vue-apps/notification-extensions/components/plugins/ActivityReplyToCommentPlugin.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/plugins/ActivityReplyToCommentPlugin.vue rename to webapp/src/main/webapp/vue-apps/notification-extensions/components/plugins/ActivityReplyToCommentPlugin.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/plugins/EditActivityPlugin.vue b/webapp/src/main/webapp/vue-apps/notification-extensions/components/plugins/EditActivityPlugin.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/plugins/EditActivityPlugin.vue rename to webapp/src/main/webapp/vue-apps/notification-extensions/components/plugins/EditActivityPlugin.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/plugins/EditCommentPlugin.vue b/webapp/src/main/webapp/vue-apps/notification-extensions/components/plugins/EditCommentPlugin.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/plugins/EditCommentPlugin.vue rename to webapp/src/main/webapp/vue-apps/notification-extensions/components/plugins/EditCommentPlugin.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/plugins/LikeCommentPlugin.vue b/webapp/src/main/webapp/vue-apps/notification-extensions/components/plugins/LikeCommentPlugin.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/plugins/LikeCommentPlugin.vue rename to webapp/src/main/webapp/vue-apps/notification-extensions/components/plugins/LikeCommentPlugin.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/plugins/LikePlugin.vue b/webapp/src/main/webapp/vue-apps/notification-extensions/components/plugins/LikePlugin.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/plugins/LikePlugin.vue rename to webapp/src/main/webapp/vue-apps/notification-extensions/components/plugins/LikePlugin.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/plugins/NewUser.vue b/webapp/src/main/webapp/vue-apps/notification-extensions/components/plugins/NewUser.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/plugins/NewUser.vue rename to webapp/src/main/webapp/vue-apps/notification-extensions/components/plugins/NewUser.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/plugins/PostActivityPlugin.vue b/webapp/src/main/webapp/vue-apps/notification-extensions/components/plugins/PostActivityPlugin.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/plugins/PostActivityPlugin.vue rename to webapp/src/main/webapp/vue-apps/notification-extensions/components/plugins/PostActivityPlugin.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/plugins/PostActivitySpaceStreamPlugin.vue b/webapp/src/main/webapp/vue-apps/notification-extensions/components/plugins/PostActivitySpaceStreamPlugin.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/plugins/PostActivitySpaceStreamPlugin.vue rename to webapp/src/main/webapp/vue-apps/notification-extensions/components/plugins/PostActivitySpaceStreamPlugin.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/plugins/RelationshipReceivedRequestPlugin.vue b/webapp/src/main/webapp/vue-apps/notification-extensions/components/plugins/RelationshipReceivedRequestPlugin.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/plugins/RelationshipReceivedRequestPlugin.vue rename to webapp/src/main/webapp/vue-apps/notification-extensions/components/plugins/RelationshipReceivedRequestPlugin.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/plugins/RequestJoinSpacePlugin.vue b/webapp/src/main/webapp/vue-apps/notification-extensions/components/plugins/RequestJoinSpacePlugin.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/plugins/RequestJoinSpacePlugin.vue rename to webapp/src/main/webapp/vue-apps/notification-extensions/components/plugins/RequestJoinSpacePlugin.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/plugins/SharedActivitySpaceStreamPlugin.vue b/webapp/src/main/webapp/vue-apps/notification-extensions/components/plugins/SharedActivitySpaceStreamPlugin.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/plugins/SharedActivitySpaceStreamPlugin.vue rename to webapp/src/main/webapp/vue-apps/notification-extensions/components/plugins/SharedActivitySpaceStreamPlugin.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/plugins/SpaceInvitationPlugin.vue b/webapp/src/main/webapp/vue-apps/notification-extensions/components/plugins/SpaceInvitationPlugin.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/plugins/SpaceInvitationPlugin.vue rename to webapp/src/main/webapp/vue-apps/notification-extensions/components/plugins/SpaceInvitationPlugin.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/plugins/abstract/ActivityBasedPlugin.vue b/webapp/src/main/webapp/vue-apps/notification-extensions/components/plugins/abstract/ActivityBasedPlugin.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-extensions/components/plugins/abstract/ActivityBasedPlugin.vue rename to webapp/src/main/webapp/vue-apps/notification-extensions/components/plugins/abstract/ActivityBasedPlugin.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-extensions/extensions.js b/webapp/src/main/webapp/vue-apps/notification-extensions/extensions.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-extensions/extensions.js rename to webapp/src/main/webapp/vue-apps/notification-extensions/extensions.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-extensions/initComponents.js b/webapp/src/main/webapp/vue-apps/notification-extensions/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-extensions/initComponents.js rename to webapp/src/main/webapp/vue-apps/notification-extensions/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-extensions/js/NotificationService.js b/webapp/src/main/webapp/vue-apps/notification-extensions/js/NotificationService.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-extensions/js/NotificationService.js rename to webapp/src/main/webapp/vue-apps/notification-extensions/js/NotificationService.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-extensions/main.js b/webapp/src/main/webapp/vue-apps/notification-extensions/main.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-extensions/main.js rename to webapp/src/main/webapp/vue-apps/notification-extensions/main.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-extensions/services.js b/webapp/src/main/webapp/vue-apps/notification-extensions/services.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-extensions/services.js rename to webapp/src/main/webapp/vue-apps/notification-extensions/services.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-top-bar/components/TopBarNotification.vue b/webapp/src/main/webapp/vue-apps/notification-top-bar/components/TopBarNotification.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-top-bar/components/TopBarNotification.vue rename to webapp/src/main/webapp/vue-apps/notification-top-bar/components/TopBarNotification.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-top-bar/components/TopBarNotificationDrawer.vue b/webapp/src/main/webapp/vue-apps/notification-top-bar/components/TopBarNotificationDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-top-bar/components/TopBarNotificationDrawer.vue rename to webapp/src/main/webapp/vue-apps/notification-top-bar/components/TopBarNotificationDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-top-bar/initComponents.js b/webapp/src/main/webapp/vue-apps/notification-top-bar/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-top-bar/initComponents.js rename to webapp/src/main/webapp/vue-apps/notification-top-bar/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-top-bar/js/NotificationWebSocket.js b/webapp/src/main/webapp/vue-apps/notification-top-bar/js/NotificationWebSocket.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-top-bar/js/NotificationWebSocket.js rename to webapp/src/main/webapp/vue-apps/notification-top-bar/js/NotificationWebSocket.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-top-bar/main.js b/webapp/src/main/webapp/vue-apps/notification-top-bar/main.js similarity index 93% rename from webapp/portlet/src/main/webapp/vue-apps/notification-top-bar/main.js rename to webapp/src/main/webapp/vue-apps/notification-top-bar/main.js index cca5d70b88d..dbc611a4a00 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/notification-top-bar/main.js +++ b/webapp/src/main/webapp/vue-apps/notification-top-bar/main.js @@ -32,9 +32,9 @@ if (extensionRegistry) { const appId = 'NotificationPopoverPortlet'; const lang = eXo.env.portal.language; const urls = [ - `/social-portlet/i18n/locale.portlet.Portlets?lang=${lang}`, - `/social-portlet/i18n/locale.notification.template.Notification?lang=${lang}`, - `/social-portlet/i18n/locale.commons.Commons?lang=${lang}`, + `/social/i18n/locale.portlet.Portlets?lang=${lang}`, + `/social/i18n/locale.notification.template.Notification?lang=${lang}`, + `/social/i18n/locale.commons.Commons?lang=${lang}`, ]; //getting locale ressources diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-top-bar/services.js b/webapp/src/main/webapp/vue-apps/notification-top-bar/services.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-top-bar/services.js rename to webapp/src/main/webapp/vue-apps/notification-top-bar/services.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationChannel.vue b/webapp/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationChannel.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationChannel.vue rename to webapp/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationChannel.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationDrawer.vue b/webapp/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationDrawer.vue rename to webapp/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationGroup.vue b/webapp/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationGroup.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationGroup.vue rename to webapp/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationGroup.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationMuteSpacesDrawer.vue b/webapp/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationMuteSpacesDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationMuteSpacesDrawer.vue rename to webapp/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationMuteSpacesDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationPlugin.vue b/webapp/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationPlugin.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationPlugin.vue rename to webapp/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationPlugin.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotifications.vue b/webapp/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotifications.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotifications.vue rename to webapp/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotifications.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationsWindow.vue b/webapp/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationsWindow.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationsWindow.vue rename to webapp/src/main/webapp/vue-apps/notification-user-settings/components/UserSettingNotificationsWindow.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-user-settings/initComponents.js b/webapp/src/main/webapp/vue-apps/notification-user-settings/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/notification-user-settings/initComponents.js rename to webapp/src/main/webapp/vue-apps/notification-user-settings/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/notification-user-settings/main.js b/webapp/src/main/webapp/vue-apps/notification-user-settings/main.js similarity index 87% rename from webapp/portlet/src/main/webapp/vue-apps/notification-user-settings/main.js rename to webapp/src/main/webapp/vue-apps/notification-user-settings/main.js index 730f1281fec..7c61ee13ef0 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/notification-user-settings/main.js +++ b/webapp/src/main/webapp/vue-apps/notification-user-settings/main.js @@ -17,8 +17,8 @@ const lang = eXo && eXo.env.portal.language || 'en'; //should expose the locale ressources as REST API const urls = [ - `/social-portlet/i18n/locale.portlet.UserNotificationPortlet?lang=${lang}`, - `/social-portlet/i18n/locale.portlet.social.UserSettings?lang=${lang}` + `/social/i18n/locale.portlet.UserNotificationPortlet?lang=${lang}`, + `/social/i18n/locale.portlet.social.UserSettings?lang=${lang}` ]; const appId = 'UserSettingNotifications'; diff --git a/webapp/portlet/src/main/webapp/vue-apps/organizational-chart/components/OrganizationalChartApp.vue b/webapp/src/main/webapp/vue-apps/organizational-chart/components/OrganizationalChartApp.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/organizational-chart/components/OrganizationalChartApp.vue rename to webapp/src/main/webapp/vue-apps/organizational-chart/components/OrganizationalChartApp.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/organizational-chart/components/settings/OrganizationalChartSettingsDrawer.vue b/webapp/src/main/webapp/vue-apps/organizational-chart/components/settings/OrganizationalChartSettingsDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/organizational-chart/components/settings/OrganizationalChartSettingsDrawer.vue rename to webapp/src/main/webapp/vue-apps/organizational-chart/components/settings/OrganizationalChartSettingsDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/organizational-chart/components/view/ChartUserCompactCard.vue b/webapp/src/main/webapp/vue-apps/organizational-chart/components/view/ChartUserCompactCard.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/organizational-chart/components/view/ChartUserCompactCard.vue rename to webapp/src/main/webapp/vue-apps/organizational-chart/components/view/ChartUserCompactCard.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/organizational-chart/components/view/OrganizationalChart.vue b/webapp/src/main/webapp/vue-apps/organizational-chart/components/view/OrganizationalChart.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/organizational-chart/components/view/OrganizationalChart.vue rename to webapp/src/main/webapp/vue-apps/organizational-chart/components/view/OrganizationalChart.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/organizational-chart/components/view/OrganizationalChartHeader.vue b/webapp/src/main/webapp/vue-apps/organizational-chart/components/view/OrganizationalChartHeader.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/organizational-chart/components/view/OrganizationalChartHeader.vue rename to webapp/src/main/webapp/vue-apps/organizational-chart/components/view/OrganizationalChartHeader.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/organizational-chart/extensions/extensions.js b/webapp/src/main/webapp/vue-apps/organizational-chart/extensions/extensions.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/organizational-chart/extensions/extensions.js rename to webapp/src/main/webapp/vue-apps/organizational-chart/extensions/extensions.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/organizational-chart/extensions/main.js b/webapp/src/main/webapp/vue-apps/organizational-chart/extensions/main.js similarity index 90% rename from webapp/portlet/src/main/webapp/vue-apps/organizational-chart/extensions/main.js rename to webapp/src/main/webapp/vue-apps/organizational-chart/extensions/main.js index 2a1dc79035a..59d5d4e21df 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/organizational-chart/extensions/main.js +++ b/webapp/src/main/webapp/vue-apps/organizational-chart/extensions/main.js @@ -2,7 +2,7 @@ import {registerExtension} from './extensions.js'; const lang = eXo?.env?.portal?.language || 'en'; -const url = `/social-portlet/i18n/locale.portlet.Portlets?lang=${lang}`; +const url = `/social/i18n/locale.portlet.Portlets?lang=${lang}`; export function init() { if (!eXo?.env?.portal?.userIdentityId) { return; diff --git a/webapp/portlet/src/main/webapp/vue-apps/organizational-chart/initComponents.js b/webapp/src/main/webapp/vue-apps/organizational-chart/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/organizational-chart/initComponents.js rename to webapp/src/main/webapp/vue-apps/organizational-chart/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/organizational-chart/main.js b/webapp/src/main/webapp/vue-apps/organizational-chart/main.js similarity index 93% rename from webapp/portlet/src/main/webapp/vue-apps/organizational-chart/main.js rename to webapp/src/main/webapp/vue-apps/organizational-chart/main.js index 5fe085d30ea..ff3719e41c1 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/organizational-chart/main.js +++ b/webapp/src/main/webapp/vue-apps/organizational-chart/main.js @@ -36,8 +36,8 @@ document.dispatchEvent(new CustomEvent('displayTopBarLoading')); //getting language of user const lang = eXo?.env?.portal?.language || 'en'; const urls = [ - `/social-portlet/i18n/locale.portlet.Portlets?lang=${lang}`, - `/social-portlet/i18n/locale.portlet.social.PeopleListApplication?lang=${lang}` + `/social/i18n/locale.portlet.Portlets?lang=${lang}`, + `/social/i18n/locale.portlet.social.PeopleListApplication?lang=${lang}` ]; export function init(applicationId, settings) { diff --git a/webapp/portlet/src/main/webapp/vue-apps/page-not-found/components/PageNotFound.vue b/webapp/src/main/webapp/vue-apps/page-not-found/components/PageNotFound.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/page-not-found/components/PageNotFound.vue rename to webapp/src/main/webapp/vue-apps/page-not-found/components/PageNotFound.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/page-not-found/initComponents.js b/webapp/src/main/webapp/vue-apps/page-not-found/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/page-not-found/initComponents.js rename to webapp/src/main/webapp/vue-apps/page-not-found/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/page-not-found/main.js b/webapp/src/main/webapp/vue-apps/page-not-found/main.js similarity index 96% rename from webapp/portlet/src/main/webapp/vue-apps/page-not-found/main.js rename to webapp/src/main/webapp/vue-apps/page-not-found/main.js index 1ff1d981e8b..a3ef71db5e8 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/page-not-found/main.js +++ b/webapp/src/main/webapp/vue-apps/page-not-found/main.js @@ -34,7 +34,7 @@ const appId = 'PageNotFound'; const lang = eXo?.env?.portal?.language || 'en'; //should expose the locale ressources as REST API -const url = `/social-portlet/i18n/locale.portlet.Portlets?lang=${lang}`; +const url = `/social/i18n/locale.portlet.Portlets?lang=${lang}`; document.dispatchEvent(new CustomEvent('displayTopBarLoading')); export function init() { diff --git a/webapp/portlet/src/main/webapp/vue-apps/people-list/components/AdvancedFilterInputItem.vue b/webapp/src/main/webapp/vue-apps/people-list/components/AdvancedFilterInputItem.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/people-list/components/AdvancedFilterInputItem.vue rename to webapp/src/main/webapp/vue-apps/people-list/components/AdvancedFilterInputItem.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/people-list/components/PeopleAdvancedFilterDrawer.vue b/webapp/src/main/webapp/vue-apps/people-list/components/PeopleAdvancedFilterDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/people-list/components/PeopleAdvancedFilterDrawer.vue rename to webapp/src/main/webapp/vue-apps/people-list/components/PeopleAdvancedFilterDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/people-list/components/PeopleCardList.vue b/webapp/src/main/webapp/vue-apps/people-list/components/PeopleCardList.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/people-list/components/PeopleCardList.vue rename to webapp/src/main/webapp/vue-apps/people-list/components/PeopleCardList.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/people-list/components/PeopleList.vue b/webapp/src/main/webapp/vue-apps/people-list/components/PeopleList.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/people-list/components/PeopleList.vue rename to webapp/src/main/webapp/vue-apps/people-list/components/PeopleList.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/people-list/components/PeopleToolbar.vue b/webapp/src/main/webapp/vue-apps/people-list/components/PeopleToolbar.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/people-list/components/PeopleToolbar.vue rename to webapp/src/main/webapp/vue-apps/people-list/components/PeopleToolbar.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/people-list/components/usercard/PeopleCard.vue b/webapp/src/main/webapp/vue-apps/people-list/components/usercard/PeopleCard.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/people-list/components/usercard/PeopleCard.vue rename to webapp/src/main/webapp/vue-apps/people-list/components/usercard/PeopleCard.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/people-list/components/usercard/PeopleUserCard.vue b/webapp/src/main/webapp/vue-apps/people-list/components/usercard/PeopleUserCard.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/people-list/components/usercard/PeopleUserCard.vue rename to webapp/src/main/webapp/vue-apps/people-list/components/usercard/PeopleUserCard.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/people-list/components/usercard/PeopleUserCardRoles.vue b/webapp/src/main/webapp/vue-apps/people-list/components/usercard/PeopleUserCardRoles.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/people-list/components/usercard/PeopleUserCardRoles.vue rename to webapp/src/main/webapp/vue-apps/people-list/components/usercard/PeopleUserCardRoles.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/people-list/components/usercard/PeopleUserCompactCard.vue b/webapp/src/main/webapp/vue-apps/people-list/components/usercard/PeopleUserCompactCard.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/people-list/components/usercard/PeopleUserCompactCard.vue rename to webapp/src/main/webapp/vue-apps/people-list/components/usercard/PeopleUserCompactCard.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/people-list/components/usercard/PeopleUserMenu.vue b/webapp/src/main/webapp/vue-apps/people-list/components/usercard/PeopleUserMenu.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/people-list/components/usercard/PeopleUserMenu.vue rename to webapp/src/main/webapp/vue-apps/people-list/components/usercard/PeopleUserMenu.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/people-list/components/usercard/PeopleUserMenuItem.vue b/webapp/src/main/webapp/vue-apps/people-list/components/usercard/PeopleUserMenuItem.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/people-list/components/usercard/PeopleUserMenuItem.vue rename to webapp/src/main/webapp/vue-apps/people-list/components/usercard/PeopleUserMenuItem.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/people-list/components/usercard/PeopleUserRole.vue b/webapp/src/main/webapp/vue-apps/people-list/components/usercard/PeopleUserRole.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/people-list/components/usercard/PeopleUserRole.vue rename to webapp/src/main/webapp/vue-apps/people-list/components/usercard/PeopleUserRole.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/people-list/extensions.js b/webapp/src/main/webapp/vue-apps/people-list/extensions.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/people-list/extensions.js rename to webapp/src/main/webapp/vue-apps/people-list/extensions.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/people-list/initComponents.js b/webapp/src/main/webapp/vue-apps/people-list/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/people-list/initComponents.js rename to webapp/src/main/webapp/vue-apps/people-list/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/people-list/main-components.js b/webapp/src/main/webapp/vue-apps/people-list/main-components.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/people-list/main-components.js rename to webapp/src/main/webapp/vue-apps/people-list/main-components.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/people-list/main.js b/webapp/src/main/webapp/vue-apps/people-list/main.js similarity index 94% rename from webapp/portlet/src/main/webapp/vue-apps/people-list/main.js rename to webapp/src/main/webapp/vue-apps/people-list/main.js index 9ae136af230..5fd7197e4fe 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/people-list/main.js +++ b/webapp/src/main/webapp/vue-apps/people-list/main.js @@ -19,7 +19,7 @@ const lang = eXo && eXo.env.portal.language || 'en'; //should expose the locale ressources as REST API -const url = `/social-portlet/i18n/locale.portlet.social.PeopleListApplication?lang=${lang}`; +const url = `/social/i18n/locale.portlet.social.PeopleListApplication?lang=${lang}`; const appId = 'peopleListApplication'; diff --git a/webapp/portlet/src/main/webapp/vue-apps/people-overview/components/PeopleOverview.vue b/webapp/src/main/webapp/vue-apps/people-overview/components/PeopleOverview.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/people-overview/components/PeopleOverview.vue rename to webapp/src/main/webapp/vue-apps/people-overview/components/PeopleOverview.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/people-overview/components/PeopleOverviewCard.vue b/webapp/src/main/webapp/vue-apps/people-overview/components/PeopleOverviewCard.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/people-overview/components/PeopleOverviewCard.vue rename to webapp/src/main/webapp/vue-apps/people-overview/components/PeopleOverviewCard.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/people-overview/components/PeopleOverviewDrawer.vue b/webapp/src/main/webapp/vue-apps/people-overview/components/PeopleOverviewDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/people-overview/components/PeopleOverviewDrawer.vue rename to webapp/src/main/webapp/vue-apps/people-overview/components/PeopleOverviewDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/people-overview/components/PeopleOverviewPeopleList.vue b/webapp/src/main/webapp/vue-apps/people-overview/components/PeopleOverviewPeopleList.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/people-overview/components/PeopleOverviewPeopleList.vue rename to webapp/src/main/webapp/vue-apps/people-overview/components/PeopleOverviewPeopleList.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/people-overview/components/PeopleOverviewPeopleListItem.vue b/webapp/src/main/webapp/vue-apps/people-overview/components/PeopleOverviewPeopleListItem.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/people-overview/components/PeopleOverviewPeopleListItem.vue rename to webapp/src/main/webapp/vue-apps/people-overview/components/PeopleOverviewPeopleListItem.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/people-overview/initComponents.js b/webapp/src/main/webapp/vue-apps/people-overview/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/people-overview/initComponents.js rename to webapp/src/main/webapp/vue-apps/people-overview/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/people-overview/main.js b/webapp/src/main/webapp/vue-apps/people-overview/main.js similarity index 89% rename from webapp/portlet/src/main/webapp/vue-apps/people-overview/main.js rename to webapp/src/main/webapp/vue-apps/people-overview/main.js index c686643a08c..bd9404b577b 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/people-overview/main.js +++ b/webapp/src/main/webapp/vue-apps/people-overview/main.js @@ -14,7 +14,7 @@ if (extensionRegistry) { const lang = eXo && eXo.env.portal.language || 'en'; //should expose the locale ressources as REST API -const url = `/social-portlet/i18n/locale.portlet.social.PeopleOverview?lang=${lang}`; +const url = `/social/i18n/locale.portlet.social.PeopleOverview?lang=${lang}`; const appId = 'PeopleOverview'; diff --git a/webapp/portlet/src/main/webapp/vue-apps/platform-settings/components/PlatformSettings.vue b/webapp/src/main/webapp/vue-apps/platform-settings/components/PlatformSettings.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/platform-settings/components/PlatformSettings.vue rename to webapp/src/main/webapp/vue-apps/platform-settings/components/PlatformSettings.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/platform-settings/initComponents.js b/webapp/src/main/webapp/vue-apps/platform-settings/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/platform-settings/initComponents.js rename to webapp/src/main/webapp/vue-apps/platform-settings/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/platform-settings/main.js b/webapp/src/main/webapp/vue-apps/platform-settings/main.js similarity index 95% rename from webapp/portlet/src/main/webapp/vue-apps/platform-settings/main.js rename to webapp/src/main/webapp/vue-apps/platform-settings/main.js index 729043ee41a..7cb6da3eced 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/platform-settings/main.js +++ b/webapp/src/main/webapp/vue-apps/platform-settings/main.js @@ -31,7 +31,7 @@ if (extensionRegistry) { const appId = 'platformSettings'; const lang = window?.eXo?.env?.portal?.language || 'en'; -const i18NUrl = `/social-portlet/i18n/locale.portlet.PlatformSettings?lang=${lang}`; +const i18NUrl = `/social/i18n/locale.portlet.PlatformSettings?lang=${lang}`; export function init(url) { exoi18n.loadLanguageAsync(lang, i18NUrl).then(i18n => { diff --git a/webapp/portlet/src/main/webapp/vue-apps/popover/components/Popover.vue b/webapp/src/main/webapp/vue-apps/popover/components/Popover.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/popover/components/Popover.vue rename to webapp/src/main/webapp/vue-apps/popover/components/Popover.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/popover/components/PopoverMenu.vue b/webapp/src/main/webapp/vue-apps/popover/components/PopoverMenu.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/popover/components/PopoverMenu.vue rename to webapp/src/main/webapp/vue-apps/popover/components/PopoverMenu.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/popover/components/SpaceMuteNotificationButton.vue b/webapp/src/main/webapp/vue-apps/popover/components/SpaceMuteNotificationButton.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/popover/components/SpaceMuteNotificationButton.vue rename to webapp/src/main/webapp/vue-apps/popover/components/SpaceMuteNotificationButton.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/popover/components/SpacePopoverContent.vue b/webapp/src/main/webapp/vue-apps/popover/components/SpacePopoverContent.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/popover/components/SpacePopoverContent.vue rename to webapp/src/main/webapp/vue-apps/popover/components/SpacePopoverContent.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/popover/components/UserPopoverContent.vue b/webapp/src/main/webapp/vue-apps/popover/components/UserPopoverContent.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/popover/components/UserPopoverContent.vue rename to webapp/src/main/webapp/vue-apps/popover/components/UserPopoverContent.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/popover/components/UsersListDrawer.vue b/webapp/src/main/webapp/vue-apps/popover/components/UsersListDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/popover/components/UsersListDrawer.vue rename to webapp/src/main/webapp/vue-apps/popover/components/UsersListDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/popover/initComponents.js b/webapp/src/main/webapp/vue-apps/popover/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/popover/initComponents.js rename to webapp/src/main/webapp/vue-apps/popover/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/popover/main.js b/webapp/src/main/webapp/vue-apps/popover/main.js similarity index 92% rename from webapp/portlet/src/main/webapp/vue-apps/popover/main.js rename to webapp/src/main/webapp/vue-apps/popover/main.js index cae2640fb47..c646e6ff87a 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/popover/main.js +++ b/webapp/src/main/webapp/vue-apps/popover/main.js @@ -3,9 +3,9 @@ import './initComponents.js'; const lang = typeof eXo !== 'undefined' ? eXo.env.portal.language : 'en'; const urls = [ - `/social-portlet/i18n/locale.portlet.Portlets?lang=${lang}`, - `/social-portlet/i18n/locale.commons.Commons?lang=${lang}`, - `/social-portlet/i18n/locale.portlet.social.UserPopup?lang=${lang}`, + `/social/i18n/locale.portlet.Portlets?lang=${lang}`, + `/social/i18n/locale.commons.Commons?lang=${lang}`, + `/social/i18n/locale.portlet.social.UserPopup?lang=${lang}`, ]; Vue.directive('identity-popover', (el, binding) => { diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-about-me/components/ProfileAboutMe.vue b/webapp/src/main/webapp/vue-apps/profile-about-me/components/ProfileAboutMe.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-about-me/components/ProfileAboutMe.vue rename to webapp/src/main/webapp/vue-apps/profile-about-me/components/ProfileAboutMe.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-about-me/initComponents.js b/webapp/src/main/webapp/vue-apps/profile-about-me/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-about-me/initComponents.js rename to webapp/src/main/webapp/vue-apps/profile-about-me/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-about-me/main.js b/webapp/src/main/webapp/vue-apps/profile-about-me/main.js similarity index 93% rename from webapp/portlet/src/main/webapp/vue-apps/profile-about-me/main.js rename to webapp/src/main/webapp/vue-apps/profile-about-me/main.js index 3b374b8b999..5bab0ba28ae 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/profile-about-me/main.js +++ b/webapp/src/main/webapp/vue-apps/profile-about-me/main.js @@ -17,7 +17,7 @@ const appId = 'ProfileAboutMe'; const cacheId = `${appId}_${eXo.env.portal.profileOwnerIdentityId}`; //should expose the locale ressources as REST API -const url = `/social-portlet/i18n/locale.portlet.social.ProfileAboutMe?lang=${lang}`; +const url = `/social/i18n/locale.portlet.social.ProfileAboutMe?lang=${lang}`; document.dispatchEvent(new CustomEvent('displayTopBarLoading')); export function init(aboutMe) { diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-contact-information/components/ProfileContactEditMultiField.vue b/webapp/src/main/webapp/vue-apps/profile-contact-information/components/ProfileContactEditMultiField.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-contact-information/components/ProfileContactEditMultiField.vue rename to webapp/src/main/webapp/vue-apps/profile-contact-information/components/ProfileContactEditMultiField.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-contact-information/components/ProfileContactEditMultiFieldSelect.vue b/webapp/src/main/webapp/vue-apps/profile-contact-information/components/ProfileContactEditMultiFieldSelect.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-contact-information/components/ProfileContactEditMultiFieldSelect.vue rename to webapp/src/main/webapp/vue-apps/profile-contact-information/components/ProfileContactEditMultiFieldSelect.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-contact-information/components/ProfileContactInformation.vue b/webapp/src/main/webapp/vue-apps/profile-contact-information/components/ProfileContactInformation.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-contact-information/components/ProfileContactInformation.vue rename to webapp/src/main/webapp/vue-apps/profile-contact-information/components/ProfileContactInformation.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-contact-information/components/ProfileContactInformationDrawer.vue b/webapp/src/main/webapp/vue-apps/profile-contact-information/components/ProfileContactInformationDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-contact-information/components/ProfileContactInformationDrawer.vue rename to webapp/src/main/webapp/vue-apps/profile-contact-information/components/ProfileContactInformationDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-contact-information/components/ProfileContactUserTypeProperty.vue b/webapp/src/main/webapp/vue-apps/profile-contact-information/components/ProfileContactUserTypeProperty.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-contact-information/components/ProfileContactUserTypeProperty.vue rename to webapp/src/main/webapp/vue-apps/profile-contact-information/components/ProfileContactUserTypeProperty.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-contact-information/components/ProfileHiddenPropertyInfo.vue b/webapp/src/main/webapp/vue-apps/profile-contact-information/components/ProfileHiddenPropertyInfo.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-contact-information/components/ProfileHiddenPropertyInfo.vue rename to webapp/src/main/webapp/vue-apps/profile-contact-information/components/ProfileHiddenPropertyInfo.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-contact-information/components/ProfileHidePropertyButton.vue b/webapp/src/main/webapp/vue-apps/profile-contact-information/components/ProfileHidePropertyButton.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-contact-information/components/ProfileHidePropertyButton.vue rename to webapp/src/main/webapp/vue-apps/profile-contact-information/components/ProfileHidePropertyButton.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-contact-information/components/ProfileMultiValuedProperty.vue b/webapp/src/main/webapp/vue-apps/profile-contact-information/components/ProfileMultiValuedProperty.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-contact-information/components/ProfileMultiValuedProperty.vue rename to webapp/src/main/webapp/vue-apps/profile-contact-information/components/ProfileMultiValuedProperty.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-contact-information/components/ProfileSingleValuedProperty.vue b/webapp/src/main/webapp/vue-apps/profile-contact-information/components/ProfileSingleValuedProperty.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-contact-information/components/ProfileSingleValuedProperty.vue rename to webapp/src/main/webapp/vue-apps/profile-contact-information/components/ProfileSingleValuedProperty.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-contact-information/components/ProfileUserTypePropertyValues.vue b/webapp/src/main/webapp/vue-apps/profile-contact-information/components/ProfileUserTypePropertyValues.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-contact-information/components/ProfileUserTypePropertyValues.vue rename to webapp/src/main/webapp/vue-apps/profile-contact-information/components/ProfileUserTypePropertyValues.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-contact-information/components/QuickSearchUsersListDrawer.vue b/webapp/src/main/webapp/vue-apps/profile-contact-information/components/QuickSearchUsersListDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-contact-information/components/QuickSearchUsersListDrawer.vue rename to webapp/src/main/webapp/vue-apps/profile-contact-information/components/QuickSearchUsersListDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-contact-information/initComponents.js b/webapp/src/main/webapp/vue-apps/profile-contact-information/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-contact-information/initComponents.js rename to webapp/src/main/webapp/vue-apps/profile-contact-information/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-contact-information/main.js b/webapp/src/main/webapp/vue-apps/profile-contact-information/main.js similarity index 85% rename from webapp/portlet/src/main/webapp/vue-apps/profile-contact-information/main.js rename to webapp/src/main/webapp/vue-apps/profile-contact-information/main.js index 7d8f057be79..80ee0e1390b 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/profile-contact-information/main.js +++ b/webapp/src/main/webapp/vue-apps/profile-contact-information/main.js @@ -20,9 +20,9 @@ const cacheId = `${appId}_${eXo.env.portal.profileOwnerIdentityId}`; //should expose the locale ressources as REST API const urls = [ - `/social-portlet/i18n/locale.portlet.social.ProfileContactInformation?lang=${lang}`, - `/social-portlet/i18n/locale.portlet.social.ComplementaryFilter?lang=${lang}`, - `/social-portlet/i18n/locale.portlet.Portlets?lang=${lang}` + `/social/i18n/locale.portlet.social.ProfileContactInformation?lang=${lang}`, + `/social/i18n/locale.portlet.social.ComplementaryFilter?lang=${lang}`, + `/social/i18n/locale.portlet.Portlets?lang=${lang}` ]; export function init(uploadLimit, imTypes) { diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-header/components/ProfileHeader.vue b/webapp/src/main/webapp/vue-apps/profile-header/components/ProfileHeader.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-header/components/ProfileHeader.vue rename to webapp/src/main/webapp/vue-apps/profile-header/components/ProfileHeader.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-header/components/ProfileHeaderActions.vue b/webapp/src/main/webapp/vue-apps/profile-header/components/ProfileHeaderActions.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-header/components/ProfileHeaderActions.vue rename to webapp/src/main/webapp/vue-apps/profile-header/components/ProfileHeaderActions.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-header/components/ProfileHeaderAvatar.vue b/webapp/src/main/webapp/vue-apps/profile-header/components/ProfileHeaderAvatar.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-header/components/ProfileHeaderAvatar.vue rename to webapp/src/main/webapp/vue-apps/profile-header/components/ProfileHeaderAvatar.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-header/components/ProfileHeaderBannerButton.vue b/webapp/src/main/webapp/vue-apps/profile-header/components/ProfileHeaderBannerButton.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-header/components/ProfileHeaderBannerButton.vue rename to webapp/src/main/webapp/vue-apps/profile-header/components/ProfileHeaderBannerButton.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-header/components/ProfileHeaderText.vue b/webapp/src/main/webapp/vue-apps/profile-header/components/ProfileHeaderText.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-header/components/ProfileHeaderText.vue rename to webapp/src/main/webapp/vue-apps/profile-header/components/ProfileHeaderText.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-header/extension.js b/webapp/src/main/webapp/vue-apps/profile-header/extension.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-header/extension.js rename to webapp/src/main/webapp/vue-apps/profile-header/extension.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-header/initComponents.js b/webapp/src/main/webapp/vue-apps/profile-header/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-header/initComponents.js rename to webapp/src/main/webapp/vue-apps/profile-header/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-header/main.js b/webapp/src/main/webapp/vue-apps/profile-header/main.js similarity index 89% rename from webapp/portlet/src/main/webapp/vue-apps/profile-header/main.js rename to webapp/src/main/webapp/vue-apps/profile-header/main.js index b2a730a5c22..465bbac1200 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/profile-header/main.js +++ b/webapp/src/main/webapp/vue-apps/profile-header/main.js @@ -17,8 +17,8 @@ const lang = eXo && eXo.env.portal.language || 'en'; //should expose the locale ressources as REST API const urls = [ - `/social-portlet/i18n/locale.portlet.social.ProfileHeader?lang=${lang}`, - `/social-portlet/i18n/locale.portlet.Portlets?lang=${lang}` + `/social/i18n/locale.portlet.social.ProfileHeader?lang=${lang}`, + `/social/i18n/locale.portlet.Portlets?lang=${lang}` ]; const appId = 'ProfileHeader'; diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-settings/components/ProfileAttributeSettings.vue b/webapp/src/main/webapp/vue-apps/profile-settings/components/ProfileAttributeSettings.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-settings/components/ProfileAttributeSettings.vue rename to webapp/src/main/webapp/vue-apps/profile-settings/components/ProfileAttributeSettings.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-settings/components/ProfileSettings.vue b/webapp/src/main/webapp/vue-apps/profile-settings/components/ProfileSettings.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-settings/components/ProfileSettings.vue rename to webapp/src/main/webapp/vue-apps/profile-settings/components/ProfileSettings.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-settings/components/ProfileSettingsHeader.vue b/webapp/src/main/webapp/vue-apps/profile-settings/components/ProfileSettingsHeader.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-settings/components/ProfileSettingsHeader.vue rename to webapp/src/main/webapp/vue-apps/profile-settings/components/ProfileSettingsHeader.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-settings/components/ProfileSettingsTable.vue b/webapp/src/main/webapp/vue-apps/profile-settings/components/ProfileSettingsTable.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-settings/components/ProfileSettingsTable.vue rename to webapp/src/main/webapp/vue-apps/profile-settings/components/ProfileSettingsTable.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-settings/components/cells/SettingsActionsCell.vue b/webapp/src/main/webapp/vue-apps/profile-settings/components/cells/SettingsActionsCell.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-settings/components/cells/SettingsActionsCell.vue rename to webapp/src/main/webapp/vue-apps/profile-settings/components/cells/SettingsActionsCell.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-settings/components/drawers/ProfilePropertyLabels.vue b/webapp/src/main/webapp/vue-apps/profile-settings/components/drawers/ProfilePropertyLabels.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-settings/components/drawers/ProfilePropertyLabels.vue rename to webapp/src/main/webapp/vue-apps/profile-settings/components/drawers/ProfilePropertyLabels.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-settings/components/drawers/ProfileSettingFormDrawer.vue b/webapp/src/main/webapp/vue-apps/profile-settings/components/drawers/ProfileSettingFormDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-settings/components/drawers/ProfileSettingFormDrawer.vue rename to webapp/src/main/webapp/vue-apps/profile-settings/components/drawers/ProfileSettingFormDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-settings/components/drawers/PropertyLabel.vue b/webapp/src/main/webapp/vue-apps/profile-settings/components/drawers/PropertyLabel.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-settings/components/drawers/PropertyLabel.vue rename to webapp/src/main/webapp/vue-apps/profile-settings/components/drawers/PropertyLabel.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-settings/components/drawers/UserCardSettingsDrawer.vue b/webapp/src/main/webapp/vue-apps/profile-settings/components/drawers/UserCardSettingsDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-settings/components/drawers/UserCardSettingsDrawer.vue rename to webapp/src/main/webapp/vue-apps/profile-settings/components/drawers/UserCardSettingsDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-settings/components/menu/ProfileSettingsActionMenu.vue b/webapp/src/main/webapp/vue-apps/profile-settings/components/menu/ProfileSettingsActionMenu.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-settings/components/menu/ProfileSettingsActionMenu.vue rename to webapp/src/main/webapp/vue-apps/profile-settings/components/menu/ProfileSettingsActionMenu.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-settings/components/views/ProfileSettingsOption.vue b/webapp/src/main/webapp/vue-apps/profile-settings/components/views/ProfileSettingsOption.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-settings/components/views/ProfileSettingsOption.vue rename to webapp/src/main/webapp/vue-apps/profile-settings/components/views/ProfileSettingsOption.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-settings/initComponents.js b/webapp/src/main/webapp/vue-apps/profile-settings/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-settings/initComponents.js rename to webapp/src/main/webapp/vue-apps/profile-settings/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-settings/main.js b/webapp/src/main/webapp/vue-apps/profile-settings/main.js similarity index 95% rename from webapp/portlet/src/main/webapp/vue-apps/profile-settings/main.js rename to webapp/src/main/webapp/vue-apps/profile-settings/main.js index 0421ee4bc45..6d9093a9210 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/profile-settings/main.js +++ b/webapp/src/main/webapp/vue-apps/profile-settings/main.js @@ -34,7 +34,7 @@ if (extensionRegistry) { //getting language of user const lang = eXo && eXo.env.portal.language || 'en'; -const url = `/social-portlet/i18n/locale.portlet.Portlets?lang=${lang}`; +const url = `/social/i18n/locale.portlet.Portlets?lang=${lang}`; const vuetify = Vue.prototype.vuetifyOptions; diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-work-experience/components/ProfileWorkExperienceDrawer.vue b/webapp/src/main/webapp/vue-apps/profile-work-experience/components/ProfileWorkExperienceDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-work-experience/components/ProfileWorkExperienceDrawer.vue rename to webapp/src/main/webapp/vue-apps/profile-work-experience/components/ProfileWorkExperienceDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-work-experience/components/ProfileWorkExperienceEditItem.vue b/webapp/src/main/webapp/vue-apps/profile-work-experience/components/ProfileWorkExperienceEditItem.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-work-experience/components/ProfileWorkExperienceEditItem.vue rename to webapp/src/main/webapp/vue-apps/profile-work-experience/components/ProfileWorkExperienceEditItem.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-work-experience/components/ProfileWorkExperienceItem.vue b/webapp/src/main/webapp/vue-apps/profile-work-experience/components/ProfileWorkExperienceItem.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-work-experience/components/ProfileWorkExperienceItem.vue rename to webapp/src/main/webapp/vue-apps/profile-work-experience/components/ProfileWorkExperienceItem.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-work-experience/components/ProfileWorkExperiences.vue b/webapp/src/main/webapp/vue-apps/profile-work-experience/components/ProfileWorkExperiences.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-work-experience/components/ProfileWorkExperiences.vue rename to webapp/src/main/webapp/vue-apps/profile-work-experience/components/ProfileWorkExperiences.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-work-experience/initComponents.js b/webapp/src/main/webapp/vue-apps/profile-work-experience/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/profile-work-experience/initComponents.js rename to webapp/src/main/webapp/vue-apps/profile-work-experience/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/profile-work-experience/main.js b/webapp/src/main/webapp/vue-apps/profile-work-experience/main.js similarity index 92% rename from webapp/portlet/src/main/webapp/vue-apps/profile-work-experience/main.js rename to webapp/src/main/webapp/vue-apps/profile-work-experience/main.js index c276ca9913d..44b2f9924ed 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/profile-work-experience/main.js +++ b/webapp/src/main/webapp/vue-apps/profile-work-experience/main.js @@ -19,7 +19,7 @@ const appId = 'ProfileWorkExperience'; const cacheId = `${appId}_${eXo.env.portal.profileOwnerIdentityId}`; //should expose the locale ressources as REST API -const url = `/social-portlet/i18n/locale.portlet.social.ProfileWorkExperience?lang=${lang}`; +const url = `/social/i18n/locale.portlet.social.ProfileWorkExperience?lang=${lang}`; export function init() { exoi18n.loadLanguageAsync(lang, url).then(i18n => { diff --git a/webapp/portlet/src/main/webapp/vue-apps/search-activity/components/SearchActivityCard.vue b/webapp/src/main/webapp/vue-apps/search-activity/components/SearchActivityCard.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/search-activity/components/SearchActivityCard.vue rename to webapp/src/main/webapp/vue-apps/search-activity/components/SearchActivityCard.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/search-activity/initComponents.js b/webapp/src/main/webapp/vue-apps/search-activity/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/search-activity/initComponents.js rename to webapp/src/main/webapp/vue-apps/search-activity/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/search-activity/main.js b/webapp/src/main/webapp/vue-apps/search-activity/main.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/search-activity/main.js rename to webapp/src/main/webapp/vue-apps/search-activity/main.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/search-people/components/SearchPeopleCard.vue b/webapp/src/main/webapp/vue-apps/search-people/components/SearchPeopleCard.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/search-people/components/SearchPeopleCard.vue rename to webapp/src/main/webapp/vue-apps/search-people/components/SearchPeopleCard.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/search-people/initComponents.js b/webapp/src/main/webapp/vue-apps/search-people/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/search-people/initComponents.js rename to webapp/src/main/webapp/vue-apps/search-people/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/search-people/main.js b/webapp/src/main/webapp/vue-apps/search-people/main.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/search-people/main.js rename to webapp/src/main/webapp/vue-apps/search-people/main.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/search-space/components/SearchSpaceCard.vue b/webapp/src/main/webapp/vue-apps/search-space/components/SearchSpaceCard.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/search-space/components/SearchSpaceCard.vue rename to webapp/src/main/webapp/vue-apps/search-space/components/SearchSpaceCard.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/search-space/initComponents.js b/webapp/src/main/webapp/vue-apps/search-space/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/search-space/initComponents.js rename to webapp/src/main/webapp/vue-apps/search-space/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/search-space/main.js b/webapp/src/main/webapp/vue-apps/search-space/main.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/search-space/main.js rename to webapp/src/main/webapp/vue-apps/search-space/main.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/search/components/SearchApplication.vue b/webapp/src/main/webapp/vue-apps/search/components/SearchApplication.vue similarity index 98% rename from webapp/portlet/src/main/webapp/vue-apps/search/components/SearchApplication.vue rename to webapp/src/main/webapp/vue-apps/search/components/SearchApplication.vue index b1aff6f8413..846e8a253c7 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/search/components/SearchApplication.vue +++ b/webapp/src/main/webapp/vue-apps/search/components/SearchApplication.vue @@ -108,7 +108,7 @@ export default { const lang = eXo.env.portal.language; const basePath = `${eXo.env.portal.context}/${eXo.env.portal.rest}`; - const urls = [`/social-portlet/i18n/locale.portlet.Portlets?lang=${lang}`]; + const urls = [`/social/i18n/locale.portlet.Portlets?lang=${lang}`]; if (this.connectors && this.connectors.length) { this.connectors.forEach(connector => { if (connector.i18nBundle) { diff --git a/webapp/portlet/src/main/webapp/vue-apps/search/components/SearchResultCard.vue b/webapp/src/main/webapp/vue-apps/search/components/SearchResultCard.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/search/components/SearchResultCard.vue rename to webapp/src/main/webapp/vue-apps/search/components/SearchResultCard.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/search/components/SearchResults.vue b/webapp/src/main/webapp/vue-apps/search/components/SearchResults.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/search/components/SearchResults.vue rename to webapp/src/main/webapp/vue-apps/search/components/SearchResults.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/search/components/SearchTagList.vue b/webapp/src/main/webapp/vue-apps/search/components/SearchTagList.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/search/components/SearchTagList.vue rename to webapp/src/main/webapp/vue-apps/search/components/SearchTagList.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/search/components/SearchTagSelector.vue b/webapp/src/main/webapp/vue-apps/search/components/SearchTagSelector.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/search/components/SearchTagSelector.vue rename to webapp/src/main/webapp/vue-apps/search/components/SearchTagSelector.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/search/components/SearchToolbar.vue b/webapp/src/main/webapp/vue-apps/search/components/SearchToolbar.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/search/components/SearchToolbar.vue rename to webapp/src/main/webapp/vue-apps/search/components/SearchToolbar.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/search/initComponents.js b/webapp/src/main/webapp/vue-apps/search/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/search/initComponents.js rename to webapp/src/main/webapp/vue-apps/search/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/search/main.js b/webapp/src/main/webapp/vue-apps/search/main.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/search/main.js rename to webapp/src/main/webapp/vue-apps/search/main.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/site-details/components/SiteDetails.vue b/webapp/src/main/webapp/vue-apps/site-details/components/SiteDetails.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/site-details/components/SiteDetails.vue rename to webapp/src/main/webapp/vue-apps/site-details/components/SiteDetails.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/site-details/components/SiteNavigationItem.vue b/webapp/src/main/webapp/vue-apps/site-details/components/SiteNavigationItem.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/site-details/components/SiteNavigationItem.vue rename to webapp/src/main/webapp/vue-apps/site-details/components/SiteNavigationItem.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/site-details/components/SiteNavigationTree.vue b/webapp/src/main/webapp/vue-apps/site-details/components/SiteNavigationTree.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/site-details/components/SiteNavigationTree.vue rename to webapp/src/main/webapp/vue-apps/site-details/components/SiteNavigationTree.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/site-details/initComponents.js b/webapp/src/main/webapp/vue-apps/site-details/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/site-details/initComponents.js rename to webapp/src/main/webapp/vue-apps/site-details/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/site-details/main.js b/webapp/src/main/webapp/vue-apps/site-details/main.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/site-details/main.js rename to webapp/src/main/webapp/vue-apps/site-details/main.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-access/components/SpaceAccess.vue b/webapp/src/main/webapp/vue-apps/space-access/components/SpaceAccess.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-access/components/SpaceAccess.vue rename to webapp/src/main/webapp/vue-apps/space-access/components/SpaceAccess.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-access/initComponents.js b/webapp/src/main/webapp/vue-apps/space-access/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-access/initComponents.js rename to webapp/src/main/webapp/vue-apps/space-access/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-access/main.js b/webapp/src/main/webapp/vue-apps/space-access/main.js similarity index 96% rename from webapp/portlet/src/main/webapp/vue-apps/space-access/main.js rename to webapp/src/main/webapp/vue-apps/space-access/main.js index 8e9b0b0feaf..caf94de0043 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/space-access/main.js +++ b/webapp/src/main/webapp/vue-apps/space-access/main.js @@ -34,7 +34,7 @@ const appId = 'SpaceAccess'; const lang = typeof eXo !== 'undefined' ? eXo.env.portal.language : 'en'; //should expose the locale ressources as REST API -const url = `/social-portlet/i18n/locale.social.Webui?lang=${lang}`; +const url = `/social/i18n/locale.social.Webui?lang=${lang}`; document.dispatchEvent(new CustomEvent('displayTopBarLoading')); diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-header/components/SpaceHeader.vue b/webapp/src/main/webapp/vue-apps/space-header/components/SpaceHeader.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-header/components/SpaceHeader.vue rename to webapp/src/main/webapp/vue-apps/space-header/components/SpaceHeader.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-header/initComponents.js b/webapp/src/main/webapp/vue-apps/space-header/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-header/initComponents.js rename to webapp/src/main/webapp/vue-apps/space-header/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-header/main.js b/webapp/src/main/webapp/vue-apps/space-header/main.js similarity index 95% rename from webapp/portlet/src/main/webapp/vue-apps/space-header/main.js rename to webapp/src/main/webapp/vue-apps/space-header/main.js index d3de4e40f89..eceea49dae1 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/space-header/main.js +++ b/webapp/src/main/webapp/vue-apps/space-header/main.js @@ -17,7 +17,7 @@ const cacheId = `${appId}_${eXo.env.portal.spaceId}`; const lang = typeof eXo !== 'undefined' ? eXo.env.portal.language : 'en'; //should expose the locale ressources as REST API -const url = `/social-portlet/i18n/locale.portlet.Portlets?lang=${lang}`; +const url = `/social/i18n/locale.portlet.Portlets?lang=${lang}`; export function init(settings, bannerUrl, maxUploadSize, isAdmin) { document.dispatchEvent(new CustomEvent('displayTopBarLoading')); diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-infos-app/components/SpaceInfos.vue b/webapp/src/main/webapp/vue-apps/space-infos-app/components/SpaceInfos.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-infos-app/components/SpaceInfos.vue rename to webapp/src/main/webapp/vue-apps/space-infos-app/components/SpaceInfos.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-infos-app/initComponents.js b/webapp/src/main/webapp/vue-apps/space-infos-app/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-infos-app/initComponents.js rename to webapp/src/main/webapp/vue-apps/space-infos-app/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-infos-app/main.js b/webapp/src/main/webapp/vue-apps/space-infos-app/main.js similarity index 91% rename from webapp/portlet/src/main/webapp/vue-apps/space-infos-app/main.js rename to webapp/src/main/webapp/vue-apps/space-infos-app/main.js index a43251918b8..040dfd30fed 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/space-infos-app/main.js +++ b/webapp/src/main/webapp/vue-apps/space-infos-app/main.js @@ -4,7 +4,7 @@ import './initComponents.js'; const lang = typeof eXo !== 'undefined' ? eXo.env.portal.language : 'en'; // should expose the locale ressources as REST API -const url = `/social-portlet/i18n/locale.portlet.social.SpaceInfosPortlet?lang=${lang}`; +const url = `/social/i18n/locale.portlet.social.SpaceInfosPortlet?lang=${lang}`; // get overrided components if exists if (extensionRegistry) { diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-invitation/components/SpaceInviteButtonsGroup.vue b/webapp/src/main/webapp/vue-apps/space-invitation/components/SpaceInviteButtonsGroup.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-invitation/components/SpaceInviteButtonsGroup.vue rename to webapp/src/main/webapp/vue-apps/space-invitation/components/SpaceInviteButtonsGroup.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-invitation/components/drawer/SpaceInviteInputEmailDrawer.vue b/webapp/src/main/webapp/vue-apps/space-invitation/components/drawer/SpaceInviteInputEmailDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-invitation/components/drawer/SpaceInviteInputEmailDrawer.vue rename to webapp/src/main/webapp/vue-apps/space-invitation/components/drawer/SpaceInviteInputEmailDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-invitation/components/drawer/SpaceInviteInputUsersDrawer.vue b/webapp/src/main/webapp/vue-apps/space-invitation/components/drawer/SpaceInviteInputUsersDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-invitation/components/drawer/SpaceInviteInputUsersDrawer.vue rename to webapp/src/main/webapp/vue-apps/space-invitation/components/drawer/SpaceInviteInputUsersDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-invitation/components/drawer/SpaceInvitePendingDrawer.vue b/webapp/src/main/webapp/vue-apps/space-invitation/components/drawer/SpaceInvitePendingDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-invitation/components/drawer/SpaceInvitePendingDrawer.vue rename to webapp/src/main/webapp/vue-apps/space-invitation/components/drawer/SpaceInvitePendingDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-invitation/components/form/SpaceInviteButton.vue b/webapp/src/main/webapp/vue-apps/space-invitation/components/form/SpaceInviteButton.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-invitation/components/form/SpaceInviteButton.vue rename to webapp/src/main/webapp/vue-apps/space-invitation/components/form/SpaceInviteButton.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-invitation/components/list/SpaceInviteEmailListItem.vue b/webapp/src/main/webapp/vue-apps/space-invitation/components/list/SpaceInviteEmailListItem.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-invitation/components/list/SpaceInviteEmailListItem.vue rename to webapp/src/main/webapp/vue-apps/space-invitation/components/list/SpaceInviteEmailListItem.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-invitation/components/list/SpaceSettingRoleList.vue b/webapp/src/main/webapp/vue-apps/space-invitation/components/list/SpaceSettingRoleList.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-invitation/components/list/SpaceSettingRoleList.vue rename to webapp/src/main/webapp/vue-apps/space-invitation/components/list/SpaceSettingRoleList.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-invitation/components/list/SpaceSettingRoleListItem.vue b/webapp/src/main/webapp/vue-apps/space-invitation/components/list/SpaceSettingRoleListItem.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-invitation/components/list/SpaceSettingRoleListItem.vue rename to webapp/src/main/webapp/vue-apps/space-invitation/components/list/SpaceSettingRoleListItem.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-invitation/initComponents.js b/webapp/src/main/webapp/vue-apps/space-invitation/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-invitation/initComponents.js rename to webapp/src/main/webapp/vue-apps/space-invitation/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-invitation/main.js b/webapp/src/main/webapp/vue-apps/space-invitation/main.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-invitation/main.js rename to webapp/src/main/webapp/vue-apps/space-invitation/main.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-members/components/SpaceMembers.vue b/webapp/src/main/webapp/vue-apps/space-members/components/SpaceMembers.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-members/components/SpaceMembers.vue rename to webapp/src/main/webapp/vue-apps/space-members/components/SpaceMembers.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-members/components/SpaceMembersAlert.vue b/webapp/src/main/webapp/vue-apps/space-members/components/SpaceMembersAlert.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-members/components/SpaceMembersAlert.vue rename to webapp/src/main/webapp/vue-apps/space-members/components/SpaceMembersAlert.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-members/components/SpaceMembersToolbar.vue b/webapp/src/main/webapp/vue-apps/space-members/components/SpaceMembersToolbar.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-members/components/SpaceMembersToolbar.vue rename to webapp/src/main/webapp/vue-apps/space-members/components/SpaceMembersToolbar.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-members/extensions.js b/webapp/src/main/webapp/vue-apps/space-members/extensions.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-members/extensions.js rename to webapp/src/main/webapp/vue-apps/space-members/extensions.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-members/initComponents.js b/webapp/src/main/webapp/vue-apps/space-members/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-members/initComponents.js rename to webapp/src/main/webapp/vue-apps/space-members/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-members/main.js b/webapp/src/main/webapp/vue-apps/space-members/main.js similarity index 97% rename from webapp/portlet/src/main/webapp/vue-apps/space-members/main.js rename to webapp/src/main/webapp/vue-apps/space-members/main.js index d22e9c7bc10..b73c0ecd78d 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/space-members/main.js +++ b/webapp/src/main/webapp/vue-apps/space-members/main.js @@ -35,7 +35,7 @@ document.dispatchEvent(new CustomEvent('displayTopBarLoading')); const lang = eXo && eXo.env.portal.language || 'en'; //should expose the locale ressources as REST API -const url = `/social-portlet/i18n/locale.portlet.social.PeopleListApplication?lang=${lang}`; +const url = `/social/i18n/locale.portlet.social.PeopleListApplication?lang=${lang}`; const appId = 'spaceMembersApplication'; diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-menu/components/SpaceMenu.vue b/webapp/src/main/webapp/vue-apps/space-menu/components/SpaceMenu.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-menu/components/SpaceMenu.vue rename to webapp/src/main/webapp/vue-apps/space-menu/components/SpaceMenu.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-menu/components/SpaceMenuItem.vue b/webapp/src/main/webapp/vue-apps/space-menu/components/SpaceMenuItem.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-menu/components/SpaceMenuItem.vue rename to webapp/src/main/webapp/vue-apps/space-menu/components/SpaceMenuItem.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-menu/initComponents.js b/webapp/src/main/webapp/vue-apps/space-menu/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-menu/initComponents.js rename to webapp/src/main/webapp/vue-apps/space-menu/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-menu/main.js b/webapp/src/main/webapp/vue-apps/space-menu/main.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-menu/main.js rename to webapp/src/main/webapp/vue-apps/space-menu/main.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/SpaceSettings.vue b/webapp/src/main/webapp/vue-apps/space-settings/components/SpaceSettings.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-settings/components/SpaceSettings.vue rename to webapp/src/main/webapp/vue-apps/space-settings/components/SpaceSettings.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/drawer/SpaceSettingAccessDrawer.vue b/webapp/src/main/webapp/vue-apps/space-settings/components/drawer/SpaceSettingAccessDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-settings/components/drawer/SpaceSettingAccessDrawer.vue rename to webapp/src/main/webapp/vue-apps/space-settings/components/drawer/SpaceSettingAccessDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/drawer/SpaceSettingPublicSiteDrawer.vue b/webapp/src/main/webapp/vue-apps/space-settings/components/drawer/SpaceSettingPublicSiteDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-settings/components/drawer/SpaceSettingPublicSiteDrawer.vue rename to webapp/src/main/webapp/vue-apps/space-settings/components/drawer/SpaceSettingPublicSiteDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/drawer/SpaceSettingRedactorDrawer.vue b/webapp/src/main/webapp/vue-apps/space-settings/components/drawer/SpaceSettingRedactorDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-settings/components/drawer/SpaceSettingRedactorDrawer.vue rename to webapp/src/main/webapp/vue-apps/space-settings/components/drawer/SpaceSettingRedactorDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/drawer/SpaceSettingUsersListDrawer.vue b/webapp/src/main/webapp/vue-apps/space-settings/components/drawer/SpaceSettingUsersListDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-settings/components/drawer/SpaceSettingUsersListDrawer.vue rename to webapp/src/main/webapp/vue-apps/space-settings/components/drawer/SpaceSettingUsersListDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/drawer/SpaceSettingUsersSelectionDrawer.vue b/webapp/src/main/webapp/vue-apps/space-settings/components/drawer/SpaceSettingUsersSelectionDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-settings/components/drawer/SpaceSettingUsersSelectionDrawer.vue rename to webapp/src/main/webapp/vue-apps/space-settings/components/drawer/SpaceSettingUsersSelectionDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/form/SpaceSettingAvatar.vue b/webapp/src/main/webapp/vue-apps/space-settings/components/form/SpaceSettingAvatar.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-settings/components/form/SpaceSettingAvatar.vue rename to webapp/src/main/webapp/vue-apps/space-settings/components/form/SpaceSettingAvatar.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/form/SpaceSettingBanner.vue b/webapp/src/main/webapp/vue-apps/space-settings/components/form/SpaceSettingBanner.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-settings/components/form/SpaceSettingBanner.vue rename to webapp/src/main/webapp/vue-apps/space-settings/components/form/SpaceSettingBanner.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/form/SpaceSettingUsersListToolbar.vue b/webapp/src/main/webapp/vue-apps/space-settings/components/form/SpaceSettingUsersListToolbar.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-settings/components/form/SpaceSettingUsersListToolbar.vue rename to webapp/src/main/webapp/vue-apps/space-settings/components/form/SpaceSettingUsersListToolbar.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/main/SpaceSettingAccess.vue b/webapp/src/main/webapp/vue-apps/space-settings/components/main/SpaceSettingAccess.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-settings/components/main/SpaceSettingAccess.vue rename to webapp/src/main/webapp/vue-apps/space-settings/components/main/SpaceSettingAccess.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/main/SpaceSettingOverview.vue b/webapp/src/main/webapp/vue-apps/space-settings/components/main/SpaceSettingOverview.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-settings/components/main/SpaceSettingOverview.vue rename to webapp/src/main/webapp/vue-apps/space-settings/components/main/SpaceSettingOverview.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/main/SpaceSettingPublicSite.vue b/webapp/src/main/webapp/vue-apps/space-settings/components/main/SpaceSettingPublicSite.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-settings/components/main/SpaceSettingPublicSite.vue rename to webapp/src/main/webapp/vue-apps/space-settings/components/main/SpaceSettingPublicSite.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/main/SpaceSettingRoles.vue b/webapp/src/main/webapp/vue-apps/space-settings/components/main/SpaceSettingRoles.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-settings/components/main/SpaceSettingRoles.vue rename to webapp/src/main/webapp/vue-apps/space-settings/components/main/SpaceSettingRoles.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/section/SpaceSettingOverviewSection.vue b/webapp/src/main/webapp/vue-apps/space-settings/components/section/SpaceSettingOverviewSection.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-settings/components/section/SpaceSettingOverviewSection.vue rename to webapp/src/main/webapp/vue-apps/space-settings/components/section/SpaceSettingOverviewSection.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/section/SpaceSettingRolesSection.vue b/webapp/src/main/webapp/vue-apps/space-settings/components/section/SpaceSettingRolesSection.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-settings/components/section/SpaceSettingRolesSection.vue rename to webapp/src/main/webapp/vue-apps/space-settings/components/section/SpaceSettingRolesSection.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/section/roles/SpaceSettingRolesTable.vue b/webapp/src/main/webapp/vue-apps/space-settings/components/section/roles/SpaceSettingRolesTable.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-settings/components/section/roles/SpaceSettingRolesTable.vue rename to webapp/src/main/webapp/vue-apps/space-settings/components/section/roles/SpaceSettingRolesTable.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-settings/components/section/roles/SpaceSettingRolesTableItem.vue b/webapp/src/main/webapp/vue-apps/space-settings/components/section/roles/SpaceSettingRolesTableItem.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-settings/components/section/roles/SpaceSettingRolesTableItem.vue rename to webapp/src/main/webapp/vue-apps/space-settings/components/section/roles/SpaceSettingRolesTableItem.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-settings/initComponents.js b/webapp/src/main/webapp/vue-apps/space-settings/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-settings/initComponents.js rename to webapp/src/main/webapp/vue-apps/space-settings/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-settings/main.js b/webapp/src/main/webapp/vue-apps/space-settings/main.js similarity index 97% rename from webapp/portlet/src/main/webapp/vue-apps/space-settings/main.js rename to webapp/src/main/webapp/vue-apps/space-settings/main.js index a1f5ad3a5aa..9b8f18618a5 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/space-settings/main.js +++ b/webapp/src/main/webapp/vue-apps/space-settings/main.js @@ -35,8 +35,8 @@ const lang = eXo && eXo.env.portal.language || 'en'; //should expose the locale ressources as REST API const urls = [ - `/social-portlet/i18n/locale.portlet.Portlets?lang=${lang}`, - `/social-portlet/i18n/locale.portlet.social.PeopleListApplication?lang=${lang}` + `/social/i18n/locale.portlet.Portlets?lang=${lang}`, + `/social/i18n/locale.portlet.social.PeopleListApplication?lang=${lang}` ]; const appId = 'SpaceSettings'; diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-top-bannerlogo/components/SpaceHostsDrawer.vue b/webapp/src/main/webapp/vue-apps/space-top-bannerlogo/components/SpaceHostsDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-top-bannerlogo/components/SpaceHostsDrawer.vue rename to webapp/src/main/webapp/vue-apps/space-top-bannerlogo/components/SpaceHostsDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-top-bannerlogo/components/SpaceLogoBanner.vue b/webapp/src/main/webapp/vue-apps/space-top-bannerlogo/components/SpaceLogoBanner.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-top-bannerlogo/components/SpaceLogoBanner.vue rename to webapp/src/main/webapp/vue-apps/space-top-bannerlogo/components/SpaceLogoBanner.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-top-bannerlogo/components/SpacePopoverActionComponents.vue b/webapp/src/main/webapp/vue-apps/space-top-bannerlogo/components/SpacePopoverActionComponents.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-top-bannerlogo/components/SpacePopoverActionComponents.vue rename to webapp/src/main/webapp/vue-apps/space-top-bannerlogo/components/SpacePopoverActionComponents.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-top-bannerlogo/extension.js b/webapp/src/main/webapp/vue-apps/space-top-bannerlogo/extension.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-top-bannerlogo/extension.js rename to webapp/src/main/webapp/vue-apps/space-top-bannerlogo/extension.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-top-bannerlogo/initComponents.js b/webapp/src/main/webapp/vue-apps/space-top-bannerlogo/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-top-bannerlogo/initComponents.js rename to webapp/src/main/webapp/vue-apps/space-top-bannerlogo/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-top-bannerlogo/main.js b/webapp/src/main/webapp/vue-apps/space-top-bannerlogo/main.js similarity index 95% rename from webapp/portlet/src/main/webapp/vue-apps/space-top-bannerlogo/main.js rename to webapp/src/main/webapp/vue-apps/space-top-bannerlogo/main.js index 5f98b60b0ad..ce9e3ffdbed 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/space-top-bannerlogo/main.js +++ b/webapp/src/main/webapp/vue-apps/space-top-bannerlogo/main.js @@ -11,7 +11,7 @@ if (extensionRegistry) { const vuetify = Vue.prototype.vuetifyOptions; const lang = eXo && eXo.env.portal.language || 'en'; -const url = `/social-portlet/i18n/locale.portlet.Portlets?lang=${lang}`; +const url = `/social/i18n/locale.portlet.Portlets?lang=${lang}`; let popover; export function init(params) { @@ -66,7 +66,7 @@ export function init(params) { }, i18n, vuetify, - }, `#${appId}`, 'social-portlet'); + }, `#${appId}`, 'Space Logo Banner'); }); } export function destroy() { diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-widget-description/components/SpaceDescriptionApplication.vue b/webapp/src/main/webapp/vue-apps/space-widget-description/components/SpaceDescriptionApplication.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-widget-description/components/SpaceDescriptionApplication.vue rename to webapp/src/main/webapp/vue-apps/space-widget-description/components/SpaceDescriptionApplication.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-widget-description/initComponents.js b/webapp/src/main/webapp/vue-apps/space-widget-description/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-widget-description/initComponents.js rename to webapp/src/main/webapp/vue-apps/space-widget-description/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-widget-description/main.js b/webapp/src/main/webapp/vue-apps/space-widget-description/main.js similarity index 95% rename from webapp/portlet/src/main/webapp/vue-apps/space-widget-description/main.js rename to webapp/src/main/webapp/vue-apps/space-widget-description/main.js index d75e1153610..1a287407b9b 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/space-widget-description/main.js +++ b/webapp/src/main/webapp/vue-apps/space-widget-description/main.js @@ -32,7 +32,7 @@ if (extensionRegistry) { } const appId = 'SpaceDescriptionApplication'; -const url = `/social-portlet/i18n/locale.portlet.social.SpaceInfosPortlet?lang=${lang}`; +const url = `/social/i18n/locale.portlet.social.SpaceInfosPortlet?lang=${lang}`; export async function init(spaceId, isManager, publicSiteName, spaceDescription) { if (!isManager && (!spaceDescription.length || !Vue.prototype.$utils.htmlToText(spaceDescription).length)) { diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-widget-managers/components/SpaceManagersApplication.vue b/webapp/src/main/webapp/vue-apps/space-widget-managers/components/SpaceManagersApplication.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-widget-managers/components/SpaceManagersApplication.vue rename to webapp/src/main/webapp/vue-apps/space-widget-managers/components/SpaceManagersApplication.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-widget-managers/initComponents.js b/webapp/src/main/webapp/vue-apps/space-widget-managers/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-widget-managers/initComponents.js rename to webapp/src/main/webapp/vue-apps/space-widget-managers/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-widget-managers/main.js b/webapp/src/main/webapp/vue-apps/space-widget-managers/main.js similarity index 95% rename from webapp/portlet/src/main/webapp/vue-apps/space-widget-managers/main.js rename to webapp/src/main/webapp/vue-apps/space-widget-managers/main.js index 3e62ac5b212..a516cd5b8a4 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/space-widget-managers/main.js +++ b/webapp/src/main/webapp/vue-apps/space-widget-managers/main.js @@ -32,7 +32,7 @@ if (extensionRegistry) { } const appId = 'SpaceManagersApplication'; -const url = `/social-portlet/i18n/locale.portlet.social.SpaceInfosPortlet?lang=${lang}`; +const url = `/social/i18n/locale.portlet.social.SpaceInfosPortlet?lang=${lang}`; export async function init(spaceId, isManager, isMember, managers) { if (!isManager && !managers.length) { diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-widget-members/components/SpaceMembersApplication.vue b/webapp/src/main/webapp/vue-apps/space-widget-members/components/SpaceMembersApplication.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-widget-members/components/SpaceMembersApplication.vue rename to webapp/src/main/webapp/vue-apps/space-widget-members/components/SpaceMembersApplication.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-widget-members/components/SpaceMembersDrawer.vue b/webapp/src/main/webapp/vue-apps/space-widget-members/components/SpaceMembersDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-widget-members/components/SpaceMembersDrawer.vue rename to webapp/src/main/webapp/vue-apps/space-widget-members/components/SpaceMembersDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-widget-members/initComponents.js b/webapp/src/main/webapp/vue-apps/space-widget-members/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/space-widget-members/initComponents.js rename to webapp/src/main/webapp/vue-apps/space-widget-members/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/space-widget-members/main.js b/webapp/src/main/webapp/vue-apps/space-widget-members/main.js similarity index 96% rename from webapp/portlet/src/main/webapp/vue-apps/space-widget-members/main.js rename to webapp/src/main/webapp/vue-apps/space-widget-members/main.js index 74cca3fcc87..7909d952549 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/space-widget-members/main.js +++ b/webapp/src/main/webapp/vue-apps/space-widget-members/main.js @@ -36,8 +36,8 @@ const lang = eXo && eXo.env.portal.language || 'en'; //should expose the locale ressources as REST API const urls = [ - `/social-portlet/i18n/locale.portlet.social.PeopleListApplication?lang=${lang}`, - `/social-portlet/i18n/locale.portlet.social.SpaceInfosPortlet?lang=${lang}` + `/social/i18n/locale.portlet.social.PeopleListApplication?lang=${lang}`, + `/social/i18n/locale.portlet.social.SpaceInfosPortlet?lang=${lang}` ]; const appId = 'SpaceMembersApplication'; diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-administration/components/ExoSpacesAdministrationBindingReports.vue b/webapp/src/main/webapp/vue-apps/spaces-administration/components/ExoSpacesAdministrationBindingReports.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/spaces-administration/components/ExoSpacesAdministrationBindingReports.vue rename to webapp/src/main/webapp/vue-apps/spaces-administration/components/ExoSpacesAdministrationBindingReports.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-administration/components/ExoSpacesAdministrationManageSpaces.vue b/webapp/src/main/webapp/vue-apps/spaces-administration/components/ExoSpacesAdministrationManageSpaces.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/spaces-administration/components/ExoSpacesAdministrationManageSpaces.vue rename to webapp/src/main/webapp/vue-apps/spaces-administration/components/ExoSpacesAdministrationManageSpaces.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-administration/components/ExoSpacesAdministrationSpaces.vue b/webapp/src/main/webapp/vue-apps/spaces-administration/components/ExoSpacesAdministrationSpaces.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/spaces-administration/components/ExoSpacesAdministrationSpaces.vue rename to webapp/src/main/webapp/vue-apps/spaces-administration/components/ExoSpacesAdministrationSpaces.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-administration/components/ExoSpacesAdministrationSpacesPermissions.vue b/webapp/src/main/webapp/vue-apps/spaces-administration/components/ExoSpacesAdministrationSpacesPermissions.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/spaces-administration/components/ExoSpacesAdministrationSpacesPermissions.vue rename to webapp/src/main/webapp/vue-apps/spaces-administration/components/ExoSpacesAdministrationSpacesPermissions.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-administration/components/drawer/ExoGroupBindingDrawer.vue b/webapp/src/main/webapp/vue-apps/spaces-administration/components/drawer/ExoGroupBindingDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/spaces-administration/components/drawer/ExoGroupBindingDrawer.vue rename to webapp/src/main/webapp/vue-apps/spaces-administration/components/drawer/ExoGroupBindingDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-administration/components/drawer/ExoGroupBindingSecondLevelDrawer.vue b/webapp/src/main/webapp/vue-apps/spaces-administration/components/drawer/ExoGroupBindingSecondLevelDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/spaces-administration/components/drawer/ExoGroupBindingSecondLevelDrawer.vue rename to webapp/src/main/webapp/vue-apps/spaces-administration/components/drawer/ExoGroupBindingSecondLevelDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-administration/components/modal/ExoSpacesAdministrationModal.vue b/webapp/src/main/webapp/vue-apps/spaces-administration/components/modal/ExoSpacesAdministrationModal.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/spaces-administration/components/modal/ExoSpacesAdministrationModal.vue rename to webapp/src/main/webapp/vue-apps/spaces-administration/components/modal/ExoSpacesAdministrationModal.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-administration/components/modal/SpaceHomeLayoutResetConfirm.vue b/webapp/src/main/webapp/vue-apps/spaces-administration/components/modal/SpaceHomeLayoutResetConfirm.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/spaces-administration/components/modal/SpaceHomeLayoutResetConfirm.vue rename to webapp/src/main/webapp/vue-apps/spaces-administration/components/modal/SpaceHomeLayoutResetConfirm.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-administration/initComponents.js b/webapp/src/main/webapp/vue-apps/spaces-administration/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/spaces-administration/initComponents.js rename to webapp/src/main/webapp/vue-apps/spaces-administration/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-administration/js/SpacesAdministrationServices.js b/webapp/src/main/webapp/vue-apps/spaces-administration/js/SpacesAdministrationServices.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/spaces-administration/js/SpacesAdministrationServices.js rename to webapp/src/main/webapp/vue-apps/spaces-administration/js/SpacesAdministrationServices.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-administration/main.js b/webapp/src/main/webapp/vue-apps/spaces-administration/main.js similarity index 88% rename from webapp/portlet/src/main/webapp/vue-apps/spaces-administration/main.js rename to webapp/src/main/webapp/vue-apps/spaces-administration/main.js index be7fc7edea6..3372ee80a70 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/spaces-administration/main.js +++ b/webapp/src/main/webapp/vue-apps/spaces-administration/main.js @@ -6,8 +6,8 @@ const lang = typeof eXo !== 'undefined' ? eXo.env.portal.language : 'en'; // should expose the locale ressources as REST API const urls = [ - `/social-portlet/i18n/locale.portlet.social.SpacesAdministrationPortlet?lang=${lang}`, - `/social-portlet/i18n/locale.portal.webui?lang=${lang}`, + `/social/i18n/locale.portlet.social.SpacesAdministrationPortlet?lang=${lang}`, + `/social/i18n/locale.portal.webui?lang=${lang}`, ]; // get overrided components if exists diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-administration/services.js b/webapp/src/main/webapp/vue-apps/spaces-administration/services.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/spaces-administration/services.js rename to webapp/src/main/webapp/vue-apps/spaces-administration/services.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceCard.vue b/webapp/src/main/webapp/vue-apps/spaces-list/components/SpaceCard.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceCard.vue rename to webapp/src/main/webapp/vue-apps/spaces-list/components/SpaceCard.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceCardButton.vue b/webapp/src/main/webapp/vue-apps/spaces-list/components/SpaceCardButton.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceCardButton.vue rename to webapp/src/main/webapp/vue-apps/spaces-list/components/SpaceCardButton.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceCardMenu.vue b/webapp/src/main/webapp/vue-apps/spaces-list/components/SpaceCardMenu.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceCardMenu.vue rename to webapp/src/main/webapp/vue-apps/spaces-list/components/SpaceCardMenu.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceCardMenuItem.vue b/webapp/src/main/webapp/vue-apps/spaces-list/components/SpaceCardMenuItem.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceCardMenuItem.vue rename to webapp/src/main/webapp/vue-apps/spaces-list/components/SpaceCardMenuItem.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceCardUnreadBadge.vue b/webapp/src/main/webapp/vue-apps/spaces-list/components/SpaceCardUnreadBadge.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceCardUnreadBadge.vue rename to webapp/src/main/webapp/vue-apps/spaces-list/components/SpaceCardUnreadBadge.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceFavoriteAction.vue b/webapp/src/main/webapp/vue-apps/spaces-list/components/SpaceFavoriteAction.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceFavoriteAction.vue rename to webapp/src/main/webapp/vue-apps/spaces-list/components/SpaceFavoriteAction.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceFormDrawer.vue b/webapp/src/main/webapp/vue-apps/spaces-list/components/SpaceFormDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceFormDrawer.vue rename to webapp/src/main/webapp/vue-apps/spaces-list/components/SpaceFormDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpacePendingButton.vue b/webapp/src/main/webapp/vue-apps/spaces-list/components/SpacePendingButton.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpacePendingButton.vue rename to webapp/src/main/webapp/vue-apps/spaces-list/components/SpacePendingButton.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpacePendingDrawer.vue b/webapp/src/main/webapp/vue-apps/spaces-list/components/SpacePendingDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpacePendingDrawer.vue rename to webapp/src/main/webapp/vue-apps/spaces-list/components/SpacePendingDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceRoleList.vue b/webapp/src/main/webapp/vue-apps/spaces-list/components/SpaceRoleList.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceRoleList.vue rename to webapp/src/main/webapp/vue-apps/spaces-list/components/SpaceRoleList.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceRoleListItem.vue b/webapp/src/main/webapp/vue-apps/spaces-list/components/SpaceRoleListItem.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpaceRoleListItem.vue rename to webapp/src/main/webapp/vue-apps/spaces-list/components/SpaceRoleListItem.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpacesCardList.vue b/webapp/src/main/webapp/vue-apps/spaces-list/components/SpacesCardList.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpacesCardList.vue rename to webapp/src/main/webapp/vue-apps/spaces-list/components/SpacesCardList.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpacesList.vue b/webapp/src/main/webapp/vue-apps/spaces-list/components/SpacesList.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpacesList.vue rename to webapp/src/main/webapp/vue-apps/spaces-list/components/SpacesList.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpacesListFilterDrawer.vue b/webapp/src/main/webapp/vue-apps/spaces-list/components/SpacesListFilterDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpacesListFilterDrawer.vue rename to webapp/src/main/webapp/vue-apps/spaces-list/components/SpacesListFilterDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpacesToolbar.vue b/webapp/src/main/webapp/vue-apps/spaces-list/components/SpacesToolbar.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/spaces-list/components/SpacesToolbar.vue rename to webapp/src/main/webapp/vue-apps/spaces-list/components/SpacesToolbar.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/initComponents.js b/webapp/src/main/webapp/vue-apps/spaces-list/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/spaces-list/initComponents.js rename to webapp/src/main/webapp/vue-apps/spaces-list/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/main.js b/webapp/src/main/webapp/vue-apps/spaces-list/main.js similarity index 96% rename from webapp/portlet/src/main/webapp/vue-apps/spaces-list/main.js rename to webapp/src/main/webapp/vue-apps/spaces-list/main.js index 639c122fc67..87edde2a67a 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/spaces-list/main.js +++ b/webapp/src/main/webapp/vue-apps/spaces-list/main.js @@ -22,7 +22,7 @@ document.dispatchEvent(new CustomEvent('displayTopBarLoading')); const lang = eXo && eXo.env.portal.language || 'en'; //should expose the locale ressources as REST API -const url = `/social-portlet/i18n/locale.portlet.social.SpacesListApplication?lang=${lang}`; +const url = `/social/i18n/locale.portlet.social.SpacesListApplication?lang=${lang}`; const appId = 'spacesListApplication'; diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-overview/components/SpacesOverview.vue b/webapp/src/main/webapp/vue-apps/spaces-overview/components/SpacesOverview.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/spaces-overview/components/SpacesOverview.vue rename to webapp/src/main/webapp/vue-apps/spaces-overview/components/SpacesOverview.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-overview/components/SpacesOverviewCard.vue b/webapp/src/main/webapp/vue-apps/spaces-overview/components/SpacesOverviewCard.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/spaces-overview/components/SpacesOverviewCard.vue rename to webapp/src/main/webapp/vue-apps/spaces-overview/components/SpacesOverviewCard.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-overview/components/SpacesOverviewDrawer.vue b/webapp/src/main/webapp/vue-apps/spaces-overview/components/SpacesOverviewDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/spaces-overview/components/SpacesOverviewDrawer.vue rename to webapp/src/main/webapp/vue-apps/spaces-overview/components/SpacesOverviewDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-overview/components/SpacesOverviewSpacesList.vue b/webapp/src/main/webapp/vue-apps/spaces-overview/components/SpacesOverviewSpacesList.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/spaces-overview/components/SpacesOverviewSpacesList.vue rename to webapp/src/main/webapp/vue-apps/spaces-overview/components/SpacesOverviewSpacesList.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-overview/components/SpacesOverviewSpacesListItem.vue b/webapp/src/main/webapp/vue-apps/spaces-overview/components/SpacesOverviewSpacesListItem.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/spaces-overview/components/SpacesOverviewSpacesListItem.vue rename to webapp/src/main/webapp/vue-apps/spaces-overview/components/SpacesOverviewSpacesListItem.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-overview/initComponents.js b/webapp/src/main/webapp/vue-apps/spaces-overview/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/spaces-overview/initComponents.js rename to webapp/src/main/webapp/vue-apps/spaces-overview/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/spaces-overview/main.js b/webapp/src/main/webapp/vue-apps/spaces-overview/main.js similarity index 90% rename from webapp/portlet/src/main/webapp/vue-apps/spaces-overview/main.js rename to webapp/src/main/webapp/vue-apps/spaces-overview/main.js index 7c04130315e..6385bc625a7 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/spaces-overview/main.js +++ b/webapp/src/main/webapp/vue-apps/spaces-overview/main.js @@ -14,7 +14,7 @@ if (extensionRegistry) { const lang = eXo && eXo.env.portal.language || 'en'; //should expose the locale ressources as REST API -const url = `/social-portlet/i18n/locale.portlet.social.SpacesOverview?lang=${lang}`; +const url = `/social/i18n/locale.portlet.social.SpacesOverview?lang=${lang}`; const appId = 'SpacesOverview'; diff --git a/webapp/portlet/src/main/webapp/vue-apps/suggestions-people-space/components/ExoSuggestionsPeopleAndSpace.vue b/webapp/src/main/webapp/vue-apps/suggestions-people-space/components/ExoSuggestionsPeopleAndSpace.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/suggestions-people-space/components/ExoSuggestionsPeopleAndSpace.vue rename to webapp/src/main/webapp/vue-apps/suggestions-people-space/components/ExoSuggestionsPeopleAndSpace.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/suggestions-people-space/components/ExoSuggestionsPeopleListItem.vue b/webapp/src/main/webapp/vue-apps/suggestions-people-space/components/ExoSuggestionsPeopleListItem.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/suggestions-people-space/components/ExoSuggestionsPeopleListItem.vue rename to webapp/src/main/webapp/vue-apps/suggestions-people-space/components/ExoSuggestionsPeopleListItem.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/suggestions-people-space/components/ExoSuggestionsSpaceListItem.vue b/webapp/src/main/webapp/vue-apps/suggestions-people-space/components/ExoSuggestionsSpaceListItem.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/suggestions-people-space/components/ExoSuggestionsSpaceListItem.vue rename to webapp/src/main/webapp/vue-apps/suggestions-people-space/components/ExoSuggestionsSpaceListItem.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/suggestions-people-space/initComponents.js b/webapp/src/main/webapp/vue-apps/suggestions-people-space/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/suggestions-people-space/initComponents.js rename to webapp/src/main/webapp/vue-apps/suggestions-people-space/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/suggestions-people-space/main.js b/webapp/src/main/webapp/vue-apps/suggestions-people-space/main.js similarity index 91% rename from webapp/portlet/src/main/webapp/vue-apps/suggestions-people-space/main.js rename to webapp/src/main/webapp/vue-apps/suggestions-people-space/main.js index 82b7851a79c..9c4821c822a 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/suggestions-people-space/main.js +++ b/webapp/src/main/webapp/vue-apps/suggestions-people-space/main.js @@ -4,7 +4,7 @@ import './initComponents.js'; const lang = typeof eXo !== 'undefined' ? eXo.env.portal.language : 'en'; // should expose the locale ressources as REST API -const url = `/social-portlet/i18n/locale.portlet.social.SuggestionsPortlet?lang=${lang}`; +const url = `/social/i18n/locale.portlet.social.SuggestionsPortlet?lang=${lang}`; // get overrided components if exists diff --git a/webapp/portlet/src/main/webapp/vue-apps/top-bar-login/components/TopBarLogin.vue b/webapp/src/main/webapp/vue-apps/top-bar-login/components/TopBarLogin.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/top-bar-login/components/TopBarLogin.vue rename to webapp/src/main/webapp/vue-apps/top-bar-login/components/TopBarLogin.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/top-bar-login/initComponents.js b/webapp/src/main/webapp/vue-apps/top-bar-login/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/top-bar-login/initComponents.js rename to webapp/src/main/webapp/vue-apps/top-bar-login/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/top-bar-login/main.js b/webapp/src/main/webapp/vue-apps/top-bar-login/main.js similarity index 95% rename from webapp/portlet/src/main/webapp/vue-apps/top-bar-login/main.js rename to webapp/src/main/webapp/vue-apps/top-bar-login/main.js index 134cceffedd..ae390043ee0 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/top-bar-login/main.js +++ b/webapp/src/main/webapp/vue-apps/top-bar-login/main.js @@ -21,7 +21,7 @@ import './initComponents.js'; //getting language of user const lang = window.eXo?.env?.portal?.language || 'en'; -const url = `/social-portlet/i18n/locale.portlet.Portlets?lang=${lang}`; +const url = `/social/i18n/locale.portlet.Portlets?lang=${lang}`; const appId = 'topbarLogin'; export function init(avatarUrl, canRegister, spaceRegistration, isMember, isPendingUser, isInvitedUser) { diff --git a/webapp/portlet/src/main/webapp/vue-apps/top-bar-menu/components/NavigationMenuItem.vue b/webapp/src/main/webapp/vue-apps/top-bar-menu/components/NavigationMenuItem.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/top-bar-menu/components/NavigationMenuItem.vue rename to webapp/src/main/webapp/vue-apps/top-bar-menu/components/NavigationMenuItem.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/top-bar-menu/components/NavigationMenuSubItem.vue b/webapp/src/main/webapp/vue-apps/top-bar-menu/components/NavigationMenuSubItem.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/top-bar-menu/components/NavigationMenuSubItem.vue rename to webapp/src/main/webapp/vue-apps/top-bar-menu/components/NavigationMenuSubItem.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/top-bar-menu/components/TopBarNavigationMenu.vue b/webapp/src/main/webapp/vue-apps/top-bar-menu/components/TopBarNavigationMenu.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/top-bar-menu/components/TopBarNavigationMenu.vue rename to webapp/src/main/webapp/vue-apps/top-bar-menu/components/TopBarNavigationMenu.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/top-bar-menu/components/mobile/NavigationMobileMenuItem.vue b/webapp/src/main/webapp/vue-apps/top-bar-menu/components/mobile/NavigationMobileMenuItem.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/top-bar-menu/components/mobile/NavigationMobileMenuItem.vue rename to webapp/src/main/webapp/vue-apps/top-bar-menu/components/mobile/NavigationMobileMenuItem.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/top-bar-menu/components/mobile/NavigationMobileMenuSubItem.vue b/webapp/src/main/webapp/vue-apps/top-bar-menu/components/mobile/NavigationMobileMenuSubItem.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/top-bar-menu/components/mobile/NavigationMobileMenuSubItem.vue rename to webapp/src/main/webapp/vue-apps/top-bar-menu/components/mobile/NavigationMobileMenuSubItem.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/top-bar-menu/initComponents.js b/webapp/src/main/webapp/vue-apps/top-bar-menu/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/top-bar-menu/initComponents.js rename to webapp/src/main/webapp/vue-apps/top-bar-menu/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/top-bar-menu/main.js b/webapp/src/main/webapp/vue-apps/top-bar-menu/main.js similarity index 96% rename from webapp/portlet/src/main/webapp/vue-apps/top-bar-menu/main.js rename to webapp/src/main/webapp/vue-apps/top-bar-menu/main.js index 881e774ac45..54d045bdc5b 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/top-bar-menu/main.js +++ b/webapp/src/main/webapp/vue-apps/top-bar-menu/main.js @@ -29,7 +29,7 @@ if (extensionRegistry) { //getting language of user const lang = eXo && eXo.env.portal.language || 'en'; -const url = `/social-portlet/i18n/locale.portlet.Portlets?lang=${lang}`; +const url = `/social/i18n/locale.portlet.Portlets?lang=${lang}`; const vuetify = Vue.prototype.vuetifyOptions; diff --git a/webapp/portlet/src/main/webapp/vue-apps/top-bar-preview/components/TopBarPreview.vue b/webapp/src/main/webapp/vue-apps/top-bar-preview/components/TopBarPreview.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/top-bar-preview/components/TopBarPreview.vue rename to webapp/src/main/webapp/vue-apps/top-bar-preview/components/TopBarPreview.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/top-bar-preview/initComponents.js b/webapp/src/main/webapp/vue-apps/top-bar-preview/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/top-bar-preview/initComponents.js rename to webapp/src/main/webapp/vue-apps/top-bar-preview/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/top-bar-preview/main.js b/webapp/src/main/webapp/vue-apps/top-bar-preview/main.js similarity index 94% rename from webapp/portlet/src/main/webapp/vue-apps/top-bar-preview/main.js rename to webapp/src/main/webapp/vue-apps/top-bar-preview/main.js index 019f4230018..c94aa001f28 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/top-bar-preview/main.js +++ b/webapp/src/main/webapp/vue-apps/top-bar-preview/main.js @@ -21,7 +21,7 @@ import './initComponents.js'; //getting language of user const lang = window.eXo?.env?.portal?.language || 'en'; -const url = `/social-portlet/i18n/locale.portlet.Portlets?lang=${lang}`; +const url = `/social/i18n/locale.portlet.Portlets?lang=${lang}`; const appId = 'topbarPreview'; export function init() { diff --git a/webapp/portlet/src/main/webapp/vue-apps/top-bar-publish-site/components/TopBarPublishSite.vue b/webapp/src/main/webapp/vue-apps/top-bar-publish-site/components/TopBarPublishSite.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/top-bar-publish-site/components/TopBarPublishSite.vue rename to webapp/src/main/webapp/vue-apps/top-bar-publish-site/components/TopBarPublishSite.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/top-bar-publish-site/initComponents.js b/webapp/src/main/webapp/vue-apps/top-bar-publish-site/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/top-bar-publish-site/initComponents.js rename to webapp/src/main/webapp/vue-apps/top-bar-publish-site/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/top-bar-publish-site/main.js b/webapp/src/main/webapp/vue-apps/top-bar-publish-site/main.js similarity index 95% rename from webapp/portlet/src/main/webapp/vue-apps/top-bar-publish-site/main.js rename to webapp/src/main/webapp/vue-apps/top-bar-publish-site/main.js index 51cd40d7149..c569d401bf6 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/top-bar-publish-site/main.js +++ b/webapp/src/main/webapp/vue-apps/top-bar-publish-site/main.js @@ -21,7 +21,7 @@ import './initComponents.js'; //getting language of user const lang = window.eXo?.env?.portal?.language || 'en'; -const url = `/social-portlet/i18n/locale.portlet.Portlets?lang=${lang}`; +const url = `/social/i18n/locale.portlet.Portlets?lang=${lang}`; const appId = 'topBarPublishSite'; export function init(publicMode, publicSiteId) { diff --git a/webapp/portlet/src/main/webapp/vue-apps/user-register-onboarding/components/OnboardingRegister.vue b/webapp/src/main/webapp/vue-apps/user-register-onboarding/components/OnboardingRegister.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/user-register-onboarding/components/OnboardingRegister.vue rename to webapp/src/main/webapp/vue-apps/user-register-onboarding/components/OnboardingRegister.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/user-register-onboarding/extensions.js b/webapp/src/main/webapp/vue-apps/user-register-onboarding/extensions.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/user-register-onboarding/extensions.js rename to webapp/src/main/webapp/vue-apps/user-register-onboarding/extensions.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/user-register-onboarding/initComponents.js b/webapp/src/main/webapp/vue-apps/user-register-onboarding/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/user-register-onboarding/initComponents.js rename to webapp/src/main/webapp/vue-apps/user-register-onboarding/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/user-register-onboarding/main.js b/webapp/src/main/webapp/vue-apps/user-register-onboarding/main.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/user-register-onboarding/main.js rename to webapp/src/main/webapp/vue-apps/user-register-onboarding/main.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/user-register/components/Register.vue b/webapp/src/main/webapp/vue-apps/user-register/components/Register.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/user-register/components/Register.vue rename to webapp/src/main/webapp/vue-apps/user-register/components/Register.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/user-register/components/RegisterExtensions.vue b/webapp/src/main/webapp/vue-apps/user-register/components/RegisterExtensions.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/user-register/components/RegisterExtensions.vue rename to webapp/src/main/webapp/vue-apps/user-register/components/RegisterExtensions.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/user-register/components/RegisterMain.vue b/webapp/src/main/webapp/vue-apps/user-register/components/RegisterMain.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/user-register/components/RegisterMain.vue rename to webapp/src/main/webapp/vue-apps/user-register/components/RegisterMain.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/user-register/components/RegisterSeparator.vue b/webapp/src/main/webapp/vue-apps/user-register/components/RegisterSeparator.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/user-register/components/RegisterSeparator.vue rename to webapp/src/main/webapp/vue-apps/user-register/components/RegisterSeparator.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/user-register/initComponents.js b/webapp/src/main/webapp/vue-apps/user-register/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/user-register/initComponents.js rename to webapp/src/main/webapp/vue-apps/user-register/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/user-register/main.js b/webapp/src/main/webapp/vue-apps/user-register/main.js similarity index 93% rename from webapp/portlet/src/main/webapp/vue-apps/user-register/main.js rename to webapp/src/main/webapp/vue-apps/user-register/main.js index 3bdcfdc408a..c4ddec4b694 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/user-register/main.js +++ b/webapp/src/main/webapp/vue-apps/user-register/main.js @@ -33,8 +33,8 @@ const lang = typeof eXo !== 'undefined' ? eXo.env.portal.language : 'en'; //should expose the locale ressources as REST API const urls = [ - `/social-portlet/i18n/locale.portlet.Login?lang=${lang}`, - `/social-portlet/i18n/locale.portal.login?lang=${lang}` + `/social/i18n/locale.portlet.Login?lang=${lang}`, + `/social/i18n/locale.portal.login?lang=${lang}` ]; export function init(params) { diff --git a/webapp/portlet/src/main/webapp/vue-apps/user-setting-language/components/UserLanguageDrawer.vue b/webapp/src/main/webapp/vue-apps/user-setting-language/components/UserLanguageDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/user-setting-language/components/UserLanguageDrawer.vue rename to webapp/src/main/webapp/vue-apps/user-setting-language/components/UserLanguageDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/user-setting-language/components/UserSettingLanguage.vue b/webapp/src/main/webapp/vue-apps/user-setting-language/components/UserSettingLanguage.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/user-setting-language/components/UserSettingLanguage.vue rename to webapp/src/main/webapp/vue-apps/user-setting-language/components/UserSettingLanguage.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/user-setting-language/initComponents.js b/webapp/src/main/webapp/vue-apps/user-setting-language/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/user-setting-language/initComponents.js rename to webapp/src/main/webapp/vue-apps/user-setting-language/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/user-setting-language/main.js b/webapp/src/main/webapp/vue-apps/user-setting-language/main.js similarity index 92% rename from webapp/portlet/src/main/webapp/vue-apps/user-setting-language/main.js rename to webapp/src/main/webapp/vue-apps/user-setting-language/main.js index b70b5168883..abcfb25ecf8 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/user-setting-language/main.js +++ b/webapp/src/main/webapp/vue-apps/user-setting-language/main.js @@ -16,7 +16,7 @@ document.dispatchEvent(new CustomEvent('displayTopBarLoading')); const lang = eXo && eXo.env.portal.language || 'en'; //should expose the locale ressources as REST API -const url = `/social-portlet/i18n/locale.portlet.social.UserSettings?lang=${lang}`; +const url = `/social/i18n/locale.portlet.social.UserSettings?lang=${lang}`; const appId = 'UserSettingLanguage'; diff --git a/webapp/portlet/src/main/webapp/vue-apps/user-setting-security/components/UserSettingSecurity.vue b/webapp/src/main/webapp/vue-apps/user-setting-security/components/UserSettingSecurity.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/user-setting-security/components/UserSettingSecurity.vue rename to webapp/src/main/webapp/vue-apps/user-setting-security/components/UserSettingSecurity.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/user-setting-security/components/UserSettingSecurityWindow.vue b/webapp/src/main/webapp/vue-apps/user-setting-security/components/UserSettingSecurityWindow.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/user-setting-security/components/UserSettingSecurityWindow.vue rename to webapp/src/main/webapp/vue-apps/user-setting-security/components/UserSettingSecurityWindow.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/user-setting-security/initComponents.js b/webapp/src/main/webapp/vue-apps/user-setting-security/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/user-setting-security/initComponents.js rename to webapp/src/main/webapp/vue-apps/user-setting-security/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/user-setting-security/main.js b/webapp/src/main/webapp/vue-apps/user-setting-security/main.js similarity index 92% rename from webapp/portlet/src/main/webapp/vue-apps/user-setting-security/main.js rename to webapp/src/main/webapp/vue-apps/user-setting-security/main.js index fa3d88939a2..1f50917edcf 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/user-setting-security/main.js +++ b/webapp/src/main/webapp/vue-apps/user-setting-security/main.js @@ -13,7 +13,7 @@ if (extensionRegistry) { const lang = eXo && eXo.env.portal.language || 'en'; //should expose the locale ressources as REST API -const url = `/social-portlet/i18n/locale.portlet.social.UserSettings?lang=${lang}`; +const url = `/social/i18n/locale.portlet.social.UserSettings?lang=${lang}`; const appId = 'UserSettingSecurity'; diff --git a/webapp/portlet/src/main/webapp/vue-apps/version-history-drawer/components/VersionCard.vue b/webapp/src/main/webapp/vue-apps/version-history-drawer/components/VersionCard.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/version-history-drawer/components/VersionCard.vue rename to webapp/src/main/webapp/vue-apps/version-history-drawer/components/VersionCard.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/version-history-drawer/components/VersionHistoryDrawer.vue b/webapp/src/main/webapp/vue-apps/version-history-drawer/components/VersionHistoryDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/version-history-drawer/components/VersionHistoryDrawer.vue rename to webapp/src/main/webapp/vue-apps/version-history-drawer/components/VersionHistoryDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/version-history-drawer/initComponents.js b/webapp/src/main/webapp/vue-apps/version-history-drawer/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/version-history-drawer/initComponents.js rename to webapp/src/main/webapp/vue-apps/version-history-drawer/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/version-history-drawer/main.js b/webapp/src/main/webapp/vue-apps/version-history-drawer/main.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/version-history-drawer/main.js rename to webapp/src/main/webapp/vue-apps/version-history-drawer/main.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/vertical-menu/components/VerticalMenuApp.vue b/webapp/src/main/webapp/vue-apps/vertical-menu/components/VerticalMenuApp.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/vertical-menu/components/VerticalMenuApp.vue rename to webapp/src/main/webapp/vue-apps/vertical-menu/components/VerticalMenuApp.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/vertical-menu/components/VerticalMenuButton.vue b/webapp/src/main/webapp/vue-apps/vertical-menu/components/VerticalMenuButton.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/vertical-menu/components/VerticalMenuButton.vue rename to webapp/src/main/webapp/vue-apps/vertical-menu/components/VerticalMenuButton.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/vertical-menu/components/VerticalMenuContent.vue b/webapp/src/main/webapp/vue-apps/vertical-menu/components/VerticalMenuContent.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/vertical-menu/components/VerticalMenuContent.vue rename to webapp/src/main/webapp/vue-apps/vertical-menu/components/VerticalMenuContent.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/vertical-menu/components/VerticalMenuDrawer.vue b/webapp/src/main/webapp/vue-apps/vertical-menu/components/VerticalMenuDrawer.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/vertical-menu/components/VerticalMenuDrawer.vue rename to webapp/src/main/webapp/vue-apps/vertical-menu/components/VerticalMenuDrawer.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/vertical-menu/initComponents.js b/webapp/src/main/webapp/vue-apps/vertical-menu/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/vertical-menu/initComponents.js rename to webapp/src/main/webapp/vue-apps/vertical-menu/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/vertical-menu/main.js b/webapp/src/main/webapp/vue-apps/vertical-menu/main.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/vertical-menu/main.js rename to webapp/src/main/webapp/vue-apps/vertical-menu/main.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/who-is-online-app/components/ExoWhoIsOnline.vue b/webapp/src/main/webapp/vue-apps/who-is-online-app/components/ExoWhoIsOnline.vue similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/who-is-online-app/components/ExoWhoIsOnline.vue rename to webapp/src/main/webapp/vue-apps/who-is-online-app/components/ExoWhoIsOnline.vue diff --git a/webapp/portlet/src/main/webapp/vue-apps/who-is-online-app/components/initComponents.js b/webapp/src/main/webapp/vue-apps/who-is-online-app/components/initComponents.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/who-is-online-app/components/initComponents.js rename to webapp/src/main/webapp/vue-apps/who-is-online-app/components/initComponents.js diff --git a/webapp/portlet/src/main/webapp/vue-apps/who-is-online-app/main.js b/webapp/src/main/webapp/vue-apps/who-is-online-app/main.js similarity index 94% rename from webapp/portlet/src/main/webapp/vue-apps/who-is-online-app/main.js rename to webapp/src/main/webapp/vue-apps/who-is-online-app/main.js index 433d34966a4..163509fc948 100644 --- a/webapp/portlet/src/main/webapp/vue-apps/who-is-online-app/main.js +++ b/webapp/src/main/webapp/vue-apps/who-is-online-app/main.js @@ -4,7 +4,7 @@ import './components/initComponents.js'; const lang = `${Vue.prototype.$spacesConstants.LANG}`; // should expose the locale ressources as REST API -const url = `/social-portlet/i18n/locale.portlet.whoisonline.whoisonline?lang=${lang}`; +const url = `/social/i18n/locale.portlet.whoisonline.whoisonline?lang=${lang}`; // get overrided components if exists if (extensionRegistry) { diff --git a/webapp/portlet/src/main/webapp/vue-apps/who-is-online-app/whoIsOnlineServices.js b/webapp/src/main/webapp/vue-apps/who-is-online-app/whoIsOnlineServices.js similarity index 100% rename from webapp/portlet/src/main/webapp/vue-apps/who-is-online-app/whoIsOnlineServices.js rename to webapp/src/main/webapp/vue-apps/who-is-online-app/whoIsOnlineServices.js diff --git a/webapp/portlet/webpack.common.js b/webapp/webpack.common.js similarity index 100% rename from webapp/portlet/webpack.common.js rename to webapp/webpack.common.js diff --git a/webapp/portlet/webpack.dev.js b/webapp/webpack.dev.js similarity index 94% rename from webapp/portlet/webpack.dev.js rename to webapp/webpack.dev.js index 06a9589f4ba..d0a8986cc38 100644 --- a/webapp/portlet/webpack.dev.js +++ b/webapp/webpack.dev.js @@ -3,7 +3,7 @@ const { merge } = require('webpack-merge'); const webpackCommonConfig = require('./webpack.common.js'); // the display name of the war -const app = 'social-portlet'; +const app = 'social'; // add the server path to your server location path const exoServerPath = "/exo-server"; diff --git a/webapp/portlet/webpack.prod.js b/webapp/webpack.prod.js similarity index 92% rename from webapp/portlet/webpack.prod.js rename to webapp/webpack.prod.js index 20fb49cdcef..534db14258d 100644 --- a/webapp/portlet/webpack.prod.js +++ b/webapp/webpack.prod.js @@ -3,7 +3,7 @@ const { merge } = require('webpack-merge'); const webpackCommonConfig = require('./webpack.common.js'); // the display name of the war -const app = 'social-portlet'; +const app = 'social'; const config = merge(webpackCommonConfig, { output: { From ec487b73820301ca1cc5a4549713bb4e4db684a0 Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Wed, 16 Oct 2024 16:43:48 +0100 Subject: [PATCH 02/18] feat: Add Space Template Management Backoffice - MEED-7607 - Meeds-io/MIPs#150 (#4118) This change will add a new portlet for Space Template Management with its Backend using spring Beans. --- .../service/TranslationService.java | 17 + .../social/core/space/SpaceTemplate.java | 3 + .../space/SpacesAdministrationService.java | 16 +- .../social/core/space/model/Space.java | 4 + .../social/core/space/spi/SpaceService.java | 8 + .../social/core/storage/api/SpaceStorage.java | 8 + .../meeds/social/space/constant/Priority.java | 25 + .../space/constant/PublicSiteVisibility.java | 25 + .../social/space/constant/Registration.java | 25 + .../social/space/constant/Visibility.java | 25 + .../space/template/dao/SpaceTemplateDAO.java | 36 + .../template/entity/SpaceTemplateEntity.java | 93 + .../space/template/model/SpaceTemplate.java | 67 + .../template/model/SpaceTemplateFilter.java | 38 + .../SpaceTemplateBannerAttachmentPlugin.java | 88 + .../SpaceTemplateTranslationPlugin.java | 83 + .../service/SpaceTemplateService.java | 220 ++ .../storage/SpaceTemplateStorage.java | 87 + .../space/template/utils/EntityMapper.java | 79 + .../service/TranslationServiceImpl.java | 48 +- .../jpa/storage/EntityConverterUtils.java | 23 +- .../jpa/storage/RDBMSSpaceStorageImpl.java | 49 +- .../social/core/jpa/storage/dao/SpaceDAO.java | 9 + .../jpa/storage/dao/jpa/SpaceDAOImpl.java | 31 +- .../dao/jpa/query/SpaceQueryBuilder.java | 5 +- .../core/jpa/storage/entity/SpaceEntity.java | 124 +- .../impl/DefaultSpaceApplicationHandler.java | 2 +- .../core/space/impl/SpaceServiceImpl.java | 88 +- .../impl/SpacesAdministrationServiceImpl.java | 15 + .../social/core/storage/cache/CacheType.java | 5 +- .../storage/cache/CachedSpaceStorage.java | 381 +-- .../cache/SocialStorageCacheService.java | 10 +- .../social-rdbms.db.changelog-1.0.0.xml | 35 + .../social-rdbms.db.changelog-master.xml | 29 - .../core/src/main/resources/jpa-entities.idx | 1 + ...aceTemplateBannerAttachmentPluginTest.java | 113 + .../SpaceTemplateTranslationPluginTest.java | 102 + .../service/SpaceTemplateServiceTest.java | 246 ++ .../storage/SpaceTemplateStorageTest.java | 184 ++ .../core/jpa/storage/dao/SpaceDAOTest.java | 9 +- .../jpa/storage/dao/SpaceMemberDAOTest.java | 9 +- .../core/test/NoContainerTestSuite.java | 8 + .../template/rest/SpaceTemplateRest.java | 164 + .../social/rest/impl/space/SpaceRest.java | 13 + .../spacetemplates/SpaceTemplatesRest.java | 6 +- .../activity/ActivityRestResourcesTest.java | 5 +- .../test/MockSpacesAdministrationService.java | 29 +- crowdin.yml | 78 +- translations.properties | 59 - webapp/package-lock.json | 2887 ++++++++++++++++- webapp/package.json | 2 +- .../io/meeds/social/SocialApplication.java | 42 + .../SpaceTemplatesManagement_en.properties | 33 + webapp/src/main/resources/social.properties | 18 + .../main/webapp/WEB-INF/gatein-resources.xml | 32 + webapp/src/main/webapp/WEB-INF/portlet.xml | 22 + .../webapp/html/spaceTemplateManagement.html | 9 + .../webapp/vue-apps/common/js/SpaceService.js | 13 + .../components/SpaceTemplatesManagement.vue | 43 + .../components/header/Toolbar.vue | 50 + .../components/list/SpaceTemplateItem.vue | 103 + .../components/list/SpaceTemplateItemMenu.vue | 158 + .../components/list/SpaceTemplates.vue | 169 + .../initComponents.js | 37 + .../js/SpaceTemplateService.js | 87 + .../space-templates-management/main.js | 57 + .../space-templates-management/services.js | 26 + webapp/webpack.common.js | 1 + 68 files changed, 6086 insertions(+), 530 deletions(-) create mode 100644 component/core/src/main/java/io/meeds/social/space/constant/Priority.java create mode 100644 component/core/src/main/java/io/meeds/social/space/constant/PublicSiteVisibility.java create mode 100644 component/core/src/main/java/io/meeds/social/space/constant/Registration.java create mode 100644 component/core/src/main/java/io/meeds/social/space/constant/Visibility.java create mode 100644 component/core/src/main/java/io/meeds/social/space/template/dao/SpaceTemplateDAO.java create mode 100644 component/core/src/main/java/io/meeds/social/space/template/entity/SpaceTemplateEntity.java create mode 100644 component/core/src/main/java/io/meeds/social/space/template/model/SpaceTemplate.java create mode 100644 component/core/src/main/java/io/meeds/social/space/template/model/SpaceTemplateFilter.java create mode 100644 component/core/src/main/java/io/meeds/social/space/template/plugin/attachment/SpaceTemplateBannerAttachmentPlugin.java create mode 100644 component/core/src/main/java/io/meeds/social/space/template/plugin/translation/SpaceTemplateTranslationPlugin.java create mode 100644 component/core/src/main/java/io/meeds/social/space/template/service/SpaceTemplateService.java create mode 100644 component/core/src/main/java/io/meeds/social/space/template/storage/SpaceTemplateStorage.java create mode 100644 component/core/src/main/java/io/meeds/social/space/template/utils/EntityMapper.java delete mode 100644 component/core/src/main/resources/db/changelog/social-rdbms.db.changelog-master.xml create mode 100644 component/core/src/test/java/io/meeds/social/space/template/plugin/attachment/SpaceTemplateBannerAttachmentPluginTest.java create mode 100644 component/core/src/test/java/io/meeds/social/space/template/plugin/translation/SpaceTemplateTranslationPluginTest.java create mode 100644 component/core/src/test/java/io/meeds/social/space/template/service/SpaceTemplateServiceTest.java create mode 100644 component/core/src/test/java/io/meeds/social/space/template/storage/SpaceTemplateStorageTest.java create mode 100644 component/service/src/main/java/io/meeds/social/space/template/rest/SpaceTemplateRest.java delete mode 100644 translations.properties create mode 100644 webapp/src/main/java/io/meeds/social/SocialApplication.java create mode 100644 webapp/src/main/resources/locale/portlet/SpaceTemplatesManagement_en.properties create mode 100644 webapp/src/main/resources/social.properties create mode 100644 webapp/src/main/webapp/html/spaceTemplateManagement.html create mode 100644 webapp/src/main/webapp/vue-apps/space-templates-management/components/SpaceTemplatesManagement.vue create mode 100644 webapp/src/main/webapp/vue-apps/space-templates-management/components/header/Toolbar.vue create mode 100644 webapp/src/main/webapp/vue-apps/space-templates-management/components/list/SpaceTemplateItem.vue create mode 100644 webapp/src/main/webapp/vue-apps/space-templates-management/components/list/SpaceTemplateItemMenu.vue create mode 100644 webapp/src/main/webapp/vue-apps/space-templates-management/components/list/SpaceTemplates.vue create mode 100644 webapp/src/main/webapp/vue-apps/space-templates-management/initComponents.js create mode 100644 webapp/src/main/webapp/vue-apps/space-templates-management/js/SpaceTemplateService.js create mode 100644 webapp/src/main/webapp/vue-apps/space-templates-management/main.js create mode 100644 webapp/src/main/webapp/vue-apps/space-templates-management/services.js diff --git a/component/api/src/main/java/io/meeds/social/translation/service/TranslationService.java b/component/api/src/main/java/io/meeds/social/translation/service/TranslationService.java index 33b3bae9498..66bb2effccd 100644 --- a/component/api/src/main/java/io/meeds/social/translation/service/TranslationService.java +++ b/component/api/src/main/java/io/meeds/social/translation/service/TranslationService.java @@ -87,6 +87,22 @@ String getTranslationLabel(String objectType, String fieldName, Locale locale); + /** + * Retrieves the Translation Label for a given field of an Object (identified + * by its type and id) with a designated {@link Locale}. not. + * + * @param objectType Object type for which the Translation Metadata will be + * attached + * @param objectId Object unique identifier + * @param fieldName Object field + * @param locale {@link Locale} + * @return the translated label for a given {@link Locale} + */ + String getTranslationLabelOrDefault(String objectType, + long objectId, + String fieldName, + Locale locale); + /** * Saves Translation Labels for a given Object's field. This will replace any * existing list of translations @@ -201,4 +217,5 @@ void deleteTranslationLabel(String objectType, * @param objectType Object type */ void removePlugin(String objectType); + } diff --git a/component/api/src/main/java/org/exoplatform/social/core/space/SpaceTemplate.java b/component/api/src/main/java/org/exoplatform/social/core/space/SpaceTemplate.java index 68319e66994..e319343d61e 100644 --- a/component/api/src/main/java/org/exoplatform/social/core/space/SpaceTemplate.java +++ b/component/api/src/main/java/org/exoplatform/social/core/space/SpaceTemplate.java @@ -28,10 +28,13 @@ /** * Definition of space template model. + * @deprecated will be replaced by a managed/stored Space Template */ @NoArgsConstructor @AllArgsConstructor +@Deprecated(forRemoval = true, since = "7.0") public class SpaceTemplate implements Cloneable { + private String name; private String resolvedLabel; diff --git a/component/api/src/main/java/org/exoplatform/social/core/space/SpacesAdministrationService.java b/component/api/src/main/java/org/exoplatform/social/core/space/SpacesAdministrationService.java index c461f951524..e944c9c87a4 100644 --- a/component/api/src/main/java/org/exoplatform/social/core/space/SpacesAdministrationService.java +++ b/component/api/src/main/java/org/exoplatform/social/core/space/SpacesAdministrationService.java @@ -1,10 +1,9 @@ package org.exoplatform.social.core.space; -import org.exoplatform.services.security.MembershipEntry; -import org.exoplatform.social.core.space.model.Space; - import java.util.List; +import org.exoplatform.services.security.MembershipEntry; + /** * Service to manage administration of spaces */ @@ -45,4 +44,15 @@ public interface SpacesAdministrationService { */ boolean canCreateSpace(String username) ; + /** + * Checks if the user is a super manager of all spaces + * + * @param username user name + * @return true if the user is member of super administrators groups, else + * false + */ + default boolean isSuperManager(String username) { + throw new UnsupportedOperationException(); + } + } diff --git a/component/api/src/main/java/org/exoplatform/social/core/space/model/Space.java b/component/api/src/main/java/org/exoplatform/social/core/space/model/Space.java index da1d86b8cf0..96812744cbe 100644 --- a/component/api/src/main/java/org/exoplatform/social/core/space/model/Space.java +++ b/component/api/src/main/java/org/exoplatform/social/core/space/model/Space.java @@ -67,6 +67,10 @@ public class Space implements CacheEntry { /** The template. */ private String template; + @Getter + @Setter + private long templateId; + /** The url. */ private String url; diff --git a/component/api/src/main/java/org/exoplatform/social/core/space/spi/SpaceService.java b/component/api/src/main/java/org/exoplatform/social/core/space/spi/SpaceService.java index a5efe90ede9..0ceedf92b7f 100644 --- a/component/api/src/main/java/org/exoplatform/social/core/space/spi/SpaceService.java +++ b/component/api/src/main/java/org/exoplatform/social/core/space/spi/SpaceService.java @@ -18,6 +18,7 @@ import java.time.Instant; import java.util.List; +import java.util.Map; import org.exoplatform.commons.exception.ObjectNotFoundException; import org.exoplatform.commons.utils.ListAccess; @@ -1255,4 +1256,11 @@ default String getSpacePublicSiteName(Space space) { throw new UnsupportedOperationException(); } + /** + * @return the count of spaces by Space Template identifier + */ + default Map countSpacesByTemplate() { + throw new UnsupportedOperationException(); + } + } diff --git a/component/api/src/main/java/org/exoplatform/social/core/storage/api/SpaceStorage.java b/component/api/src/main/java/org/exoplatform/social/core/storage/api/SpaceStorage.java index b114b125114..1d1b537c30b 100644 --- a/component/api/src/main/java/org/exoplatform/social/core/storage/api/SpaceStorage.java +++ b/component/api/src/main/java/org/exoplatform/social/core/storage/api/SpaceStorage.java @@ -25,6 +25,7 @@ import java.time.Instant; import java.util.List; +import java.util.Map; /** * @author Alain Defrance @@ -852,4 +853,11 @@ default int countCommonSpaces(String userId, String otherUserId){ default Instant getSpaceMembershipDate(long spaceId, String username) { throw new UnsupportedOperationException(); } + + /** + * @return the count of spaces by Space Template identifier + */ + default Map countSpacesByTemplate() { + throw new UnsupportedOperationException(); + } } diff --git a/component/core/src/main/java/io/meeds/social/space/constant/Priority.java b/component/core/src/main/java/io/meeds/social/space/constant/Priority.java new file mode 100644 index 00000000000..0d01f8dd464 --- /dev/null +++ b/component/core/src/main/java/io/meeds/social/space/constant/Priority.java @@ -0,0 +1,25 @@ +/* + * This file is part of the Meeds project (https://meeds.io/). + * + * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ +package io.meeds.social.space.constant; + +public enum Priority { + HIGH, INTERMEDIATE, LOW +} diff --git a/component/core/src/main/java/io/meeds/social/space/constant/PublicSiteVisibility.java b/component/core/src/main/java/io/meeds/social/space/constant/PublicSiteVisibility.java new file mode 100644 index 00000000000..83710deb8c7 --- /dev/null +++ b/component/core/src/main/java/io/meeds/social/space/constant/PublicSiteVisibility.java @@ -0,0 +1,25 @@ +/* + * This file is part of the Meeds project (https://meeds.io/). + * + * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ +package io.meeds.social.space.constant; + +public enum PublicSiteVisibility { + MANAGER, MEMBER, INTERNAL, AUTHENTICATED, EVERYONE; +} diff --git a/component/core/src/main/java/io/meeds/social/space/constant/Registration.java b/component/core/src/main/java/io/meeds/social/space/constant/Registration.java new file mode 100644 index 00000000000..609eebb7784 --- /dev/null +++ b/component/core/src/main/java/io/meeds/social/space/constant/Registration.java @@ -0,0 +1,25 @@ +/* + * This file is part of the Meeds project (https://meeds.io/). + * + * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ +package io.meeds.social.space.constant; + +public enum Registration { + OPEN, VALIDATION, CLOSED +} \ No newline at end of file diff --git a/component/core/src/main/java/io/meeds/social/space/constant/Visibility.java b/component/core/src/main/java/io/meeds/social/space/constant/Visibility.java new file mode 100644 index 00000000000..ca83fef668e --- /dev/null +++ b/component/core/src/main/java/io/meeds/social/space/constant/Visibility.java @@ -0,0 +1,25 @@ +/* + * This file is part of the Meeds project (https://meeds.io/). + * + * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * + */ +package io.meeds.social.space.constant; + +public enum Visibility { + PUBLIC, PRIVATE, HIDDEN +} diff --git a/component/core/src/main/java/io/meeds/social/space/template/dao/SpaceTemplateDAO.java b/component/core/src/main/java/io/meeds/social/space/template/dao/SpaceTemplateDAO.java new file mode 100644 index 00000000000..314be208462 --- /dev/null +++ b/component/core/src/main/java/io/meeds/social/space/template/dao/SpaceTemplateDAO.java @@ -0,0 +1,36 @@ +/** + * This file is part of the Meeds project (https://meeds.io/). + * + * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package io.meeds.social.space.template.dao; + +import java.util.List; + +import org.springframework.data.domain.Pageable; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import io.meeds.social.space.template.entity.SpaceTemplateEntity; + +@Repository +public interface SpaceTemplateDAO extends JpaRepository { + + List findByDeletedFalse(Pageable pageable); + + List findByDeletedFalseAndEnabledTrue(Pageable pageable); + +} diff --git a/component/core/src/main/java/io/meeds/social/space/template/entity/SpaceTemplateEntity.java b/component/core/src/main/java/io/meeds/social/space/template/entity/SpaceTemplateEntity.java new file mode 100644 index 00000000000..1e41443c3aa --- /dev/null +++ b/component/core/src/main/java/io/meeds/social/space/template/entity/SpaceTemplateEntity.java @@ -0,0 +1,93 @@ +/** + * This file is part of the Meeds project (https://meeds.io/). + * + * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package io.meeds.social.space.template.entity; + +import java.util.List; + +import org.exoplatform.commons.utils.StringListConverter; + +import io.meeds.social.space.constant.Registration; +import io.meeds.social.space.constant.Visibility; + +import jakarta.persistence.Column; +import jakarta.persistence.Convert; +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Entity(name = "SpaceTemplate") +@Table(name = "SOC_SPACE_TEMPLATES") +@Data +@NoArgsConstructor +@AllArgsConstructor +public class SpaceTemplateEntity { + + @Id + @SequenceGenerator(name = "SEQ_SOC_SPACE_TEMPLATE_ID", sequenceName = "SEQ_SOC_SPACE_TEMPLATE_ID", allocationSize = 1) + @GeneratedValue(strategy = GenerationType.AUTO, generator = "SEQ_SOC_SPACE_TEMPLATE_ID") + @Column(name = "ID") + private Long id; + + @Column(name = "ICON") + private String icon; + + @Column(name = "ENABLED") + private boolean enabled; + + @Column(name = "DELETED") + private boolean deleted; + + @Column(name = "IS_SYSTEM") + private boolean system; + + @Column(name = "TEMPLATE_ORDER") + private long order; + + @Convert(converter = StringListConverter.class) + @Column(name = "PERMISSIONS") + private List permissions; + + @Convert(converter = StringListConverter.class) + @Column(name = "SPACE_LAYOUT_PERMISSIONS") + private List spaceLayoutPermissions; + + @Convert(converter = StringListConverter.class) + @Column(name = "SPACE_DELETE_PERMISSIONS") + private List spaceDeletePermissions; + + @Convert(converter = StringListConverter.class) + @Column(name = "SPACE_FIELDS") + private List spaceFields; + + @Column(name = "SPACE_DEFAULT_VISIBILITY") + private Visibility spaceDefaultVisibility; + + @Column(name = "SPACE_DEFAULT_ACCESS") + private Registration spaceDefaultRegistration; + + @Column(name = "SPACE_ALLOW_CONTENT_CREATION") + private boolean spaceAllowContentCreation; + +} diff --git a/component/core/src/main/java/io/meeds/social/space/template/model/SpaceTemplate.java b/component/core/src/main/java/io/meeds/social/space/template/model/SpaceTemplate.java new file mode 100644 index 00000000000..d4bfcc00a68 --- /dev/null +++ b/component/core/src/main/java/io/meeds/social/space/template/model/SpaceTemplate.java @@ -0,0 +1,67 @@ +/** + * This file is part of the Meeds project (https://meeds.io/). + * + * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package io.meeds.social.space.template.model; + +import java.util.List; + +import io.meeds.social.space.constant.Registration; +import io.meeds.social.space.constant.Visibility; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class SpaceTemplate { + + private long id; + + private String name; + + private String description; + + private long bannerFileId; + + private String icon; + + private boolean enabled; + + private boolean deleted; + + private boolean system; + + private long order; + + private List permissions; + + private List spaceLayoutPermissions; + + private List spaceDeletePermissions; + + private List spaceFields; + + private Visibility spaceDefaultVisibility; + + private Registration spaceDefaultRegistration; + + private boolean spaceAllowContentCreation; + +} diff --git a/component/core/src/main/java/io/meeds/social/space/template/model/SpaceTemplateFilter.java b/component/core/src/main/java/io/meeds/social/space/template/model/SpaceTemplateFilter.java new file mode 100644 index 00000000000..5d7bd2c8ebd --- /dev/null +++ b/component/core/src/main/java/io/meeds/social/space/template/model/SpaceTemplateFilter.java @@ -0,0 +1,38 @@ +/** + * This file is part of the Meeds project (https://meeds.io/). + * + * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package io.meeds.social.space.template.model; + +import java.util.Locale; + +import lombok.AllArgsConstructor; +import lombok.Data; +import lombok.NoArgsConstructor; + +@Data +@NoArgsConstructor +@AllArgsConstructor +public class SpaceTemplateFilter { + + private String username; + + private Locale locale; + + private boolean includeDisabled; + +} diff --git a/component/core/src/main/java/io/meeds/social/space/template/plugin/attachment/SpaceTemplateBannerAttachmentPlugin.java b/component/core/src/main/java/io/meeds/social/space/template/plugin/attachment/SpaceTemplateBannerAttachmentPlugin.java new file mode 100644 index 00000000000..de551ab63b1 --- /dev/null +++ b/component/core/src/main/java/io/meeds/social/space/template/plugin/attachment/SpaceTemplateBannerAttachmentPlugin.java @@ -0,0 +1,88 @@ +/** + * This file is part of the Meeds project (https://meeds.io/). + * + * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package io.meeds.social.space.template.plugin.attachment; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.Ordered; +import org.springframework.core.annotation.Order; +import org.springframework.stereotype.Component; + +import org.exoplatform.commons.exception.ObjectNotFoundException; +import org.exoplatform.services.security.Identity; +import org.exoplatform.social.attachment.AttachmentPlugin; +import org.exoplatform.social.attachment.AttachmentService; + +import io.meeds.social.space.template.service.SpaceTemplateService; + +import jakarta.annotation.PostConstruct; + +@Component +@Order(Ordered.HIGHEST_PRECEDENCE) +public class SpaceTemplateBannerAttachmentPlugin extends AttachmentPlugin { + + public static final String OBJECT_TYPE = "spaceTemplateBanner"; + + @Autowired + protected SpaceTemplateService spaceTemplateService; + + @Autowired + protected AttachmentService attachmentService; + + @PostConstruct + public void init() { + attachmentService.addPlugin(this); + } + + @Override + public String getObjectType() { + return OBJECT_TYPE; + } + + @Override + public boolean hasEditPermission(Identity userIdentity, String entityId) throws ObjectNotFoundException { + if (userIdentity == null) { + return false; + } + return spaceTemplateService.canManageTemplates(userIdentity.getUserId()); + } + + @Override + public boolean hasAccessPermission(Identity userIdentity, String entityId) throws ObjectNotFoundException { + if (entityId == null || userIdentity == null) { + return false; + } + long templateId = Long.parseLong(entityId); + String username = userIdentity.getUserId(); + if (spaceTemplateService.getSpaceTemplate(templateId) == null) { + throw new ObjectNotFoundException(String.format("Space Template with id %s not found", templateId)); + } + return spaceTemplateService.canViewTemplate(templateId, username); + } + + @Override + public long getAudienceId(String objectId) throws ObjectNotFoundException { + return 0; + } + + @Override + public long getSpaceId(String objectId) throws ObjectNotFoundException { + return 0; + } + +} diff --git a/component/core/src/main/java/io/meeds/social/space/template/plugin/translation/SpaceTemplateTranslationPlugin.java b/component/core/src/main/java/io/meeds/social/space/template/plugin/translation/SpaceTemplateTranslationPlugin.java new file mode 100644 index 00000000000..65c2604d839 --- /dev/null +++ b/component/core/src/main/java/io/meeds/social/space/template/plugin/translation/SpaceTemplateTranslationPlugin.java @@ -0,0 +1,83 @@ +/** + * This file is part of the Meeds project (https://meeds.io/). + * + * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package io.meeds.social.space.template.plugin.translation; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.core.Ordered; +import org.springframework.core.annotation.Order; +import org.springframework.stereotype.Component; + +import org.exoplatform.commons.exception.ObjectNotFoundException; + +import io.meeds.social.space.template.service.SpaceTemplateService; +import io.meeds.social.translation.plugin.TranslationPlugin; +import io.meeds.social.translation.service.TranslationService; + +import jakarta.annotation.PostConstruct; + +@Component +@Order(Ordered.HIGHEST_PRECEDENCE) +public class SpaceTemplateTranslationPlugin extends TranslationPlugin { + + public static final String OBJECT_TYPE = "spaceTemplate"; + + public static final String DESCRIPTION_FIELD_NAME = "description"; + + public static final String TITLE_FIELD_NAME = "title"; + + @Autowired + protected SpaceTemplateService spaceTemplateService; + + @Autowired + protected TranslationService translationService; + + @PostConstruct + public void init() { + translationService.addPlugin(this); + } + + @Override + public String getObjectType() { + return OBJECT_TYPE; + } + + @Override + public boolean hasEditPermission(long templateId, String username) throws ObjectNotFoundException { + return spaceTemplateService.canManageTemplates(username); + } + + @Override + public boolean hasAccessPermission(long templateId, String username) throws ObjectNotFoundException { + if (spaceTemplateService.getSpaceTemplate(templateId) == null) { + throw new ObjectNotFoundException(String.format("Space Template with id %s not found", templateId)); + } + return spaceTemplateService.canViewTemplate(templateId, username); + } + + @Override + public long getAudienceId(long templateId) { + return 0; + } + + @Override + public long getSpaceId(long templateId) { + return 0; + } + +} diff --git a/component/core/src/main/java/io/meeds/social/space/template/service/SpaceTemplateService.java b/component/core/src/main/java/io/meeds/social/space/template/service/SpaceTemplateService.java new file mode 100644 index 00000000000..cfe601023f9 --- /dev/null +++ b/component/core/src/main/java/io/meeds/social/space/template/service/SpaceTemplateService.java @@ -0,0 +1,220 @@ +/** + * This file is part of the Meeds project (https://meeds.io/). + * + * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package io.meeds.social.space.template.service; + +import java.util.Collections; +import java.util.List; +import java.util.Locale; +import java.util.Objects; + +import org.apache.commons.collections4.CollectionUtils; +import org.apache.commons.lang3.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Service; + +import org.exoplatform.commons.exception.ObjectNotFoundException; +import org.exoplatform.portal.config.UserACL; +import org.exoplatform.services.log.ExoLogger; +import org.exoplatform.services.log.Log; +import org.exoplatform.services.security.Identity; +import org.exoplatform.services.security.MembershipEntry; +import org.exoplatform.social.attachment.AttachmentService; +import org.exoplatform.social.core.space.SpacesAdministrationService; + +import io.meeds.social.space.template.model.SpaceTemplate; +import io.meeds.social.space.template.model.SpaceTemplateFilter; +import io.meeds.social.space.template.plugin.attachment.SpaceTemplateBannerAttachmentPlugin; +import io.meeds.social.space.template.plugin.translation.SpaceTemplateTranslationPlugin; +import io.meeds.social.space.template.storage.SpaceTemplateStorage; +import io.meeds.social.translation.service.TranslationService; + +@Service +public class SpaceTemplateService { + + private static final Log LOG = ExoLogger.getLogger(SpaceTemplateService.class); + + @Autowired + protected TranslationService translationService; + + @Autowired + protected AttachmentService attachmentService; + + @Autowired + protected SpacesAdministrationService spacesAdministrationService; + + @Autowired + protected UserACL userAcl; + + @Autowired + protected SpaceTemplateStorage spaceTemplateStorage; + + public List getSpaceTemplates() { + return getSpaceTemplates(null, Pageable.unpaged(), false); + } + + public List getSpaceTemplates(SpaceTemplateFilter spaceTemplateFilter, Pageable pageable, boolean expand) { + if (spaceTemplateFilter != null + && StringUtils.isBlank(spaceTemplateFilter.getUsername())) { + return Collections.emptyList(); + } else { + boolean includeDisabled = spaceTemplateFilter == null || spaceTemplateFilter.isIncludeDisabled(); + List spaceTemplates = includeDisabled ? spaceTemplateStorage.getSpaceTemplates(pageable) : + spaceTemplateStorage.getEnabledSpaceTemplates(pageable); + return spaceTemplates.stream() + .map(spaceTemplate -> { + if (spaceTemplateFilter != null + && !canViewTemplate(spaceTemplate.getId(), spaceTemplateFilter.getUsername())) { + return null; + } else if (expand) { + computeSpaceTemplateAttributes(spaceTemplate, + spaceTemplateFilter == null ? null : + spaceTemplateFilter.getLocale()); + } + return spaceTemplate; + }) + .filter(Objects::nonNull) + .toList(); + } + } + + public SpaceTemplate getSpaceTemplate(long templateId) { + return spaceTemplateStorage.getSpaceTemplate(templateId); + } + + public SpaceTemplate getSpaceTemplate(long templateId, + String username, + Locale locale, + boolean expand) throws IllegalAccessException { + SpaceTemplate spaceTemplate = spaceTemplateStorage.getSpaceTemplate(templateId); + if (spaceTemplate == null) { + return null; + } + if (!canViewTemplate(templateId, username)) { + throw new IllegalAccessException(); + } + if (expand) { + computeSpaceTemplateAttributes(spaceTemplate, locale); + } + return spaceTemplate; + } + + public boolean canManageTemplates(String username) { + return spacesAdministrationService.isSuperManager(username); + } + + public boolean canViewTemplate(long templateId, String username) { + if (canManageTemplates(username)) { + return true; + } else if (userAcl.isAnonymousUser(username)) { + return false; + } + SpaceTemplate spaceTemplate = getSpaceTemplate(templateId); + Identity aclIdentity = userAcl.getUserIdentity(username); + return spaceTemplate != null + && aclIdentity != null + && spaceTemplate.getPermissions() + .stream() + .anyMatch(expression -> aclIdentity.isMemberOf(getMembershipEntry(expression))); + } + + public SpaceTemplate createSpaceTemplate(SpaceTemplate spaceTemplate, String username) throws IllegalAccessException { + if (!canManageTemplates(username)) { + throw new IllegalAccessException("User isn't authorized to create a space template"); + } + return createSpaceTemplate(spaceTemplate); + } + + public SpaceTemplate createSpaceTemplate(SpaceTemplate spaceTemplate) { + if (spaceTemplate.getId() != 0) { + throw new IllegalArgumentException("Space template to create shouldn't have an id"); + } + return spaceTemplateStorage.createSpaceTemplate(spaceTemplate); + } + + public SpaceTemplate updateSpaceTemplate(SpaceTemplate spaceTemplate, String username) throws ObjectNotFoundException, + IllegalAccessException { + if (!canManageTemplates(username)) { + throw new IllegalAccessException("User isn't authorized to update a space template"); + } else if (spaceTemplate.isDeleted()) { + throw new IllegalArgumentException("Can't mark space template as deleted through update method"); + } + return updateSpaceTemplate(spaceTemplate); + } + + public SpaceTemplate updateSpaceTemplate(SpaceTemplate spaceTemplate) throws ObjectNotFoundException { + SpaceTemplate storedSpaceTemplate = spaceTemplateStorage.getSpaceTemplate(spaceTemplate.getId()); + if (storedSpaceTemplate == null || storedSpaceTemplate.isDeleted()) { + throw new ObjectNotFoundException("Space Template doesn't exist"); + } + return spaceTemplateStorage.updateSpaceTemplate(spaceTemplate); + } + + public void deleteSpaceTemplate(long templateId, String username) throws IllegalAccessException, ObjectNotFoundException { + if (!canManageTemplates(username)) { + throw new IllegalAccessException("User isn't authorized to create a space template"); + } + SpaceTemplate spaceTemplate = getSpaceTemplate(templateId); + if (spaceTemplate != null && spaceTemplate.isSystem()) { + throw new IllegalAccessException("Can't delete a system space template"); + } + deleteSpaceTemplate(templateId); + } + + public void deleteSpaceTemplate(long templateId) throws ObjectNotFoundException { + SpaceTemplate spaceTemplate = spaceTemplateStorage.getSpaceTemplate(templateId); + if (spaceTemplate == null || spaceTemplate.isDeleted()) { + throw new ObjectNotFoundException(String.format("Space template with id %s doesn't exist", templateId)); + } + spaceTemplate.setDeleted(true); + spaceTemplateStorage.updateSpaceTemplate(spaceTemplate); + + try { + attachmentService.deleteAttachments(SpaceTemplateBannerAttachmentPlugin.OBJECT_TYPE, String.valueOf(templateId)); + } catch (Exception e) { + LOG.debug("Error while deleting attachments of deleted Page Template", e); + } + try { + translationService.deleteTranslationLabels(SpaceTemplateTranslationPlugin.OBJECT_TYPE, templateId); + } catch (ObjectNotFoundException e) { + LOG.debug("Error while deleting translation labels of deleted Page Template", e); + } + } + + private void computeSpaceTemplateAttributes(SpaceTemplate spaceTemplate, Locale locale) { + spaceTemplate.setName(translationService.getTranslationLabelOrDefault(SpaceTemplateTranslationPlugin.OBJECT_TYPE, + spaceTemplate.getId(), + SpaceTemplateTranslationPlugin.TITLE_FIELD_NAME, + locale)); + spaceTemplate.setDescription(translationService.getTranslationLabelOrDefault(SpaceTemplateTranslationPlugin.OBJECT_TYPE, + spaceTemplate.getId(), + SpaceTemplateTranslationPlugin.DESCRIPTION_FIELD_NAME, + locale)); + List attachmentFileIds = attachmentService.getAttachmentFileIds(SpaceTemplateBannerAttachmentPlugin.OBJECT_TYPE, + String.valueOf(spaceTemplate.getId())); + if (CollectionUtils.isNotEmpty(attachmentFileIds)) { + spaceTemplate.setBannerFileId(Long.parseLong(attachmentFileIds.get(0))); + } + } + + private MembershipEntry getMembershipEntry(String expression) { + return expression.contains(":") ? MembershipEntry.parse(expression) : new MembershipEntry(expression); + } + +} diff --git a/component/core/src/main/java/io/meeds/social/space/template/storage/SpaceTemplateStorage.java b/component/core/src/main/java/io/meeds/social/space/template/storage/SpaceTemplateStorage.java new file mode 100644 index 00000000000..adc8228af00 --- /dev/null +++ b/component/core/src/main/java/io/meeds/social/space/template/storage/SpaceTemplateStorage.java @@ -0,0 +1,87 @@ +/** + * This file is part of the Meeds project (https://meeds.io/). + * + * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package io.meeds.social.space.template.storage; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.cache.annotation.CacheEvict; +import org.springframework.cache.annotation.Cacheable; +import org.springframework.data.domain.Pageable; +import org.springframework.stereotype.Component; + +import org.exoplatform.commons.exception.ObjectNotFoundException; + +import io.meeds.social.space.template.dao.SpaceTemplateDAO; +import io.meeds.social.space.template.entity.SpaceTemplateEntity; +import io.meeds.social.space.template.model.SpaceTemplate; +import io.meeds.social.space.template.utils.EntityMapper; + +@Component +public class SpaceTemplateStorage { + + @Autowired + protected SpaceTemplateDAO spaceTemplateDAO; + + @Cacheable(cacheNames = "social.spaceTemplates") + public List getSpaceTemplates(Pageable pageable) { + return spaceTemplateDAO.findByDeletedFalse(pageable) + .stream() + .map(EntityMapper::fromEntity) + .toList(); + } + + @Cacheable(cacheNames = "social.enabledSpaceTemplates") + public List getEnabledSpaceTemplates(Pageable pageable) { + return spaceTemplateDAO.findByDeletedFalseAndEnabledTrue(pageable) + .stream() + .map(EntityMapper::fromEntity) + .toList(); + } + + @Cacheable(cacheNames = "social.spaceTemplates") + public SpaceTemplate getSpaceTemplate(long id) { + return spaceTemplateDAO.findById(id) + .map(EntityMapper::fromEntity) + .orElse(null); + } + + @CacheEvict(cacheNames = { "social.spaceTemplates", "social.enabledSpaceTemplates" }, allEntries = true) + public SpaceTemplate createSpaceTemplate(SpaceTemplate spaceTemplate) { + SpaceTemplateEntity spaceTemplateEntity = EntityMapper.toEntity(spaceTemplate); + spaceTemplateEntity = spaceTemplateDAO.save(spaceTemplateEntity); + return EntityMapper.fromEntity(spaceTemplateEntity); + } + + @CacheEvict(cacheNames = { "social.spaceTemplates", "social.enabledSpaceTemplates" }, allEntries = true) + public SpaceTemplate updateSpaceTemplate(SpaceTemplate spaceTemplate) throws ObjectNotFoundException { + if (!spaceTemplateDAO.existsById(spaceTemplate.getId())) { + throw new ObjectNotFoundException("Space template doesn't exist"); + } + SpaceTemplateEntity spaceTemplateEntity = EntityMapper.toEntity(spaceTemplate); + spaceTemplateEntity = spaceTemplateDAO.save(spaceTemplateEntity); + return EntityMapper.fromEntity(spaceTemplateEntity); + } + + @CacheEvict(cacheNames = { "social.spaceTemplates", "social.enabledSpaceTemplates" }, allEntries = true) + public void deleteSpaceTemplate(long id) { + spaceTemplateDAO.deleteById(id); + } + +} diff --git a/component/core/src/main/java/io/meeds/social/space/template/utils/EntityMapper.java b/component/core/src/main/java/io/meeds/social/space/template/utils/EntityMapper.java new file mode 100644 index 00000000000..ddac44c2bb5 --- /dev/null +++ b/component/core/src/main/java/io/meeds/social/space/template/utils/EntityMapper.java @@ -0,0 +1,79 @@ +/** + * This file is part of the Meeds project (https://meeds.io/). + * + * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package io.meeds.social.space.template.utils; + +import java.util.Collections; +import java.util.List; + +import org.apache.commons.lang3.StringUtils; + +import io.meeds.social.space.template.entity.SpaceTemplateEntity; +import io.meeds.social.space.template.model.SpaceTemplate; + +public class EntityMapper { + + private EntityMapper() { + // Utils Class + } + + public static SpaceTemplate fromEntity(SpaceTemplateEntity entity) { + return new SpaceTemplate(entity.getId() == null ? 0 : entity.getId().longValue(), + null, + null, + 0l, + entity.getIcon(), + entity.isEnabled(), + entity.isDeleted(), + entity.isSystem(), + entity.getOrder(), + getNonEmptyValueList(entity.getPermissions()), + getNonEmptyValueList(entity.getSpaceLayoutPermissions()), + getNonEmptyValueList(entity.getSpaceDeletePermissions()), + getNonEmptyValueList(entity.getSpaceFields()), + entity.getSpaceDefaultVisibility(), + entity.getSpaceDefaultRegistration(), + entity.isSpaceAllowContentCreation()); + } + + public static SpaceTemplateEntity toEntity(SpaceTemplate model) { + return new SpaceTemplateEntity(model.getId() == 0 ? null : model.getId(), + model.getIcon(), + model.isEnabled(), + model.isDeleted(), + model.isSystem(), + model.getOrder(), + getNonEmptyValueList(model.getPermissions()), + getNonEmptyValueList(model.getSpaceLayoutPermissions()), + getNonEmptyValueList(model.getSpaceDeletePermissions()), + getNonEmptyValueList(model.getSpaceFields()), + model.getSpaceDefaultVisibility(), + model.getSpaceDefaultRegistration(), + model.isSpaceAllowContentCreation()); + } + + private static List getNonEmptyValueList(List list) { + if (list == null) { + return Collections.emptyList(); + } else { + return list.stream().filter(StringUtils::isNotBlank).toList(); + } + } + +} diff --git a/component/core/src/main/java/io/meeds/social/translation/service/TranslationServiceImpl.java b/component/core/src/main/java/io/meeds/social/translation/service/TranslationServiceImpl.java index aab739a778c..4288dbecec5 100644 --- a/component/core/src/main/java/io/meeds/social/translation/service/TranslationServiceImpl.java +++ b/component/core/src/main/java/io/meeds/social/translation/service/TranslationServiceImpl.java @@ -28,6 +28,7 @@ import org.exoplatform.services.listener.ListenerService; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; +import org.exoplatform.services.resources.LocaleConfigService; import io.meeds.social.translation.model.TranslationEvent; import io.meeds.social.translation.model.TranslationField; @@ -47,13 +48,18 @@ public class TranslationServiceImpl implements TranslationService { private static final String NO_PERMISSION_TO_DELETE_MESSAGE = "User %s doesn't have enough permissions to delete translations of object of type %s identified by %s"; + private LocaleConfigService localeConfigService; + private ListenerService listenerService; private TranslationStorage translationStorage; private Map translationPlugins = new HashMap<>(); - public TranslationServiceImpl(TranslationStorage translationStorage, ListenerService listenerService) { + public TranslationServiceImpl(TranslationStorage translationStorage, + LocaleConfigService localeConfigService, + ListenerService listenerService) { + this.localeConfigService = localeConfigService; this.translationStorage = translationStorage; this.listenerService = listenerService; } @@ -70,9 +76,9 @@ public void removePlugin(String objectType) { @Override public TranslationField getTranslationField(String objectType, - long objectId, - String fieldName, - String username) throws IllegalAccessException, ObjectNotFoundException { + long objectId, + String fieldName, + String username) throws IllegalAccessException, ObjectNotFoundException { checkParameters(objectType, objectId, fieldName); checkAccessPermission(objectType, objectId, username); @@ -81,8 +87,8 @@ public TranslationField getTranslationField(String objectType, @Override public TranslationField getTranslationField(String objectType, - long objectId, - String fieldName) { + long objectId, + String fieldName) { return translationStorage.getTranslationField(objectType, objectId, fieldName); } @@ -94,6 +100,32 @@ public String getTranslationLabel(String objectType, return translationStorage.getTranslationLabel(objectType, objectId, fieldName, locale); } + @Override + public String getTranslationLabelOrDefault(String objectType, + long objectId, + String fieldName, + Locale locale) { + if (locale == null) { + locale = localeConfigService.getDefaultLocaleConfig().getLocale(); + } + TranslationField translationField = getTranslationField(objectType, + objectId, + fieldName); + if (translationField != null && MapUtils.isNotEmpty(translationField.getLabels())) { + String label = translationField.getLabels().get(locale); + if (label == null) { + Locale defaultLocale = localeConfigService.getDefaultLocaleConfig().getLocale(); + label = translationField.getLabels().get(defaultLocale); + } + if (label == null) { + label = translationField.getLabels().values().iterator().next(); + } + return label; + } else { + return null; + } + } + @Override public void saveTranslationLabels(String objectType, long objectId, @@ -198,7 +230,9 @@ private void checkAccessPermission(String objectType, long objectId, String user } } - private void checkEditPermission(String objectType, long objectId, String username, + private void checkEditPermission(String objectType, + long objectId, + String username, String message) throws ObjectNotFoundException, IllegalAccessException { TranslationPlugin translationPlugin = translationPlugins.get(objectType); if (!translationPlugin.hasEditPermission(objectId, username)) { diff --git a/component/core/src/main/java/org/exoplatform/social/core/jpa/storage/EntityConverterUtils.java b/component/core/src/main/java/org/exoplatform/social/core/jpa/storage/EntityConverterUtils.java index 866bd35497f..9938e006e21 100644 --- a/component/core/src/main/java/org/exoplatform/social/core/jpa/storage/EntityConverterUtils.java +++ b/component/core/src/main/java/org/exoplatform/social/core/jpa/storage/EntityConverterUtils.java @@ -33,16 +33,16 @@ import org.exoplatform.social.core.jpa.storage.entity.IdentityEntity; import org.exoplatform.social.core.jpa.storage.entity.ProfileExperienceEntity; import org.exoplatform.social.core.jpa.storage.entity.SpaceEntity; -import org.exoplatform.social.core.jpa.storage.entity.SpaceEntity.PRIORITY; -import org.exoplatform.social.core.jpa.storage.entity.SpaceEntity.PublicSiteVisibility; -import org.exoplatform.social.core.jpa.storage.entity.SpaceEntity.REGISTRATION; -import org.exoplatform.social.core.jpa.storage.entity.SpaceEntity.VISIBILITY; import org.exoplatform.social.core.jpa.storage.entity.SpaceMemberEntity; import org.exoplatform.social.core.relationship.model.Relationship; import org.exoplatform.social.core.service.LinkProvider; import org.exoplatform.social.core.space.model.Space; +import io.meeds.social.space.constant.Priority; +import io.meeds.social.space.constant.PublicSiteVisibility; +import io.meeds.social.space.constant.Registration; import io.meeds.social.space.constant.SpaceMembershipStatus; +import io.meeds.social.space.constant.Visibility; public class EntityConverterUtils { @@ -282,27 +282,28 @@ public static SpaceEntity buildFrom(Space space, SpaceEntity spaceEntity) { spaceEntity.setCreatedDate(space.getCreatedTime() > 0 ? new Date(space.getCreatedTime()) : new Date()); spaceEntity.setDescription(space.getDescription()); spaceEntity.setTemplate(space.getTemplate()); + spaceEntity.setTemplateId(space.getTemplateId() == 0 ? null : space.getTemplateId()); spaceEntity.setDisplayName(space.getDisplayName()); spaceEntity.setGroupId(space.getGroupId()); spaceEntity.setPrettyName(space.getPrettyName()); spaceEntity.setPublicSiteId(space.getPublicSiteId()); spaceEntity.setPublicSiteVisibility(space.getPublicSiteVisibility() == null ? PublicSiteVisibility.MANAGER : PublicSiteVisibility.valueOf(space.getPublicSiteVisibility().toUpperCase())); - PRIORITY priority = null; + Priority priority = null; if (Space.HIGH_PRIORITY.equals(space.getPriority())) { - priority = PRIORITY.HIGH; + priority = Priority.HIGH; } else if (Space.INTERMEDIATE_PRIORITY.equals(space.getPriority())) { - priority = PRIORITY.INTERMEDIATE; + priority = Priority.INTERMEDIATE; } else if (Space.LOW_PRIORITY.equals(space.getPriority())) { - priority = PRIORITY.LOW; + priority = Priority.LOW; } spaceEntity.setPriority(priority); if (space.getRegistration() != null) { - spaceEntity.setRegistration(REGISTRATION.valueOf(space.getRegistration().toUpperCase())); + spaceEntity.setRegistration(Registration.valueOf(space.getRegistration().toUpperCase())); } spaceEntity.setUrl(space.getUrl()); - VISIBILITY visibility = null; + Visibility visibility = null; if (space.getVisibility() != null) { - visibility = VISIBILITY.valueOf(space.getVisibility().toUpperCase()); + visibility = Visibility.valueOf(space.getVisibility().toUpperCase()); } spaceEntity.setVisibility(visibility); buildMembers(space, spaceEntity); diff --git a/component/core/src/main/java/org/exoplatform/social/core/jpa/storage/RDBMSSpaceStorageImpl.java b/component/core/src/main/java/org/exoplatform/social/core/jpa/storage/RDBMSSpaceStorageImpl.java index 833a15a0d0f..90bb350e4c0 100644 --- a/component/core/src/main/java/org/exoplatform/social/core/jpa/storage/RDBMSSpaceStorageImpl.java +++ b/component/core/src/main/java/org/exoplatform/social/core/jpa/storage/RDBMSSpaceStorageImpl.java @@ -26,6 +26,7 @@ import java.util.HashSet; import java.util.LinkedList; import java.util.List; +import java.util.Map; import java.util.Set; import java.util.stream.Collectors; @@ -653,6 +654,7 @@ public int countPendingSpaceRequestsToManage(String username) { return spaceMemberDAO.countPendingSpaceRequestsToManage(username); } + @Override public List findSpaceExternalInvitationsBySpaceId(String spaceId) { return spaceExternalInvitationDAO.findSpaceExternalInvitationsBySpaceId(spaceId) .stream() @@ -660,6 +662,7 @@ public List findSpaceExternalInvitationsBySpaceId(Strin .toList(); } + @Override public void saveSpaceExternalInvitation(String spaceId, String email, String tokenId) { SpaceExternalInvitationEntity spaceExternalInvitation = new SpaceExternalInvitationEntity(); spaceExternalInvitation.setSpaceId(spaceId); @@ -669,25 +672,52 @@ public void saveSpaceExternalInvitation(String spaceId, String email, String tok spaceExternalInvitationDAO.create(spaceExternalInvitation); } + @Override public SpaceExternalInvitation findSpaceExternalInvitationById(String invitationId) { SpaceExternalInvitationEntity spaceExternalInvitationEntity = spaceExternalInvitationDAO.find(Long.parseLong(invitationId)); return fillSpaceExternalInvitationFromEntity(spaceExternalInvitationEntity); } + @Override public void deleteSpaceExternalInvitation(SpaceExternalInvitation spaceExternalInvitation) { SpaceExternalInvitationEntity spaceExternalInvitationEntity = spaceExternalInvitationDAO.find(spaceExternalInvitation.getInvitationId()); spaceExternalInvitationDAO.delete(spaceExternalInvitationEntity); } + @Override public List findExternalInvitationsSpacesByEmail(String email) { return spaceExternalInvitationDAO.findExternalInvitationsSpacesByEmail(email); } + @Override public void deleteExternalUserInvitations(String email) { spaceExternalInvitationDAO.deleteExternalUserInvitations(email); } + @Override + public int countExternalMembers(Long spaceId) { + return spaceMemberDAO.countExternalMembers(spaceId); + } + + @Override + public List getCommonSpaces(String userId, String otherUserId, int offset, int limit) { + List commonSpaces = spaceDAO.getCommonSpaces(userId, otherUserId, offset, limit); + return commonSpaces.stream() + .map(this::fillSpaceFromEntity) + .toList(); + } + + @Override + public int countCommonSpaces(String userId, String otherUserId) { + return spaceDAO.countCommonSpaces(userId, otherUserId); + } + + @Override + public Map countSpacesByTemplate() { + return spaceDAO.countSpacesByTemplate(); + } + private String[] getSpaceMembers(long spaceId, SpaceMembershipStatus status) { int countSpaceMembers = spaceMemberDAO.countSpaceMembers(spaceId, status); if (countSpaceMembers == 0) { @@ -863,6 +893,7 @@ private Space fillSpaceSimpleFromEntity(SpaceEntity entity, Space space) { } space.setDescription(entity.getDescription()); space.setTemplate(entity.getTemplate()); + space.setTemplateId(entity.getTemplateId() == null ? 0 : entity.getTemplateId().longValue()); if (entity.getVisibility() != null) { space.setVisibility(entity.getVisibility().name().toLowerCase()); } @@ -929,24 +960,6 @@ public void setIdentityStorage(IdentityStorage identityStorage) { this.identityStorage = identityStorage; } - @Override - public int countExternalMembers(Long spaceId) { - return spaceMemberDAO.countExternalMembers(spaceId); - } - - @Override - public List getCommonSpaces(String userId, String otherUserId, int offset, int limit) { - List commonSpaces = spaceDAO.getCommonSpaces(userId, otherUserId, offset, limit); - return commonSpaces.stream() - .map(this::fillSpaceFromEntity) - .toList(); - } - - @Override - public int countCommonSpaces(String userId, String otherUserId) { - return spaceDAO.countCommonSpaces(userId, otherUserId); - } - private Instant computeCreatedDate(Token token) { return token == null ? null : Instant.ofEpochMilli(token.getExpirationTimeMillis()) diff --git a/component/core/src/main/java/org/exoplatform/social/core/jpa/storage/dao/SpaceDAO.java b/component/core/src/main/java/org/exoplatform/social/core/jpa/storage/dao/SpaceDAO.java index a5edb974b17..028b3a1ced8 100644 --- a/component/core/src/main/java/org/exoplatform/social/core/jpa/storage/dao/SpaceDAO.java +++ b/component/core/src/main/java/org/exoplatform/social/core/jpa/storage/dao/SpaceDAO.java @@ -17,6 +17,7 @@ package org.exoplatform.social.core.jpa.storage.dao; import java.util.List; +import java.util.Map; import org.exoplatform.commons.api.persistence.GenericDAO; import org.exoplatform.social.core.jpa.storage.entity.SpaceEntity; @@ -57,4 +58,12 @@ default List getCommonSpaces(String userId,String otherUserId, int default int countCommonSpaces(String userId,String otherUserId) { throw new UnsupportedOperationException(); } + + /** + * @return the count of spaces by Space Template identifier + */ + default Map countSpacesByTemplate() { + throw new UnsupportedOperationException(); + } + } diff --git a/component/core/src/main/java/org/exoplatform/social/core/jpa/storage/dao/jpa/SpaceDAOImpl.java b/component/core/src/main/java/org/exoplatform/social/core/jpa/storage/dao/jpa/SpaceDAOImpl.java index a7b483bc35a..b0e70e48b03 100644 --- a/component/core/src/main/java/org/exoplatform/social/core/jpa/storage/dao/jpa/SpaceDAOImpl.java +++ b/component/core/src/main/java/org/exoplatform/social/core/jpa/storage/dao/jpa/SpaceDAOImpl.java @@ -19,10 +19,13 @@ import java.util.Collections; import java.util.List; +import java.util.Map; import java.util.stream.Collectors; import jakarta.persistence.*; +import org.apache.commons.collections4.CollectionUtils; + import org.exoplatform.commons.persistence.impl.GenericDAOJPAImpl; import org.exoplatform.social.core.jpa.storage.dao.SpaceDAO; import org.exoplatform.social.core.jpa.storage.entity.SpaceEntity; @@ -39,7 +42,7 @@ public List getLastSpaces(int limit) { } else { return resultList.stream() .map(tuple -> tuple.get(0, Long.class)) - .collect(Collectors.toList()); + .toList(); } } @@ -48,7 +51,7 @@ public SpaceEntity getSpaceByGroupId(String groupId) { TypedQuery query = getEntityManager().createNamedQuery("SpaceEntity.getSpaceByGroupId", SpaceEntity.class); query.setParameter("groupId", groupId); try { - return query.getSingleResult(); + return query.getSingleResult(); } catch (NoResultException ex) { return null; } @@ -59,7 +62,7 @@ public SpaceEntity getSpaceByURL(String url) { TypedQuery query = getEntityManager().createNamedQuery("SpaceEntity.getSpaceByURL", SpaceEntity.class); query.setParameter("url", url); try { - return query.getSingleResult(); + return query.getSingleResult(); } catch (NoResultException ex) { return null; } @@ -70,7 +73,7 @@ public SpaceEntity getSpaceByDisplayName(String spaceDisplayName) { TypedQuery query = getEntityManager().createNamedQuery("SpaceEntity.getSpaceByDisplayName", SpaceEntity.class); query.setParameter("displayName", spaceDisplayName); try { - return query.getSingleResult(); + return query.getSingleResult(); } catch (NoResultException ex) { return null; } @@ -82,7 +85,7 @@ public SpaceEntity getSpaceByPrettyName(String spacePrettyName) { query.setParameter("prettyName", spacePrettyName); query.setMaxResults(1); try { - return query.getSingleResult(); + return query.getSingleResult(); } catch (NoResultException ex) { return null; } @@ -103,7 +106,7 @@ public List getCommonSpaces(String userId, String otherUserId, int throw new IllegalArgumentException("limit must be > 0"); } TypedQuery query = getEntityManager().createNamedQuery("SpaceEntity.getCommonSpacesBetweenTwoUsers", - SpaceEntity.class); + SpaceEntity.class); query.setParameter("userId", userId); query.setParameter("otherUserId", otherUserId); query.setFirstResult(offset); @@ -122,10 +125,24 @@ public int countCommonSpaces(String userId, String otherUserId) { } TypedQuery query = getEntityManager().createNamedQuery("SpaceEntity.countCommonSpacesBetweenTwoUsers", - Long.class); + Long.class); query.setParameter("userId", userId); query.setParameter("otherUserId", otherUserId); return query.getSingleResult().intValue(); } + + @Override + public Map countSpacesByTemplate() { + TypedQuery query = getEntityManager().createNamedQuery("SpaceEntity.countSpacesByTemplate", + Tuple.class); + List resultList = query.getResultList(); + if (CollectionUtils.isEmpty(resultList)) { + return Collections.emptyMap(); + } else { + return resultList.stream() + .collect(Collectors.toMap(t -> t.get(0, Long.class), t -> t.get(1, Long.class))); + } + } + } diff --git a/component/core/src/main/java/org/exoplatform/social/core/jpa/storage/dao/jpa/query/SpaceQueryBuilder.java b/component/core/src/main/java/org/exoplatform/social/core/jpa/storage/dao/jpa/query/SpaceQueryBuilder.java index 24e53f75eb1..48756b6ca56 100644 --- a/component/core/src/main/java/org/exoplatform/social/core/jpa/storage/dao/jpa/query/SpaceQueryBuilder.java +++ b/component/core/src/main/java/org/exoplatform/social/core/jpa/storage/dao/jpa/query/SpaceQueryBuilder.java @@ -35,6 +35,7 @@ import org.exoplatform.social.core.space.model.Space; import io.meeds.social.space.constant.SpaceMembershipStatus; +import io.meeds.social.space.constant.Visibility; import jakarta.persistence.EntityManager; import jakarta.persistence.Tuple; @@ -145,7 +146,7 @@ private Predicate buildPredicateFilter(Root root, CriteriaQuery spaceFilter.getRemoteId())); boolean includePrivate = spaceFilter.isIncludePrivate(); if (includePrivate) { - predicates.add(cb.or(cb.equal(root.get(SpaceEntity_.visibility), SpaceEntity.VISIBILITY.PRIVATE), tmp)); + predicates.add(cb.or(cb.equal(root.get(SpaceEntity_.visibility), Visibility.PRIVATE), tmp)); } else { predicates.add(tmp); } @@ -175,7 +176,7 @@ private Predicate buildPredicateFilter(Root root, CriteriaQuery //not hidden boolean notHidden = spaceFilter.isNotHidden(); if (notHidden) { - predicates.add(cb.notEqual(root.get(SpaceEntity_.visibility), SpaceEntity.VISIBILITY.HIDDEN)); + predicates.add(cb.notEqual(root.get(SpaceEntity_.visibility), Visibility.HIDDEN)); } // diff --git a/component/core/src/main/java/org/exoplatform/social/core/jpa/storage/entity/SpaceEntity.java b/component/core/src/main/java/org/exoplatform/social/core/jpa/storage/entity/SpaceEntity.java index 4f4b752db5b..0d8ec407972 100644 --- a/component/core/src/main/java/org/exoplatform/social/core/jpa/storage/entity/SpaceEntity.java +++ b/component/core/src/main/java/org/exoplatform/social/core/jpa/storage/entity/SpaceEntity.java @@ -14,7 +14,6 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ - package org.exoplatform.social.core.jpa.storage.entity; import java.io.Serializable; @@ -22,41 +21,67 @@ import java.util.HashSet; import java.util.Set; -import jakarta.persistence.*; +import io.meeds.social.space.constant.Priority; +import io.meeds.social.space.constant.PublicSiteVisibility; +import io.meeds.social.space.constant.Registration; +import io.meeds.social.space.constant.Visibility; + +import jakarta.persistence.CascadeType; +import jakarta.persistence.CollectionTable; +import jakarta.persistence.Column; +import jakarta.persistence.ElementCollection; +import jakarta.persistence.Entity; +import jakarta.persistence.FetchType; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.JoinColumn; +import jakarta.persistence.NamedQuery; +import jakarta.persistence.OneToMany; +import jakarta.persistence.SequenceGenerator; +import jakarta.persistence.Table; +import jakarta.persistence.Temporal; +import jakarta.persistence.TemporalType; import lombok.Getter; import lombok.Setter; @Entity(name = "SocSpaceEntity") @Table(name = "SOC_SPACES") -@NamedQueries({ - @NamedQuery(name = "SpaceEntity.getLastSpaces", query = "SELECT sp.id, sp.createdDate FROM SocSpaceEntity sp ORDER BY sp.createdDate DESC"), - @NamedQuery(name = "SpaceEntity.getSpaceByGroupId", query = "SELECT sp FROM SocSpaceEntity sp WHERE sp.groupId = :groupId"), - @NamedQuery(name = "SpaceEntity.getSpaceByPrettyName", query = "SELECT sp FROM SocSpaceEntity sp WHERE sp.prettyName = :prettyName"), - @NamedQuery(name = "SpaceEntity.getSpaceByDisplayName", query = "SELECT sp FROM SocSpaceEntity sp WHERE sp.displayName = :displayName"), - @NamedQuery(name = "SpaceEntity.getSpaceByURL", query = "SELECT sp FROM SocSpaceEntity sp WHERE sp.url = :url"), - @NamedQuery( - name = "SpaceEntity.getCommonSpacesBetweenTwoUsers", - query = - "SELECT spaces FROM SocSpaceEntity spaces " - + "WHERE spaces.id IN ( " - + "SELECT distinct (t1.space.id) FROM SocSpaceMember t1, SocSpaceMember t2 " - + " WHERE t1.userId = :userId " - + " AND t2.userId = :otherUserId " - + " AND t1.space.id = t2.space.id" - + " )" - ), - @NamedQuery( - name = "SpaceEntity.countCommonSpacesBetweenTwoUsers", - query = - "SELECT COUNT(*) FROM SocSpaceEntity spaces " - + "WHERE spaces.id IN ( " - + "SELECT distinct (t1.space.id) FROM SocSpaceMember t1, SocSpaceMember t2 " - + " WHERE t1.userId = :userId " - + " AND t2.userId = :otherUserId " - + " AND t1.space.id = t2.space.id" - + " )" - ), -}) +@NamedQuery(name = "SpaceEntity.getLastSpaces", query = "SELECT sp.id, sp.createdDate FROM SocSpaceEntity sp ORDER BY sp.createdDate DESC") +@NamedQuery(name = "SpaceEntity.getSpaceByGroupId", query = "SELECT sp FROM SocSpaceEntity sp WHERE sp.groupId = :groupId") +@NamedQuery(name = "SpaceEntity.getSpaceByPrettyName", query = "SELECT sp FROM SocSpaceEntity sp WHERE sp.prettyName = :prettyName") +@NamedQuery(name = "SpaceEntity.getSpaceByDisplayName", query = "SELECT sp FROM SocSpaceEntity sp WHERE sp.displayName = :displayName") +@NamedQuery(name = "SpaceEntity.getSpaceByURL", query = "SELECT sp FROM SocSpaceEntity sp WHERE sp.url = :url") +@NamedQuery( + name = "SpaceEntity.getCommonSpacesBetweenTwoUsers", + query = + "SELECT spaces FROM SocSpaceEntity spaces " + + "WHERE spaces.id IN ( " + + "SELECT distinct (t1.space.id) FROM SocSpaceMember t1, SocSpaceMember t2 " + + " WHERE t1.userId = :userId " + + " AND t2.userId = :otherUserId " + + " AND t1.space.id = t2.space.id" + + " )" +) +@NamedQuery( + name = "SpaceEntity.countCommonSpacesBetweenTwoUsers", + query = + "SELECT COUNT(*) FROM SocSpaceEntity spaces " + + "WHERE spaces.id IN ( " + + "SELECT distinct (t1.space.id) FROM SocSpaceMember t1, SocSpaceMember t2 " + + " WHERE t1.userId = :userId " + + " AND t2.userId = :otherUserId " + + " AND t1.space.id = t2.space.id" + + " )" +) +@NamedQuery( + name = "SpaceEntity.countSpacesByTemplate", + query = """ + SELECT s.templateId, COUNT(s.id) FROM SocSpaceEntity s + WHERE s.templateId > 0 + GROUP BY s.templateId + """ +) public class SpaceEntity implements Serializable { private static final long serialVersionUID = 3223615477747436986L; @@ -91,7 +116,7 @@ public class SpaceEntity implements Serializable { private String displayName; @Column(name = "REGISTRATION") - private REGISTRATION registration; + private Registration registration; @Column(name = "DESCRIPTION") private String description; @@ -105,10 +130,10 @@ public class SpaceEntity implements Serializable { private Date bannerLastUpdated; @Column(name = "VISIBILITY") - public VISIBILITY visibility; + public Visibility visibility; @Column(name = "PRIORITY") - public PRIORITY priority; + public Priority priority; @Column(name = "GROUP_ID") public String groupId; @@ -119,6 +144,11 @@ public class SpaceEntity implements Serializable { @Column(name = "TEMPLATE") private String template; + @Getter + @Setter + @Column(name = "TEMPLATE_ID") + private Long templateId; + @Temporal(TemporalType.TIMESTAMP) @Column(name = "CREATED_DATE", nullable = false) private Date createdDate = new Date(); @@ -169,11 +199,11 @@ public void setDisplayName(String displayName) { this.displayName = displayName; } - public REGISTRATION getRegistration() { + public Registration getRegistration() { return registration; } - public void setRegistration(REGISTRATION registration) { + public void setRegistration(Registration registration) { this.registration = registration; } @@ -201,19 +231,19 @@ public void setBannerLastUpdated(Date bannerLastUpdated) { this.bannerLastUpdated = bannerLastUpdated; } - public VISIBILITY getVisibility() { + public Visibility getVisibility() { return visibility; } - public void setVisibility(VISIBILITY visibility) { + public void setVisibility(Visibility visibility) { this.visibility = visibility; } - public PRIORITY getPriority() { + public Priority getPriority() { return priority; } - public void setPriority(PRIORITY priority) { + public void setPriority(Priority priority) { this.priority = priority; } @@ -298,19 +328,5 @@ public int hashCode() { return id == null ? 0 : id.intValue(); } - public enum VISIBILITY { - PUBLIC, PRIVATE, HIDDEN - } - public enum PRIORITY { - HIGH, INTERMEDIATE, LOW - } - - public enum REGISTRATION { - OPEN, VALIDATION, CLOSED - } - - public static enum PublicSiteVisibility { - MANAGER, MEMBER, INTERNAL, AUTHENTICATED, EVERYONE; - } } diff --git a/component/core/src/main/java/org/exoplatform/social/core/space/impl/DefaultSpaceApplicationHandler.java b/component/core/src/main/java/org/exoplatform/social/core/space/impl/DefaultSpaceApplicationHandler.java index abb262310f2..e360544630e 100644 --- a/component/core/src/main/java/org/exoplatform/social/core/space/impl/DefaultSpaceApplicationHandler.java +++ b/component/core/src/main/java/org/exoplatform/social/core/space/impl/DefaultSpaceApplicationHandler.java @@ -345,7 +345,7 @@ public void restoreApplicationLayout(Space space, String appId) throws Exception NavigationService navService = ExoContainerContext.getService(NavigationService.class); NavigationContext navContext = SpaceUtils.getGroupNavigationContext(space.getGroupId()); - NodeContext> parentNodeCtx = navService.loadNode(NodeModel.SELF_MODEL, navContext, Scope.CHILDREN, null); + NodeContext> parentNodeCtx = navService.loadNode(NodeModel.SELF_MODEL, navContext, Scope.ALL, null); String spaceTemplateName = space.getTemplate(); SpaceTemplate spaceTemplate = spaceTemplateService.getSpaceTemplateByName(spaceTemplateName); diff --git a/component/core/src/main/java/org/exoplatform/social/core/space/impl/SpaceServiceImpl.java b/component/core/src/main/java/org/exoplatform/social/core/space/impl/SpaceServiceImpl.java index 153f2c9fbdb..de22e058c21 100644 --- a/component/core/src/main/java/org/exoplatform/social/core/space/impl/SpaceServiceImpl.java +++ b/component/core/src/main/java/org/exoplatform/social/core/space/impl/SpaceServiceImpl.java @@ -21,6 +21,7 @@ import java.util.Collection; import java.util.Collections; import java.util.List; +import java.util.Map; import java.util.Objects; import java.util.Set; import java.util.stream.Collectors; @@ -42,9 +43,6 @@ import org.exoplatform.services.organization.Group; import org.exoplatform.services.organization.GroupHandler; import org.exoplatform.services.organization.OrganizationService; -import org.exoplatform.services.security.Authenticator; -import org.exoplatform.services.security.IdentityConstants; -import org.exoplatform.services.security.IdentityRegistry; import org.exoplatform.social.core.binding.model.GroupSpaceBinding; import org.exoplatform.social.core.identity.model.Identity; import org.exoplatform.social.core.identity.model.Profile; @@ -100,11 +98,7 @@ public class SpaceServiceImpl implements SpaceService { private OrganizationService organizationService; - private UserACL userACL; - - private IdentityRegistry identityRegistry; - - private Authenticator authenticator; + private UserACL userAcl; private SpaceLifecycle spaceLifeCycle = new SpaceLifecycle(); @@ -118,25 +112,21 @@ public class SpaceServiceImpl implements SpaceService { private LayoutService layoutService; public SpaceServiceImpl(SpaceStorage spaceStorage, // NOSONAR - SpaceSearchConnector spaceSearchConnector, GroupSpaceBindingStorage groupSpaceBindingStorage, + SpaceSearchConnector spaceSearchConnector, IdentityManager identityManager, - UserACL userACL, - IdentityRegistry identityRegistry, - Authenticator authenticator, SpacesAdministrationService spacesAdministrationService, SpaceTemplateService spaceTemplateService, - LayoutService layoutService) { + LayoutService layoutService, + UserACL userAcl) { this.spaceStorage = spaceStorage; + this.groupSpaceBindingStorage = groupSpaceBindingStorage; this.spaceSearchConnector = spaceSearchConnector; this.identityManager = identityManager; - this.identityRegistry = identityRegistry; - this.userACL = userACL; - this.authenticator = authenticator; this.spacesAdministrationService = spacesAdministrationService; this.spaceTemplateService = spaceTemplateService; - this.groupSpaceBindingStorage = groupSpaceBindingStorage; this.layoutService = layoutService; + this.userAcl = userAcl; } @Override @@ -343,10 +333,9 @@ public void deleteSpace(Space space, boolean deleteGroup) throws SpaceException } if (deleteGroup) { - UserACL acl = getUserACL(); GroupHandler groupHandler = getOrgService().getGroupHandler(); Group deletedGroup = groupHandler.findGroupById(space.getGroupId()); - List mandatories = acl.getMandatoryGroups(); + List mandatories = userAcl.getMandatoryGroups(); if (deletedGroup != null && !isMandatory(groupHandler, deletedGroup, mandatories)) { SpaceUtils.removeGroup(space); } @@ -700,12 +689,12 @@ public boolean canAccessSpacePublicSite(Space space, String username) { return false; } else if (StringUtils.equals(space.getPublicSiteVisibility(), SpaceUtils.EVERYONE)) { return true; - } else if (userACL.isAnonymousUser(username)) { + } else if (userAcl.isAnonymousUser(username)) { return false; } else if (StringUtils.equals(space.getPublicSiteVisibility(), SpaceUtils.AUTHENTICATED)) { return true; } else if (StringUtils.equals(space.getPublicSiteVisibility(), SpaceUtils.INTERNAL)) { - return userACL.getUserIdentity(username).isMemberOf(SpaceUtils.PLATFORM_USERS_GROUP); + return userAcl.getUserIdentity(username).isMemberOf(SpaceUtils.PLATFORM_USERS_GROUP); } else if (StringUtils.equals(space.getPublicSiteVisibility(), SpaceUtils.MEMBER)) { return canViewSpace(space, username); } else if (StringUtils.equals(space.getPublicSiteVisibility(), SpaceUtils.MANAGER)) { @@ -1030,41 +1019,28 @@ public void deleteExternalUserInvitations(String email) { @Override public boolean isSuperManager(String username) { - if (StringUtils.isBlank(username) - || IdentityConstants.ANONIM.equals(username) - || IdentityConstants.SYSTEM.equals(username)) { - return false; - } else if (username.equals(getUserACL().getSuperUser())) { - return true; - } - org.exoplatform.services.security.Identity identity = getIdentity(username); - return identity != null && (identity.isMemberOf(userACL.getAdminGroups()) - || spacesAdministrationService.getSpacesAdministratorsMemberships() - .stream() - .anyMatch(identity::isMemberOf)); + return spacesAdministrationService.isSuperManager(username); } @Override public boolean isContentManager(String username) { - if (StringUtils.isBlank(username) || IdentityConstants.ANONIM.equals(username) || IdentityConstants.SYSTEM.equals(username)) { + if (userAcl.isAnonymousUser(username)) { return false; - } else if (username.equals(getUserACL().getSuperUser())) { + } else if (isSuperManager(username)) { return true; } - org.exoplatform.services.security.Identity identity = getIdentity(username); + org.exoplatform.services.security.Identity identity = userAcl.getUserIdentity(username); return identity != null && identity.isMemberOf(SpaceUtils.PLATFORM_PUBLISHER_GROUP, SpaceUtils.MANAGER); } @Override public boolean isContentPublisher(String username) { - if (StringUtils.isBlank(username) - || IdentityConstants.ANONIM.equals(username) - || IdentityConstants.SYSTEM.equals(username)) { + if (userAcl.isAnonymousUser(username)) { return false; - } else if (username.equals(getUserACL().getSuperUser())) { + } else if (isSuperManager(username)) { return true; } - org.exoplatform.services.security.Identity identity = getIdentity(username); + org.exoplatform.services.security.Identity identity = userAcl.getUserIdentity(username); return identity != null && identity.isMemberOf(SpaceUtils.PLATFORM_PUBLISHER_GROUP, SpaceUtils.PUBLISHER); } @@ -1073,6 +1049,11 @@ public ListAccess getCommonSpaces(String username, String otherUserId) { return new SpaceListAccess(spaceStorage, spaceSearchConnector, SpaceListAccessType.COMMON, username, otherUserId); } + @Override + public Map countSpacesByTemplate() { + return spaceStorage.countSpacesByTemplate(); + } + public void addSpaceListener(SpaceListenerPlugin plugin) { registerSpaceLifeCycleListener(plugin); } @@ -1127,15 +1108,6 @@ private OrganizationService getOrgService() { return organizationService; } - /** - * Gets UserACL - * - * @return userACL - */ - private UserACL getUserACL() { - return userACL; - } - /** * Gets space application handler * @@ -1251,22 +1223,6 @@ private Space removeInvited(Space space, String username) { return space; } - private org.exoplatform.services.security.Identity getIdentity(String username) { - org.exoplatform.services.security.Identity identity = identityRegistry.getIdentity(username); - if (identity == null) { - try { - identity = authenticator.createIdentity(username); - identityRegistry.register(identity); - return identity; - } catch (Exception e) { - LOG.warn("Error while retrieving user {} ACL identity", username, e); - return null; - } - } else { - return identity; - } - } - private SpaceTemplate getSpaceTemplateOrDefault(String templaceName) { SpaceTemplate spaceTemplate = spaceTemplateService.getSpaceTemplateByName(templaceName); if (spaceTemplate == null) { diff --git a/component/core/src/main/java/org/exoplatform/social/core/space/impl/SpacesAdministrationServiceImpl.java b/component/core/src/main/java/org/exoplatform/social/core/space/impl/SpacesAdministrationServiceImpl.java index 7dbff68ce34..9ef9d4878cb 100644 --- a/component/core/src/main/java/org/exoplatform/social/core/space/impl/SpacesAdministrationServiceImpl.java +++ b/component/core/src/main/java/org/exoplatform/social/core/space/impl/SpacesAdministrationServiceImpl.java @@ -144,6 +144,21 @@ public void updateSpacesCreatorsMemberships(List permissionsExp updateSpacesAdministrationPagePermissions(this.spaceCreatorsMemberships); } + @Override + public boolean isSuperManager(String username) { + if (StringUtils.isBlank(username) + || IdentityConstants.ANONIM.equals(username) + || IdentityConstants.SYSTEM.equals(username)) { + return false; + } else if (username.equals(userACL.getSuperUser())) { + return true; + } + org.exoplatform.services.security.Identity identity = userACL.getUserIdentity(username); + return identity != null && (identity.isMemberOf(userACL.getAdminGroups()) + || getSpacesAdministratorsMemberships().stream() + .anyMatch(identity::isMemberOf)); + } + /** * Load Spaces Administration settings * For both Spaces Administrators and Spaces Creators settings, it uses the value stored in the settings if any, diff --git a/component/core/src/main/java/org/exoplatform/social/core/storage/cache/CacheType.java b/component/core/src/main/java/org/exoplatform/social/core/storage/cache/CacheType.java index ba55c2e88b4..81893858fe5 100644 --- a/component/core/src/main/java/org/exoplatform/social/core/storage/cache/CacheType.java +++ b/component/core/src/main/java/org/exoplatform/social/core/storage/cache/CacheType.java @@ -62,12 +62,11 @@ public enum CacheType { SPACE("social.SpaceCache"), SPACE_REF("social.SpaceRefCache"), SPACES_COUNT("social.SpacesCountCache"), + SPACES_COUNT_BY_TEMPLATE("social.SpacesCountByTemplateCache"), SPACES("social.SpacesCache"), // - SPACE_SIMPLE("social.SpaceSimpleCache") - - ; + SPACE_SIMPLE("social.SpaceSimpleCache"); private final String name; diff --git a/component/core/src/main/java/org/exoplatform/social/core/storage/cache/CachedSpaceStorage.java b/component/core/src/main/java/org/exoplatform/social/core/storage/cache/CachedSpaceStorage.java index 8a9cd3bf104..284bfddc672 100644 --- a/component/core/src/main/java/org/exoplatform/social/core/storage/cache/CachedSpaceStorage.java +++ b/component/core/src/main/java/org/exoplatform/social/core/storage/cache/CachedSpaceStorage.java @@ -47,21 +47,25 @@ */ public class CachedSpaceStorage extends RDBMSSpaceStorageImpl { + private static final SpaceKey EMPTY_SPACE_KEY = new SpaceKey("0"); + /** Logger */ private static final Log LOG = ExoLogger.getLogger(CachedSpaceStorage.class); - private final ExoCache exoSpaceCache; - private final ExoCache exoSpaceSimpleCache; - private final ExoCache exoRefSpaceCache; - private final ExoCache exoSpacesCountCache; - private final ExoCache exoSpacesCache; - private final ExoCache exoIdentitiesCache; - - private final FutureExoCache> spaceCache; - private final FutureExoCache> spaceSimpleCache; - private final FutureExoCache> spaceRefCache; - private final FutureExoCache> spacesCountCache; - private final FutureExoCache> spacesCache; + private final ExoCache spaceCache; + private final ExoCache spaceSimpleCache; + private final ExoCache spaceRefCache; + private final ExoCache spacesCountCache; + private final ExoCache> spacesCountByTemplateCache; + private final ExoCache spacesCache; + private final ExoCache identitiesCache; + + private final FutureExoCache> spaceFutureCache; + private final FutureExoCache> spaceSimpleFutureCache; + private final FutureExoCache> spaceRefFutureCache; + private final FutureExoCache> spacesCountFutureCache; + private final FutureExoCache, ServiceContext>> spacesCountByTemplateFutureCache; + private final FutureExoCache> spacesFutureCache; private SocialStorageCacheService cacheService; private CachedActivityStorage cachedActivityStorage; @@ -198,18 +202,20 @@ public CachedSpaceStorage(SpaceDAO spaceDAO, super(spaceDAO, spaceMemberDAO, identityStorage, identityDAO, activityDAO, spaceExternalInvitationDAO, favoriteService, remindPasswordTokenService); this.cacheService = cacheService; - this.exoSpaceCache = cacheService.getSpaceCache(); - this.exoSpaceSimpleCache = cacheService.getSpaceSimpleCache(); - this.exoRefSpaceCache = cacheService.getSpaceRefCache(); - this.exoSpacesCountCache = cacheService.getSpacesCountCache(); - this.exoSpacesCache = cacheService.getSpacesCache(); - this.exoIdentitiesCache = cacheService.getIdentitiesCache(); - - this.spaceCache = CacheType.SPACE.createFutureCache(exoSpaceCache); - this.spaceSimpleCache = CacheType.SPACE_SIMPLE.createFutureCache(exoSpaceSimpleCache); - this.spaceRefCache = CacheType.SPACE_REF.createFutureCache(exoRefSpaceCache); - this.spacesCountCache = CacheType.SPACES_COUNT.createFutureCache(exoSpacesCountCache); - this.spacesCache = CacheType.SPACES.createFutureCache(exoSpacesCache); + this.spaceCache = cacheService.getSpaceCache(); + this.spaceSimpleCache = cacheService.getSpaceSimpleCache(); + this.spaceRefCache = cacheService.getSpaceRefCache(); + this.spacesCountCache = cacheService.getSpacesCountCache(); + this.spacesCache = cacheService.getSpacesCache(); + this.identitiesCache = cacheService.getIdentitiesCache(); + this.spacesCountByTemplateCache = cacheService.getSpacesCountByTemplateCache(); + + this.spaceFutureCache = CacheType.SPACE.createFutureCache(spaceCache); + this.spaceSimpleFutureCache = CacheType.SPACE_SIMPLE.createFutureCache(spaceSimpleCache); + this.spaceRefFutureCache = CacheType.SPACE_REF.createFutureCache(spaceRefCache); + this.spacesCountFutureCache = CacheType.SPACES_COUNT.createFutureCache(spacesCountCache); + this.spacesCountByTemplateFutureCache = CacheType.SPACES_COUNT_BY_TEMPLATE.createFutureCache(spacesCountByTemplateCache); + this.spacesFutureCache = CacheType.SPACES.createFutureCache(spacesCache); } @@ -217,21 +223,21 @@ private void cleanRef(Space removed) { if (removed == null) { return; } - exoRefSpaceCache.remove(new SpaceRefKey(removed.getDisplayName())); - exoRefSpaceCache.remove(new SpaceRefKey(null, removed.getPrettyName())); - exoRefSpaceCache.remove(new SpaceRefKey(null, null, removed.getGroupId())); - exoRefSpaceCache.remove(new SpaceRefKey(null, null, null, removed.getUrl())); - spaceRefCache.remove(new SpaceRefKey(removed.getDisplayName())); spaceRefCache.remove(new SpaceRefKey(null, removed.getPrettyName())); spaceRefCache.remove(new SpaceRefKey(null, null, removed.getGroupId())); spaceRefCache.remove(new SpaceRefKey(null, null, null, removed.getUrl())); + + spaceRefFutureCache.remove(new SpaceRefKey(removed.getDisplayName())); + spaceRefFutureCache.remove(new SpaceRefKey(null, removed.getPrettyName())); + spaceRefFutureCache.remove(new SpaceRefKey(null, null, removed.getGroupId())); + spaceRefFutureCache.remove(new SpaceRefKey(null, null, null, removed.getUrl())); } void clearIdentityCache() { try { - exoIdentitiesCache.select(new IdentityCacheSelector(SpaceIdentityProvider.NAME)); + identitiesCache.select(new IdentityCacheSelector(SpaceIdentityProvider.NAME)); } catch (Exception e) { LOG.error("Error deleting cache entries of provider type 'Space Identities'", e); @@ -242,8 +248,9 @@ void clearIdentityCache() { void clearSpaceCache() { try { - exoSpacesCache.clearCache(); - exoSpacesCountCache.clearCache(); + spacesCache.clearCache(); + spacesCountCache.clearCache(); + spacesCountByTemplateCache.clearCache(); } catch (Exception e) { LOG.error("Error deleting space caches", e); @@ -251,16 +258,14 @@ void clearSpaceCache() { } - /** - * {@inheritDoc} - */ + @Override public Space getSpaceByDisplayName(final String spaceDisplayName) throws SpaceStorageException { // SpaceRefKey refKey = new SpaceRefKey(spaceDisplayName); // - SpaceKey key = spaceRefCache.get( + SpaceKey key = spaceRefFutureCache.get( new ServiceContext() { public SpaceKey execute() { Space space = CachedSpaceStorage.super.getSpaceByDisplayName(spaceDisplayName); @@ -284,9 +289,7 @@ public SpaceKey execute() { } - /** - * {@inheritDoc} - */ + @Override public void saveSpace(final Space space, final boolean isNew) throws SpaceStorageException { // @@ -294,8 +297,8 @@ public void saveSpace(final Space space, final boolean isNew) throws SpaceStorag // - exoSpaceSimpleCache.remove(new SpaceKey(space.getId())); - exoSpaceCache.remove(new SpaceKey(space.getId())); + spaceSimpleCache.remove(new SpaceKey(space.getId())); + spaceCache.remove(new SpaceKey(space.getId())); clearSpaceCache(); clearIdentityCache(); @@ -328,19 +331,17 @@ public void renameSpace(Space space, String newDisplayName) throws SpaceStorageE cachedActivityStorage.clearOwnerStreamCache(oldPrettyName); // remove space cached - exoSpaceCache.remove(new SpaceKey(space.getId())); + spaceCache.remove(new SpaceKey(space.getId())); clearSpaceCache(); clearIdentityCache(); cleanRef(space); - exoRefSpaceCache.remove(new SpaceRefKey(oldDisplayName)); - exoRefSpaceCache.remove(new SpaceRefKey(null, oldPrettyName)); - exoRefSpaceCache.remove(new SpaceRefKey(null, null, space.getGroupId())); - exoRefSpaceCache.remove(new SpaceRefKey(null, null, null, oldUrl)); + spaceRefCache.remove(new SpaceRefKey(oldDisplayName)); + spaceRefCache.remove(new SpaceRefKey(null, oldPrettyName)); + spaceRefCache.remove(new SpaceRefKey(null, null, space.getGroupId())); + spaceRefCache.remove(new SpaceRefKey(null, null, null, oldUrl)); } - /** - * {@inheritDoc} - */ + @Override public void deleteSpace(final String id) throws SpaceStorageException { // @@ -348,7 +349,7 @@ public void deleteSpace(final String id) throws SpaceStorageException { super.deleteSpace(id); // - exoSpaceCache.remove(new SpaceKey(id)); + spaceCache.remove(new SpaceKey(id)); clearSpaceCache(); cleanRef(space); @@ -360,8 +361,8 @@ public void deleteSpace(final String id) throws SpaceStorageException { @Override public void ignoreSpace(String spaceId, String userId) { super.ignoreSpace(spaceId, userId); - exoSpaceSimpleCache.remove(new SpaceKey(spaceId)); - SpaceData spaceData = exoSpaceCache.remove(new SpaceKey(spaceId)); + spaceSimpleCache.remove(new SpaceKey(spaceId)); + SpaceData spaceData = spaceCache.remove(new SpaceKey(spaceId)); if (spaceData != null) { Space space = spaceData.build(); clearSpaceCache(); @@ -373,13 +374,6 @@ public void ignoreSpace(String spaceId, String userId) { } @Override - public boolean isSpaceIgnored(String spaceId, String userId) { - return super.isSpaceIgnored(spaceId, userId); - } - - /** - * {@inheritDoc} - */ public List getManagerSpacesByFilter( final String userId, final SpaceFilter spaceFilter, @@ -387,18 +381,15 @@ public List getManagerSpacesByFilter( final long limit) { SpaceFilterKey key = new SpaceFilterKey(userId, spaceFilter, SpaceType.MANAGER); ListSpacesKey listKey = new ListSpacesKey(key, offset, limit); - ListSpacesData keys = spacesCache.get( - new ServiceContext() { - public ListSpacesData execute() { - if (limit == 0) { - return buildIds(Collections.emptyList()); - } - List got = CachedSpaceStorage.super.getManagerSpacesByFilter(userId, - spaceFilter, - offset, - limit); - return buildIds(got); + ListSpacesData keys = spacesFutureCache.get(() -> { + if (limit == 0) { + return buildIds(Collections.emptyList()); } + List got = CachedSpaceStorage.super.getManagerSpacesByFilter(userId, + spaceFilter, + offset, + limit); + return buildIds(got); }, listKey); return buildSpaces(keys); @@ -408,26 +399,20 @@ public ListSpacesData execute() { @Override public int getManagerSpacesByFilterCount(String userId, SpaceFilter spaceFilter) { SpaceFilterKey key = new SpaceFilterKey(userId, spaceFilter, SpaceType.MANAGER); - return spacesCountCache.get( - new ServiceContext() { - public IntegerData execute() { - return new IntegerData(CachedSpaceStorage.super.getManagerSpacesByFilterCount(userId, spaceFilter)); - } - }, + return spacesCountFutureCache.get(() -> new IntegerData(CachedSpaceStorage.super.getManagerSpacesByFilterCount(userId, + spaceFilter)), key) .build(); } - /** - * {@inheritDoc} - */ + @Override public int getMemberSpacesByFilterCount(final String userId, final SpaceFilter spaceFilter) { // SpaceFilterKey key = new SpaceFilterKey(userId, spaceFilter, SpaceType.MEMBER); // - return spacesCountCache.get( + return spacesCountFutureCache.get( new ServiceContext() { public IntegerData execute() { return new IntegerData(CachedSpaceStorage.super.getMemberSpacesByFilterCount(userId, spaceFilter)); @@ -438,9 +423,7 @@ public IntegerData execute() { } - /** - * {@inheritDoc} - */ + @Override public List getMemberSpacesByFilter( final String userId, final SpaceFilter spaceFilter, final long offset, final long limit) { @@ -449,7 +432,7 @@ public List getMemberSpacesByFilter( ListSpacesKey listKey = new ListSpacesKey(key, offset, limit); // - ListSpacesData keys = spacesCache.get( + ListSpacesData keys = spacesFutureCache.get( new ServiceContext() { public ListSpacesData execute() { if (limit == 0) { @@ -466,16 +449,14 @@ public ListSpacesData execute() { } - /** - * {@inheritDoc} - */ + @Override public int getPendingSpacesByFilterCount(final String userId, final SpaceFilter spaceFilter) { // SpaceFilterKey key = new SpaceFilterKey(userId, spaceFilter, SpaceType.PENDING); // - return spacesCountCache.get( + return spacesCountFutureCache.get( new ServiceContext() { public IntegerData execute() { return new IntegerData(CachedSpaceStorage.super.getPendingSpacesByFilterCount(userId, spaceFilter)); @@ -486,9 +467,7 @@ public IntegerData execute() { } - /** - * {@inheritDoc} - */ + @Override public List getPendingSpacesByFilter( final String userId, final SpaceFilter spaceFilter, final long offset, final long limit) { @@ -497,7 +476,7 @@ public List getPendingSpacesByFilter( ListSpacesKey listKey = new ListSpacesKey(key, offset, limit); // - ListSpacesData keys = spacesCache.get( + ListSpacesData keys = spacesFutureCache.get( new ServiceContext() { public ListSpacesData execute() { if (limit == 0) { @@ -514,16 +493,14 @@ public ListSpacesData execute() { } - /** - * {@inheritDoc} - */ + @Override public int getInvitedSpacesByFilterCount(final String userId, final SpaceFilter spaceFilter) { // SpaceFilterKey key = new SpaceFilterKey(userId, spaceFilter, SpaceType.INVITED); // - return spacesCountCache.get( + return spacesCountFutureCache.get( new ServiceContext() { public IntegerData execute() { return new IntegerData(CachedSpaceStorage.super.getInvitedSpacesByFilterCount(userId, spaceFilter)); @@ -534,9 +511,7 @@ public IntegerData execute() { } - /** - * {@inheritDoc} - */ + @Override public List getInvitedSpacesByFilter(final String userId, final SpaceFilter spaceFilter, final long offset, final long limit) { // @@ -544,7 +519,7 @@ public List getInvitedSpacesByFilter(final String userId, final SpaceFilt ListSpacesKey listKey = new ListSpacesKey(key, offset, limit); // - ListSpacesData keys = spacesCache.get( + ListSpacesData keys = spacesFutureCache.get( new ServiceContext() { public ListSpacesData execute() { if (limit == 0) { @@ -561,16 +536,14 @@ public ListSpacesData execute() { } - /** - * {@inheritDoc} - */ + @Override public int getPublicSpacesByFilterCount(final String userId, final SpaceFilter spaceFilter) { // SpaceFilterKey key = new SpaceFilterKey(userId, spaceFilter, SpaceType.PUBLIC); // - return spacesCountCache.get( + return spacesCountFutureCache.get( new ServiceContext() { public IntegerData execute() { return new IntegerData(CachedSpaceStorage.super.getPublicSpacesByFilterCount(userId, spaceFilter)); @@ -581,15 +554,13 @@ public IntegerData execute() { } - /** - * {@inheritDoc} - */ + @Override public int getAccessibleSpacesByFilterCount(final String userId, final SpaceFilter spaceFilter) { // SpaceFilterKey key = new SpaceFilterKey(userId, spaceFilter, SpaceType.ACCESSIBLE); // - return spacesCountCache.get( + return spacesCountFutureCache.get( new ServiceContext() { public IntegerData execute() { return new IntegerData(CachedSpaceStorage.super.getAccessibleSpacesByFilterCount(userId, spaceFilter)); @@ -600,15 +571,13 @@ public IntegerData execute() { } - /** - * {@inheritDoc} - */ + @Override public int getVisibleSpacesCount(final String userId, final SpaceFilter spaceFilter) throws SpaceStorageException { // SpaceFilterKey key = new SpaceFilterKey(userId, spaceFilter, SpaceType.VISIBLE); // - return spacesCountCache.get( + return spacesCountFutureCache.get( new ServiceContext() { public IntegerData execute() { return new IntegerData(CachedSpaceStorage.super.getVisibleSpacesCount(userId, spaceFilter)); @@ -617,9 +586,7 @@ public IntegerData execute() { key).build(); } - /** - * {@inheritDoc} - */ + @Override public List getAccessibleSpacesByFilter( final String userId, final SpaceFilter spaceFilter, final long offset, final long limit) { @@ -628,7 +595,7 @@ public List getAccessibleSpacesByFilter( ListSpacesKey listKey = new ListSpacesKey(key, offset, limit); // - ListSpacesData keys = spacesCache.get( + ListSpacesData keys = spacesFutureCache.get( new ServiceContext() { public ListSpacesData execute() { if (limit == 0) { @@ -645,16 +612,14 @@ public ListSpacesData execute() { } - /** - * {@inheritDoc} - */ + @Override public int getEditableSpacesByFilterCount(final String userId, final SpaceFilter spaceFilter) { // SpaceFilterKey key = new SpaceFilterKey(userId, spaceFilter, SpaceType.EDITABLE); // - return spacesCountCache.get( + return spacesCountFutureCache.get( new ServiceContext() { public IntegerData execute() { return new IntegerData(CachedSpaceStorage.super.getEditableSpacesByFilterCount(userId, spaceFilter)); @@ -665,9 +630,7 @@ public IntegerData execute() { } - /** - * {@inheritDoc} - */ + @Override public List getEditableSpacesByFilter( final String userId, final SpaceFilter spaceFilter, final long offset, final long limit) { @@ -676,7 +639,7 @@ public List getEditableSpacesByFilter( ListSpacesKey listKey = new ListSpacesKey(key, offset, limit); // - ListSpacesData keys = spacesCache.get( + ListSpacesData keys = spacesFutureCache.get( new ServiceContext() { public ListSpacesData execute() { if (limit == 0) { @@ -693,15 +656,13 @@ public ListSpacesData execute() { } - /** - * {@inheritDoc} - */ + @Override public int getAllSpacesByFilterCount(final SpaceFilter spaceFilter) { // SpaceFilterKey key = new SpaceFilterKey(null, spaceFilter, null); // - return spacesCountCache.get( + return spacesCountFutureCache.get( new ServiceContext() { public IntegerData execute() { return new IntegerData(CachedSpaceStorage.super.getAllSpacesByFilterCount(spaceFilter)); @@ -712,9 +673,7 @@ public IntegerData execute() { } - /** - * {@inheritDoc} - */ + @Override public List getSpacesByFilter(final SpaceFilter spaceFilter, final long offset, final long limit) { // @@ -722,7 +681,7 @@ public List getSpacesByFilter(final SpaceFilter spaceFilter, final long o ListSpacesKey listKey = new ListSpacesKey(key, offset, limit); // - ListSpacesData keys = spacesCache.get( + ListSpacesData keys = spacesFutureCache.get( new ServiceContext() { public ListSpacesData execute() { if (limit == 0) { @@ -739,16 +698,14 @@ public ListSpacesData execute() { } - /** - * {@inheritDoc} - */ + @Override public Space getSpaceById(final String id) throws SpaceStorageException { // SpaceKey key = new SpaceKey(id); // - SpaceData data = spaceCache.get( + SpaceData data = spaceFutureCache.get( new ServiceContext() { public SpaceData execute() { Space space = CachedSpaceStorage.super.getSpaceById(id); @@ -772,18 +729,16 @@ public SpaceData execute() { } - /** - * {@inheritDoc} - */ + @Override public Space getSpaceSimpleById(final String id) throws SpaceStorageException { // SpaceKey key = new SpaceKey(id); - SpaceData data = exoSpaceCache.get(key); + SpaceData data = spaceCache.get(key); if (data != null) { Space s = data.build(); - if (exoSpaceSimpleCache.get(key) == null) { + if (spaceSimpleCache.get(key) == null) { putSpaceInCacheIfNotExists(s); } @@ -791,7 +746,7 @@ public Space getSpaceSimpleById(final String id) throws SpaceStorageException { } // - SpaceSimpleData simpleData = spaceSimpleCache.get( + SpaceSimpleData simpleData = spaceSimpleFutureCache.get( new ServiceContext() { public SpaceSimpleData execute() { Space space = CachedSpaceStorage.super.getSpaceSimpleById(id); @@ -814,16 +769,14 @@ public SpaceSimpleData execute() { } - /** - * {@inheritDoc} - */ + @Override public Space getSpaceByPrettyName(final String spacePrettyName) throws SpaceStorageException { // SpaceRefKey refKey = new SpaceRefKey(null, spacePrettyName); // - SpaceKey key = spaceRefCache.get( + SpaceKey key = spaceRefFutureCache.get( new ServiceContext() { public SpaceKey execute() { Space space = CachedSpaceStorage.super.getSpaceByPrettyName(spacePrettyName); @@ -847,16 +800,14 @@ public SpaceKey execute() { } - /** - * {@inheritDoc} - */ + @Override public Space getSpaceByGroupId(final String groupId) throws SpaceStorageException { // SpaceRefKey refKey = new SpaceRefKey(null, null, groupId); // - SpaceKey key = spaceRefCache.get( + SpaceKey key = spaceRefFutureCache.get( new ServiceContext() { public SpaceKey execute() { Space space = CachedSpaceStorage.super.getSpaceByGroupId(groupId); @@ -880,16 +831,14 @@ public SpaceKey execute() { } - /** - * {@inheritDoc} - */ + @Override public Space getSpaceByUrl(final String url) throws SpaceStorageException { // SpaceRefKey refKey = new SpaceRefKey(null, null, null, url); // - SpaceKey key = spaceRefCache.get( + SpaceKey key = spaceRefFutureCache.get( new ServiceContext() { public SpaceKey execute() { Space space = CachedSpaceStorage.super.getSpaceByUrl(url); @@ -922,7 +871,7 @@ public void updateSpaceAccessed(String remoteId, Space space) throws SpaceStorag if (selector.isUpdateStore()) { super.updateSpaceAccessed(remoteId, space); } - exoSpacesCache.select(selector); + spacesCache.select(selector); } catch (Exception e) { LOG.error("Error while removing cache entries for remoteId=" + remoteId + ", space=" + space.getDisplayName() + " and type=" + SpaceType.LATEST_ACCESSED.name() + " or type=" + SpaceType.VISITED, e); @@ -936,7 +885,7 @@ public List getLastAccessedSpace(final SpaceFilter filter, final int offs ListSpacesKey listKey = new ListSpacesKey(key, offset, limit); // - ListSpacesData keys = spacesCache.get( + ListSpacesData keys = spacesFutureCache.get( new ServiceContext() { public ListSpacesData execute() { if (limit == 0) { @@ -960,7 +909,7 @@ public List getLastSpaces(final int limit) { ListSpacesKey listKey = new ListSpacesKey(key, 0, limit); // - ListSpacesData keys = spacesCache.get( + ListSpacesData keys = spacesFutureCache.get( new ServiceContext() { public ListSpacesData execute() { if (limit == 0) { @@ -982,7 +931,7 @@ public int getNumberOfMemberPublicSpaces(final String userId) { SpaceFilterKey key = new SpaceFilterKey(userId, null, SpaceType.PUBLIC); // - return spacesCountCache.get( + return spacesCountFutureCache.get( new ServiceContext() { public IntegerData execute() { return new IntegerData(CachedSpaceStorage.super.getNumberOfMemberPublicSpaces(userId)); @@ -1000,7 +949,7 @@ public List getVisitedSpaces(final SpaceFilter filter, final int offset, ListSpacesKey listKey = new ListSpacesKey(key, offset, limit); // - ListSpacesData keys = spacesCache.get(new ServiceContext() { + ListSpacesData keys = spacesFutureCache.get(new ServiceContext() { public ListSpacesData execute() { if (limit == 0) { return buildIds(Collections.emptyList()); @@ -1021,17 +970,16 @@ public List getMemberRoleSpaceIdentityIds(String identityId, int offset, ListSpacesKey listKey = new ListSpacesKey(key, offset, limit); // - ListSpacesData keys = spacesCache.get( - new ServiceContext() { - public ListSpacesData execute() { - if (limit == 0) { - return buildIds(Collections.emptyList()); - } - List got = CachedSpaceStorage.super.getMemberRoleSpaceIdentityIds(identityId, offset, limit); - return buildListIdentityIds(got); - } - }, - listKey); + ListSpacesData keys = spacesFutureCache.get(() -> { + if (limit == 0) { + return buildIds(Collections.emptyList()); + } + List got = + CachedSpaceStorage.super.getMemberRoleSpaceIdentityIds(identityId, + offset, + limit); + return buildListIdentityIds(got); + }, listKey); // return buildIds(keys); @@ -1044,56 +992,33 @@ public List getMemberRoleSpaceIds(String identityId, int offset, int lim ListSpacesKey listKey = new ListSpacesKey(key, offset, limit); // - ListSpacesData keys = spacesCache.get( - new ServiceContext() { - public ListSpacesData execute() { - if (limit == 0) { - return buildIds(Collections.emptyList()); - } - List got = CachedSpaceStorage.super.getMemberRoleSpaceIds(identityId, - offset, - limit); - return buildListIdentityIds(got); - } - }, - listKey); + ListSpacesData keys = spacesFutureCache.get(() -> { + if (limit == 0) { + return buildIds(Collections.emptyList()); + } + List got = CachedSpaceStorage.super.getMemberRoleSpaceIds(identityId, + offset, + limit); + return buildListIdentityIds(got); + }, listKey); // return buildIds(keys); } - private SpaceKey putSpaceInCacheIfNotExists(Space space) { - SpaceKey key = new SpaceKey(space.getId()); - if(exoSpaceCache.get(key) == null) { - exoSpaceCache.putLocal(key, new SpaceData(space)); - exoSpaceSimpleCache.putLocal(key, new SpaceSimpleData(space)); - } - SpaceRefKey refKey = new SpaceRefKey(space.getDisplayName(), null, null, null); - if(exoRefSpaceCache.get(refKey) == null) { - exoRefSpaceCache.putLocal(refKey, key); - } - refKey = new SpaceRefKey(null, null, space.getGroupId(), null); - if(exoRefSpaceCache.get(refKey) == null) { - exoRefSpaceCache.putLocal(refKey, key); - } - refKey = new SpaceRefKey(null, space.getPrettyName(), null, null); - if(exoRefSpaceCache.get(refKey) == null) { - exoRefSpaceCache.putLocal(refKey, key); - } - refKey = new SpaceRefKey(null, null, null, space.getUrl()); - if(exoRefSpaceCache.get(refKey) == null) { - exoRefSpaceCache.putLocal(refKey, key); - } - return key; + @Override + public Map countSpacesByTemplate() { + return spacesCountByTemplateFutureCache.get(() -> new HashMap<>(super.countSpacesByTemplate()), + EMPTY_SPACE_KEY); } public void clearSpaceCached(String spaceId) { SpaceKey cacheKey = new SpaceKey(spaceId); - SpaceData cachedSpace = exoSpaceCache.get(cacheKey); + SpaceData cachedSpace = spaceCache.get(cacheKey); if (cachedSpace != null) { Space space = cachedSpace.build(); - exoSpaceSimpleCache.remove(cacheKey); - exoSpaceCache.remove(cacheKey); + spaceSimpleCache.remove(cacheKey); + spaceCache.remove(cacheKey); cleanRef(space); } clearSpaceCache(); @@ -1101,12 +1026,38 @@ public void clearSpaceCached(String spaceId) { } public void clearCaches() { - exoSpaceCache.clearCache(); - exoSpaceSimpleCache.clearCache(); - exoSpacesCountCache.clearCache(); - exoSpacesCache.clearCache(); - exoRefSpaceCache.clearCache(); - exoIdentitiesCache.clearCache(); + spaceCache.clearCache(); + spaceSimpleCache.clearCache(); + spacesCountCache.clearCache(); + spacesCountByTemplateCache.clearCache(); + spacesCache.clearCache(); + spaceRefCache.clearCache(); + identitiesCache.clearCache(); + } + + private SpaceKey putSpaceInCacheIfNotExists(Space space) { + SpaceKey key = new SpaceKey(space.getId()); + if(spaceCache.get(key) == null) { + spaceCache.putLocal(key, new SpaceData(space)); + spaceSimpleCache.putLocal(key, new SpaceSimpleData(space)); + } + SpaceRefKey refKey = new SpaceRefKey(space.getDisplayName(), null, null, null); + if(spaceRefCache.get(refKey) == null) { + spaceRefCache.putLocal(refKey, key); + } + refKey = new SpaceRefKey(null, null, space.getGroupId(), null); + if(spaceRefCache.get(refKey) == null) { + spaceRefCache.putLocal(refKey, key); + } + refKey = new SpaceRefKey(null, space.getPrettyName(), null, null); + if(spaceRefCache.get(refKey) == null) { + spaceRefCache.putLocal(refKey, key); + } + refKey = new SpaceRefKey(null, null, null, space.getUrl()); + if(spaceRefCache.get(refKey) == null) { + spaceRefCache.putLocal(refKey, key); + } + return key; } } diff --git a/component/core/src/main/java/org/exoplatform/social/core/storage/cache/SocialStorageCacheService.java b/component/core/src/main/java/org/exoplatform/social/core/storage/cache/SocialStorageCacheService.java index afc9705c92e..d844be9236a 100644 --- a/component/core/src/main/java/org/exoplatform/social/core/storage/cache/SocialStorageCacheService.java +++ b/component/core/src/main/java/org/exoplatform/social/core/storage/cache/SocialStorageCacheService.java @@ -17,7 +17,8 @@ package org.exoplatform.social.core.storage.cache; -import org.exoplatform.commons.file.model.FileItem; +import java.util.HashMap; + import org.exoplatform.services.cache.CacheService; import org.exoplatform.services.cache.ExoCache; import org.exoplatform.social.core.storage.cache.model.data.ActivityData; @@ -80,6 +81,7 @@ public class SocialStorageCacheService { private final ExoCache spaceCache; private final ExoCache spaceRefCache; private final ExoCache spacesCountCache; + private final ExoCache> spacesCountByTemplateCache; private final ExoCache spacesCache; private final ExoCache spaceSimpleCache; @@ -107,12 +109,17 @@ public SocialStorageCacheService(CacheService cacheService) { this.spaceCache = CacheType.SPACE.getFromService(cacheService); this.spaceRefCache = CacheType.SPACE_REF.getFromService(cacheService); this.spacesCountCache = CacheType.SPACES_COUNT.getFromService(cacheService); + this.spacesCountByTemplateCache = CacheType.SPACES_COUNT_BY_TEMPLATE.getFromService(cacheService); this.spacesCache = CacheType.SPACES.getFromService(cacheService); this.spaceSimpleCache = CacheType.SPACE_SIMPLE.getFromService(cacheService); } + public ExoCache> getSpacesCountByTemplateCache() { + return spacesCountByTemplateCache; + } + public ExoCache getIdentityCache() { return identityCache; } @@ -187,4 +194,5 @@ public ExoCache getSpacesCountCache() { public ExoCache getSpacesCache() { return spacesCache; } + } diff --git a/component/core/src/main/resources/db/changelog/social-rdbms.db.changelog-1.0.0.xml b/component/core/src/main/resources/db/changelog/social-rdbms.db.changelog-1.0.0.xml index b24db35d527..abd24dbad5c 100644 --- a/component/core/src/main/resources/db/changelog/social-rdbms.db.changelog-1.0.0.xml +++ b/component/core/src/main/resources/db/changelog/social-rdbms.db.changelog-1.0.0.xml @@ -1018,4 +1018,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/component/core/src/main/resources/db/changelog/social-rdbms.db.changelog-master.xml b/component/core/src/main/resources/db/changelog/social-rdbms.db.changelog-master.xml deleted file mode 100644 index 7abc934bae5..00000000000 --- a/component/core/src/main/resources/db/changelog/social-rdbms.db.changelog-master.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/component/core/src/main/resources/jpa-entities.idx b/component/core/src/main/resources/jpa-entities.idx index 7306feca9da..15a3f9cb006 100644 --- a/component/core/src/main/resources/jpa-entities.idx +++ b/component/core/src/main/resources/jpa-entities.idx @@ -20,3 +20,4 @@ org.exoplatform.social.core.jpa.storage.entity.ProfileLabelEntity io.meeds.social.link.entity.LinkSettingEntity org.exoplatform.social.core.jpa.storage.entity.SpaceExternalInvitationEntity org.exoplatform.social.core.jpa.storage.entity.MetadataItemEntity +io.meeds.social.space.template.entity.SpaceTemplateEntity diff --git a/component/core/src/test/java/io/meeds/social/space/template/plugin/attachment/SpaceTemplateBannerAttachmentPluginTest.java b/component/core/src/test/java/io/meeds/social/space/template/plugin/attachment/SpaceTemplateBannerAttachmentPluginTest.java new file mode 100644 index 00000000000..d7f91ae6baf --- /dev/null +++ b/component/core/src/test/java/io/meeds/social/space/template/plugin/attachment/SpaceTemplateBannerAttachmentPluginTest.java @@ -0,0 +1,113 @@ +/** + * This file is part of the Meeds project (https://meeds.io/). + * + * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package io.meeds.social.space.template.plugin.attachment; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.when; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; + +import org.exoplatform.commons.exception.ObjectNotFoundException; +import org.exoplatform.services.security.Identity; +import org.exoplatform.social.attachment.AttachmentService; + +import io.meeds.social.space.template.model.SpaceTemplate; +import io.meeds.social.space.template.service.SpaceTemplateService; + +import lombok.SneakyThrows; + +@RunWith(MockitoJUnitRunner.class) +public class SpaceTemplateBannerAttachmentPluginTest { + + @Mock + private SpaceTemplateService spaceTemplateService; + + @Mock + private AttachmentService attachmentService; + + private SpaceTemplateBannerAttachmentPlugin attachmentPlugin; + + @Mock + private Identity userIdentity; + + @Mock + private SpaceTemplate spaceTemplate; + + @Before + public void init() { + attachmentPlugin = new SpaceTemplateBannerAttachmentPlugin(); + attachmentPlugin.attachmentService = attachmentService; + attachmentPlugin.spaceTemplateService = spaceTemplateService; + } + + @Test + public void getObjectType() { + assertEquals(SpaceTemplateBannerAttachmentPlugin.OBJECT_TYPE, attachmentPlugin.getObjectType()); + } + + @Test + @SneakyThrows + public void testHasEditPermission() { + assertFalse(attachmentPlugin.hasEditPermission(null, null)); + assertFalse(attachmentPlugin.hasEditPermission(userIdentity, null)); + + when(userIdentity.getUserId()).thenReturn("test"); + assertFalse(attachmentPlugin.hasEditPermission(userIdentity, null)); + + when(spaceTemplateService.canManageTemplates("test")).thenReturn(true); + assertTrue(attachmentPlugin.hasEditPermission(userIdentity, "2")); + } + + @Test + @SneakyThrows + public void testHasAccessPermission() { + assertFalse(attachmentPlugin.hasAccessPermission(null, null)); + assertFalse(attachmentPlugin.hasAccessPermission(userIdentity, null)); + assertFalse(attachmentPlugin.hasAccessPermission(null, "2")); + + when(userIdentity.getUserId()).thenReturn("test"); + assertThrows(ObjectNotFoundException.class, () -> attachmentPlugin.hasAccessPermission(userIdentity, "2")); + + when(spaceTemplateService.getSpaceTemplate(2)).thenReturn(spaceTemplate); + assertFalse(attachmentPlugin.hasAccessPermission(userIdentity, "2")); + + when(spaceTemplateService.canViewTemplate(2, "test")).thenReturn(true); + assertTrue(attachmentPlugin.hasAccessPermission(userIdentity, "2")); + } + + @Test + @SneakyThrows + public void getAudienceId() { + assertEquals(0l, attachmentPlugin.getAudienceId(null)); + } + + @Test + @SneakyThrows + public void getSpaceId() { + assertEquals(0l, attachmentPlugin.getSpaceId("")); + } + +} diff --git a/component/core/src/test/java/io/meeds/social/space/template/plugin/translation/SpaceTemplateTranslationPluginTest.java b/component/core/src/test/java/io/meeds/social/space/template/plugin/translation/SpaceTemplateTranslationPluginTest.java new file mode 100644 index 00000000000..d0ac653e3b5 --- /dev/null +++ b/component/core/src/test/java/io/meeds/social/space/template/plugin/translation/SpaceTemplateTranslationPluginTest.java @@ -0,0 +1,102 @@ +/** + * This file is part of the Meeds project (https://meeds.io/). + * + * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package io.meeds.social.space.template.plugin.translation; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.when; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; + +import org.exoplatform.commons.exception.ObjectNotFoundException; + +import io.meeds.social.space.template.model.SpaceTemplate; +import io.meeds.social.space.template.service.SpaceTemplateService; +import io.meeds.social.translation.service.TranslationService; + +import lombok.SneakyThrows; + +@RunWith(MockitoJUnitRunner.class) +public class SpaceTemplateTranslationPluginTest { + + private static final String TEST_USER = "test"; + + @Mock + private SpaceTemplateService spaceTemplateService; + + @Mock + private TranslationService translationService; + + @Mock + private SpaceTemplate spaceTemplate; + + private SpaceTemplateTranslationPlugin translationPlugin; + + @Before + public void init() { + translationPlugin = new SpaceTemplateTranslationPlugin(); + translationPlugin.translationService = translationService; + translationPlugin.spaceTemplateService = spaceTemplateService; + } + + @Test + @SneakyThrows + public void testHasEditPermission() { + assertFalse(translationPlugin.hasEditPermission(0, TEST_USER)); + when(spaceTemplateService.canManageTemplates(TEST_USER)).thenReturn(true); + assertTrue(translationPlugin.hasEditPermission(0, TEST_USER)); + } + + @Test + @SneakyThrows + public void testHasAccessPermission() { + assertThrows(ObjectNotFoundException.class, () -> translationPlugin.hasAccessPermission(2, TEST_USER)); + when(spaceTemplateService.canManageTemplates(TEST_USER)).thenReturn(true); + assertTrue(translationPlugin.hasEditPermission(0, TEST_USER)); + + when(spaceTemplateService.getSpaceTemplate(2)).thenReturn(spaceTemplate); + assertFalse(translationPlugin.hasAccessPermission(2, TEST_USER)); + assertThrows(ObjectNotFoundException.class, () -> translationPlugin.hasAccessPermission(3, TEST_USER)); + + when(spaceTemplateService.canViewTemplate(2, TEST_USER)).thenReturn(true); + assertTrue(translationPlugin.hasAccessPermission(2, TEST_USER)); + } + + @Test + public void getObjectType() { + assertEquals(SpaceTemplateTranslationPlugin.OBJECT_TYPE, translationPlugin.getObjectType()); + } + + @Test + public void getAudienceId() { + assertEquals(0l, translationPlugin.getAudienceId(0)); + } + + @Test + public void getSpaceId() { + assertEquals(0l, translationPlugin.getSpaceId(0)); + } + +} diff --git a/component/core/src/test/java/io/meeds/social/space/template/service/SpaceTemplateServiceTest.java b/component/core/src/test/java/io/meeds/social/space/template/service/SpaceTemplateServiceTest.java new file mode 100644 index 00000000000..d88ab60d8a3 --- /dev/null +++ b/component/core/src/test/java/io/meeds/social/space/template/service/SpaceTemplateServiceTest.java @@ -0,0 +1,246 @@ +/** + * This file is part of the Meeds project (https://meeds.io/). + * + * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package io.meeds.social.space.template.service; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThrows; +import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.util.Arrays; +import java.util.List; +import java.util.Locale; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; +import org.springframework.data.domain.Pageable; + +import org.exoplatform.commons.exception.ObjectNotFoundException; +import org.exoplatform.portal.config.UserACL; +import org.exoplatform.services.security.Identity; +import org.exoplatform.services.security.MembershipEntry; +import org.exoplatform.social.attachment.AttachmentService; +import org.exoplatform.social.core.space.SpacesAdministrationService; + +import io.meeds.social.space.constant.Registration; +import io.meeds.social.space.constant.Visibility; +import io.meeds.social.space.template.model.SpaceTemplate; +import io.meeds.social.space.template.model.SpaceTemplateFilter; +import io.meeds.social.space.template.storage.SpaceTemplateStorage; +import io.meeds.social.translation.service.TranslationService; + +@RunWith(MockitoJUnitRunner.class) +public class SpaceTemplateServiceTest { + + private static final String SPACE_FIELDS = "spaceFields"; + + private static final String SPACE_DELETE_PERMISSIONS = "spaceDeletePermissions"; + + private static final String SPACE_LAYOUT_PERMISSIONS = "spaceLayoutPermissions"; + + private static final String CREATE_AND_ACCESS_PERMISSIONS = "permissions"; + + private static final String TEST_USER = "testuser"; + + @Mock + protected TranslationService translationService; + + @Mock + protected AttachmentService attachmentService; + + @Mock + protected SpacesAdministrationService spacesAdministrationService; + + @Mock + protected UserACL userAcl; + + @Mock + private SpaceTemplateStorage spaceTemplateStorage; + + @Mock + private Identity userIdentity; + + private SpaceTemplateService spaceTemplateService; + + @Before + public void init() { + spaceTemplateService = new SpaceTemplateService(); + spaceTemplateService.translationService = translationService; + spaceTemplateService.attachmentService = attachmentService; + spaceTemplateService.spacesAdministrationService = spacesAdministrationService; + spaceTemplateService.userAcl = userAcl; + spaceTemplateService.spaceTemplateStorage = spaceTemplateStorage; + } + + @Test + public void testGetSpaceTemplates() { + Pageable pageable = Pageable.unpaged(); + List spaceTemplates = spaceTemplateService.getSpaceTemplates(new SpaceTemplateFilter(), pageable, true); + assertNotNull(spaceTemplates); + assertEquals(0, spaceTemplates.size()); + + SpaceTemplate spaceTemplate = newSpaceTemplate(2l); + when(spaceTemplateStorage.getSpaceTemplates(pageable)).then(invocation -> List.of(spaceTemplate)); + spaceTemplates = spaceTemplateService.getSpaceTemplates(null, pageable, true); + assertNotNull(spaceTemplates); + assertEquals(1, spaceTemplates.size()); + assertEquals(spaceTemplate, spaceTemplates.get(0)); + + SpaceTemplateFilter spaceTemplateFilter = new SpaceTemplateFilter(); + spaceTemplateFilter.setUsername(TEST_USER); + spaceTemplateFilter.setIncludeDisabled(true); + spaceTemplates = spaceTemplateService.getSpaceTemplates(spaceTemplateFilter, pageable, true); + assertNotNull(spaceTemplates); + assertEquals(0, spaceTemplates.size()); + + setCanViewTemplate(true); + when(spaceTemplateStorage.getSpaceTemplate(2l)).thenReturn(spaceTemplate); + + spaceTemplates = spaceTemplateService.getSpaceTemplates(spaceTemplateFilter, pageable, false); + assertNotNull(spaceTemplates); + assertEquals(1, spaceTemplates.size()); + assertEquals(spaceTemplate, spaceTemplates.get(0)); + } + + @Test + public void testGetSpaceTemplate() throws IllegalAccessException { + assertNull(spaceTemplateService.getSpaceTemplate(2l)); + assertNull(spaceTemplateService.getSpaceTemplate(2l, TEST_USER, Locale.ENGLISH, false)); + + SpaceTemplate spaceTemplate = newSpaceTemplate(2l); + when(spaceTemplateStorage.getSpaceTemplate(2l)).thenReturn(spaceTemplate); + assertEquals(spaceTemplate, spaceTemplateService.getSpaceTemplate(2l)); + + assertThrows(IllegalAccessException.class, () -> spaceTemplateService.getSpaceTemplate(2l, TEST_USER, Locale.ENGLISH, false)); + setCanViewTemplate(true); + assertEquals(spaceTemplate, spaceTemplateService.getSpaceTemplate(2l, TEST_USER, Locale.ENGLISH, false)); + } + + @Test + public void testCanManageTemplates() { + assertFalse(spaceTemplateService.canManageTemplates(TEST_USER)); + setCanManageTemplate(true); + assertTrue(spaceTemplateService.canManageTemplates(TEST_USER)); + } + + @Test + public void testCanViewTemplateWhenManager() { + assertFalse(spaceTemplateService.canViewTemplate(2l, null)); + assertFalse(spaceTemplateService.canViewTemplate(2l, TEST_USER)); + setCanManageTemplate(true); + assertTrue(spaceTemplateService.canViewTemplate(2l, TEST_USER)); + } + + @Test + public void testCanViewTemplateWhenMemberOfPermissions() { + assertFalse(spaceTemplateService.canViewTemplate(2l, TEST_USER)); + setCanViewTemplate(true); + assertFalse(spaceTemplateService.canViewTemplate(2l, TEST_USER)); + when(spaceTemplateStorage.getSpaceTemplate(2l)).thenReturn(newSpaceTemplate(2l)); + assertTrue(spaceTemplateService.canViewTemplate(2l, TEST_USER)); + } + + @Test + public void testCreateSpaceTemplate() throws IllegalAccessException { + assertThrows(IllegalAccessException.class, () -> spaceTemplateService.createSpaceTemplate(newSpaceTemplate(0l), TEST_USER)); + setCanManageTemplate(true); + assertThrows(IllegalArgumentException.class, () -> spaceTemplateService.createSpaceTemplate(newSpaceTemplate(2l), TEST_USER)); + SpaceTemplate spaceTemplate = newSpaceTemplate(0l); + spaceTemplateService.createSpaceTemplate(spaceTemplate, TEST_USER); + verify(spaceTemplateStorage).createSpaceTemplate(spaceTemplate); + } + + @Test + public void testUpdateSpaceTemplate() throws ObjectNotFoundException, IllegalAccessException { + SpaceTemplate spaceTemplate = newSpaceTemplate(2l); + assertThrows(IllegalAccessException.class, () -> spaceTemplateService.updateSpaceTemplate(spaceTemplate, TEST_USER)); + setCanManageTemplate(true); + spaceTemplate.setDeleted(true); + assertThrows(IllegalArgumentException.class, () -> spaceTemplateService.updateSpaceTemplate(spaceTemplate, TEST_USER)); + + SpaceTemplate savedSpaceTemplate = newSpaceTemplate(2l); + when(spaceTemplateStorage.getSpaceTemplate(2l)).thenReturn(savedSpaceTemplate); + savedSpaceTemplate.setDeleted(true); + spaceTemplate.setDeleted(false); + + assertThrows(ObjectNotFoundException.class, () -> spaceTemplateService.updateSpaceTemplate(spaceTemplate, TEST_USER)); + + savedSpaceTemplate.setDeleted(false); + spaceTemplateService.updateSpaceTemplate(spaceTemplate, TEST_USER); + verify(spaceTemplateStorage).updateSpaceTemplate(spaceTemplate); + } + + @Test + public void testDeleteSpaceTemplate() throws IllegalAccessException, ObjectNotFoundException { + assertThrows(IllegalAccessException.class, () -> spaceTemplateService.deleteSpaceTemplate(2l, TEST_USER)); + setCanManageTemplate(true); + assertThrows(ObjectNotFoundException.class, () -> spaceTemplateService.deleteSpaceTemplate(2l, TEST_USER)); + + SpaceTemplate savedSpaceTemplate = newSpaceTemplate(2l); + when(spaceTemplateStorage.getSpaceTemplate(2l)).thenReturn(savedSpaceTemplate); + savedSpaceTemplate.setSystem(false); + savedSpaceTemplate.setDeleted(true); + assertThrows(ObjectNotFoundException.class, () -> spaceTemplateService.deleteSpaceTemplate(2l, TEST_USER)); + + savedSpaceTemplate.setDeleted(false); + savedSpaceTemplate.setSystem(true); + assertThrows(IllegalAccessException.class, () -> spaceTemplateService.deleteSpaceTemplate(2l, TEST_USER)); + savedSpaceTemplate.setSystem(false); + + spaceTemplateService.deleteSpaceTemplate(2l, TEST_USER); + verify(spaceTemplateStorage).updateSpaceTemplate(savedSpaceTemplate); + assertTrue(savedSpaceTemplate.isDeleted()); + } + + private void setCanViewTemplate(boolean hasAccess) { + when(userAcl.getUserIdentity(TEST_USER)).thenReturn(userIdentity); + when(userIdentity.isMemberOf(new MembershipEntry(CREATE_AND_ACCESS_PERMISSIONS))).thenReturn(hasAccess); + } + + private void setCanManageTemplate(boolean hasAccess) { + when(spacesAdministrationService.isSuperManager(TEST_USER)).thenReturn(hasAccess); + } + + private SpaceTemplate newSpaceTemplate(long id) { + return new SpaceTemplate(id, + "name", + "description", + 6l, + "icon", + true, + false, + true, + 5l, + Arrays.asList(CREATE_AND_ACCESS_PERMISSIONS), + Arrays.asList(SPACE_LAYOUT_PERMISSIONS), + Arrays.asList(SPACE_DELETE_PERMISSIONS), + Arrays.asList(SPACE_FIELDS), + Visibility.PRIVATE, + Registration.VALIDATION, + true); + } + +} diff --git a/component/core/src/test/java/io/meeds/social/space/template/storage/SpaceTemplateStorageTest.java b/component/core/src/test/java/io/meeds/social/space/template/storage/SpaceTemplateStorageTest.java new file mode 100644 index 00000000000..5ca35f46d56 --- /dev/null +++ b/component/core/src/test/java/io/meeds/social/space/template/storage/SpaceTemplateStorageTest.java @@ -0,0 +1,184 @@ +/** + * This file is part of the Meeds project (https://meeds.io/). + * + * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package io.meeds.social.space.template.storage; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; +import static org.junit.Assert.assertThrows; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import java.util.Arrays; +import java.util.List; +import java.util.Optional; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.junit.MockitoJUnitRunner; +import org.springframework.data.domain.Pageable; + +import org.exoplatform.commons.exception.ObjectNotFoundException; + +import io.meeds.social.space.constant.Registration; +import io.meeds.social.space.constant.Visibility; +import io.meeds.social.space.template.dao.SpaceTemplateDAO; +import io.meeds.social.space.template.entity.SpaceTemplateEntity; +import io.meeds.social.space.template.model.SpaceTemplate; + +@RunWith(MockitoJUnitRunner.class) +public class SpaceTemplateStorageTest { + + @Mock + private SpaceTemplateDAO spaceTemplateDAO; + + private SpaceTemplateStorage spaceTemplateStorage; + + @Before + public void init() { + spaceTemplateStorage = new SpaceTemplateStorage(); + spaceTemplateStorage.spaceTemplateDAO = spaceTemplateDAO; + } + + @Test + public void testGetSpaceTemplates() { + SpaceTemplateEntity spaceTemplateEntity = newSpaceTemplateEntity(); + when(spaceTemplateDAO.findByDeletedFalse(any())).thenAnswer(invocation -> List.of(spaceTemplateEntity)); + List spaceTemplates = spaceTemplateStorage.getSpaceTemplates(Pageable.unpaged()); + assertNotNull(spaceTemplates); + assertEquals(1l, spaceTemplates.size()); + + spaceTemplates = spaceTemplateStorage.getSpaceTemplates(Pageable.unpaged()); + SpaceTemplate spaceTemplate = spaceTemplates.get(0); + checkEntityEqualsModel(spaceTemplateEntity, spaceTemplate); + } + + @Test + public void testGetEnabledSpaceTemplates() { + SpaceTemplateEntity spaceTemplateEntity = newSpaceTemplateEntity(); + when(spaceTemplateDAO.findByDeletedFalseAndEnabledTrue(any())).thenAnswer(invocation -> List.of(spaceTemplateEntity)); + List spaceTemplates = spaceTemplateStorage.getEnabledSpaceTemplates(Pageable.unpaged()); + assertNotNull(spaceTemplates); + assertEquals(1l, spaceTemplates.size()); + + spaceTemplates = spaceTemplateStorage.getEnabledSpaceTemplates(Pageable.unpaged()); + SpaceTemplate spaceTemplate = spaceTemplates.get(0); + checkEntityEqualsModel(spaceTemplateEntity, spaceTemplate); + } + + @Test + public void testGetSpaceTemplate() { + assertNull(spaceTemplateStorage.getSpaceTemplate(3l)); + + SpaceTemplateEntity spaceTemplateEntity = newSpaceTemplateEntity(); + when(spaceTemplateDAO.findById(3l)).thenAnswer(invocation -> Optional.of(spaceTemplateEntity)); + SpaceTemplate spaceTemplate = spaceTemplateStorage.getSpaceTemplate(3l); + assertNotNull(spaceTemplate); + checkEntityEqualsModel(spaceTemplateEntity, spaceTemplate); + } + + @Test + public void testCreateSpaceTemplate() { + SpaceTemplate spaceTemplate = newSpaceTemplate(); + when(spaceTemplateDAO.save(any())).thenReturn(newSpaceTemplateEntity()); + SpaceTemplate createdSpaceTemplate = spaceTemplateStorage.createSpaceTemplate(spaceTemplate); + assertNotNull(createdSpaceTemplate); + spaceTemplate.setName(null); + spaceTemplate.setDescription(null); + spaceTemplate.setBannerFileId(0); + assertEquals(spaceTemplate, createdSpaceTemplate); + } + + @Test + public void testUpdateSpaceTemplate() throws ObjectNotFoundException { + SpaceTemplate spaceTemplate = newSpaceTemplate(); + assertThrows(ObjectNotFoundException.class, () -> spaceTemplateStorage.updateSpaceTemplate(spaceTemplate)); + when(spaceTemplateDAO.existsById(spaceTemplate.getId())).thenReturn(true); + when(spaceTemplateDAO.save(any())).thenReturn(newSpaceTemplateEntity()); + SpaceTemplate updatedSpaceTemplate = spaceTemplateStorage.updateSpaceTemplate(spaceTemplate); + assertNotNull(updatedSpaceTemplate); + spaceTemplate.setName(null); + spaceTemplate.setDescription(null); + spaceTemplate.setBannerFileId(0); + assertEquals(spaceTemplate, updatedSpaceTemplate); + } + + @Test + public void testDeleteSpaceTemplate() { + spaceTemplateStorage.deleteSpaceTemplate(2l); + verify(spaceTemplateDAO).deleteById(2l); + } + + private void checkEntityEqualsModel(SpaceTemplateEntity spaceTemplateEntity, SpaceTemplate spaceTemplate) { + assertNotNull(spaceTemplate); + assertEquals(spaceTemplateEntity.getId().longValue(), spaceTemplate.getId()); + assertEquals(spaceTemplateEntity.getIcon(), spaceTemplate.getIcon()); + assertEquals(spaceTemplateEntity.getOrder(), spaceTemplate.getOrder()); + assertEquals(spaceTemplateEntity.getPermissions(), spaceTemplate.getPermissions()); + assertEquals(spaceTemplateEntity.getIcon(), spaceTemplate.getIcon()); + assertEquals(spaceTemplateEntity.isEnabled(), spaceTemplate.isEnabled()); + assertEquals(spaceTemplateEntity.isDeleted(), spaceTemplate.isDeleted()); + assertEquals(spaceTemplateEntity.isSystem(), spaceTemplate.isSystem()); + assertEquals(spaceTemplateEntity.getSpaceDeletePermissions(), spaceTemplate.getSpaceDeletePermissions()); + assertEquals(spaceTemplateEntity.getSpaceLayoutPermissions(), spaceTemplate.getSpaceLayoutPermissions()); + assertEquals(spaceTemplateEntity.getSpaceFields(), spaceTemplate.getSpaceFields()); + assertEquals(spaceTemplateEntity.getSpaceDefaultVisibility(), spaceTemplate.getSpaceDefaultVisibility()); + assertEquals(spaceTemplateEntity.getSpaceDefaultRegistration(), spaceTemplate.getSpaceDefaultRegistration()); + assertEquals(spaceTemplateEntity.isSpaceAllowContentCreation(), spaceTemplate.isSpaceAllowContentCreation()); + } + + private SpaceTemplateEntity newSpaceTemplateEntity() { + return new SpaceTemplateEntity(2l, + "icon", + true, + false, + true, + 5l, + Arrays.asList("permissions"), + Arrays.asList("spaceLayoutPermissions"), + Arrays.asList("spaceDeletePermissions"), + Arrays.asList("spaceFields"), + Visibility.PRIVATE, + Registration.VALIDATION, + true); + } + + private SpaceTemplate newSpaceTemplate() { + return new SpaceTemplate(2l, + "name", + "description", + 6l, + "icon", + true, + false, + true, + 5l, + Arrays.asList("permissions"), + Arrays.asList("spaceLayoutPermissions"), + Arrays.asList("spaceDeletePermissions"), + Arrays.asList("spaceFields"), + Visibility.PRIVATE, + Registration.VALIDATION, + true); + } + +} diff --git a/component/core/src/test/java/org/exoplatform/social/core/jpa/storage/dao/SpaceDAOTest.java b/component/core/src/test/java/org/exoplatform/social/core/jpa/storage/dao/SpaceDAOTest.java index 2092a723f4e..5bb6dc5026f 100644 --- a/component/core/src/test/java/org/exoplatform/social/core/jpa/storage/dao/SpaceDAOTest.java +++ b/component/core/src/test/java/org/exoplatform/social/core/jpa/storage/dao/SpaceDAOTest.java @@ -32,7 +32,10 @@ import org.exoplatform.social.core.jpa.storage.entity.SpaceMemberEntity; import org.exoplatform.social.core.jpa.test.BaseCoreTest; +import io.meeds.social.space.constant.Priority; +import io.meeds.social.space.constant.Registration; import io.meeds.social.space.constant.SpaceMembershipStatus; +import io.meeds.social.space.constant.Visibility; public class SpaceDAOTest extends BaseCoreTest { private SpaceDAO spaceDAO; @@ -106,10 +109,10 @@ private SpaceEntity createSpace(String spacePrettyName) { spaceEntity.setDisplayName("testDisplayName"); spaceEntity.setGroupId("testGroupId"); spaceEntity.setPrettyName(spacePrettyName); - spaceEntity.setPriority(SpaceEntity.PRIORITY.HIGH); - spaceEntity.setRegistration(SpaceEntity.REGISTRATION.OPEN); + spaceEntity.setPriority(Priority.HIGH); + spaceEntity.setRegistration(Registration.OPEN); spaceEntity.setUrl("testUrl"); - spaceEntity.setVisibility(SpaceEntity.VISIBILITY.PRIVATE); + spaceEntity.setVisibility(Visibility.PRIVATE); spaceEntity.setBannerLastUpdated(new Date()); addMember(spaceEntity, "root", SpaceMembershipStatus.PENDING); diff --git a/component/core/src/test/java/org/exoplatform/social/core/jpa/storage/dao/SpaceMemberDAOTest.java b/component/core/src/test/java/org/exoplatform/social/core/jpa/storage/dao/SpaceMemberDAOTest.java index 8859980b32e..effb98b671a 100644 --- a/component/core/src/test/java/org/exoplatform/social/core/jpa/storage/dao/SpaceMemberDAOTest.java +++ b/component/core/src/test/java/org/exoplatform/social/core/jpa/storage/dao/SpaceMemberDAOTest.java @@ -31,7 +31,10 @@ import org.exoplatform.social.core.jpa.storage.entity.SpaceMemberEntity; import org.exoplatform.social.core.jpa.test.BaseCoreTest; +import io.meeds.social.space.constant.Priority; +import io.meeds.social.space.constant.Registration; import io.meeds.social.space.constant.SpaceMembershipStatus; +import io.meeds.social.space.constant.Visibility; public class SpaceMemberDAOTest extends BaseCoreTest { @@ -122,10 +125,10 @@ private SpaceEntity createSpace(String name) { spaceEntity.setDisplayName(name); spaceEntity.setGroupId(name+"GroupId"); spaceEntity.setPrettyName(name); - spaceEntity.setPriority(SpaceEntity.PRIORITY.HIGH); - spaceEntity.setRegistration(SpaceEntity.REGISTRATION.OPEN); + spaceEntity.setPriority(Priority.HIGH); + spaceEntity.setRegistration(Registration.OPEN); spaceEntity.setUrl("testUrl"); - spaceEntity.setVisibility(SpaceEntity.VISIBILITY.PRIVATE); + spaceEntity.setVisibility(Visibility.PRIVATE); spaceEntity.setBannerLastUpdated(new Date()); return spaceEntity; } diff --git a/component/core/src/test/java/org/exoplatform/social/core/test/NoContainerTestSuite.java b/component/core/src/test/java/org/exoplatform/social/core/test/NoContainerTestSuite.java index b66c52d6271..88d893529fe 100644 --- a/component/core/src/test/java/org/exoplatform/social/core/test/NoContainerTestSuite.java +++ b/component/core/src/test/java/org/exoplatform/social/core/test/NoContainerTestSuite.java @@ -37,6 +37,10 @@ import io.meeds.social.authorization.AuthorizationManagerTest; import io.meeds.social.core.search.SpaceSearchConnectorTest; import io.meeds.social.image.plugin.ImageAttachmentPluginTest; +import io.meeds.social.space.template.plugin.attachment.SpaceTemplateBannerAttachmentPluginTest; +import io.meeds.social.space.template.plugin.translation.SpaceTemplateTranslationPluginTest; +import io.meeds.social.space.template.service.SpaceTemplateServiceTest; +import io.meeds.social.space.template.storage.SpaceTemplateStorageTest; import io.meeds.social.upgrade.SpaceNavigationIconUpgradePluginTest; @RunWith(Suite.class) @@ -58,6 +62,10 @@ SpaceNavigationIconUpgradePluginTest.class, AuthorizationManagerTest.class, SpaceSearchConnectorTest.class, + SpaceTemplateBannerAttachmentPluginTest.class, + SpaceTemplateTranslationPluginTest.class, + SpaceTemplateStorageTest.class, + SpaceTemplateServiceTest.class, }) public class NoContainerTestSuite { diff --git a/component/service/src/main/java/io/meeds/social/space/template/rest/SpaceTemplateRest.java b/component/service/src/main/java/io/meeds/social/space/template/rest/SpaceTemplateRest.java new file mode 100644 index 00000000000..ac4eb20404d --- /dev/null +++ b/component/service/src/main/java/io/meeds/social/space/template/rest/SpaceTemplateRest.java @@ -0,0 +1,164 @@ +/** + * This file is part of the Meeds project (https://meeds.io/). + * + * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package io.meeds.social.space.template.rest; + +import java.util.List; + +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.data.domain.Pageable; +import org.springframework.http.HttpStatus; +import org.springframework.security.access.annotation.Secured; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RequestParam; +import org.springframework.web.bind.annotation.RestController; +import org.springframework.web.server.ResponseStatusException; + +import org.exoplatform.commons.exception.ObjectNotFoundException; + +import io.meeds.social.space.template.model.SpaceTemplate; +import io.meeds.social.space.template.model.SpaceTemplateFilter; +import io.meeds.social.space.template.service.SpaceTemplateService; + +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.Parameter; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; +import io.swagger.v3.oas.annotations.tags.Tag; +import jakarta.servlet.http.HttpServletRequest; + +@RestController +@RequestMapping("/space/templates") +@Tag(name = "/social/rest/space/templates", description = "Managing space templates") +public class SpaceTemplateRest { + + @Autowired + private SpaceTemplateService spaceTemplateService; + + @GetMapping + @Secured("users") + @Operation(summary = "Retrieve space templates", method = "GET", description = "This retrieves space templates") + @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Request fulfilled"), }) + public List getSpaceTemplates(HttpServletRequest request, + Pageable pageable, + @Parameter(description = "Whether include disabled templates or not") + @RequestParam("includeDisabled") + boolean includeDisabled) { + SpaceTemplateFilter spaceTemplateFilter = new SpaceTemplateFilter(request.getRemoteUser(), + request.getLocale(), + includeDisabled); + return spaceTemplateService.getSpaceTemplates(spaceTemplateFilter, pageable, true); + } + + @GetMapping("{id}") + @Secured("users") + @Operation(summary = "Retrieve a Space template designated by its id", method = "GET", + description = "This will retrieve a Space template designated by its id") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Request fulfilled"), + @ApiResponse(responseCode = "403", description = "Forbidden"), + @ApiResponse(responseCode = "404", description = "Not found"), + }) + public SpaceTemplate getSpaceTemplate(HttpServletRequest request, + @Parameter(description = "Space template identifier") + @PathVariable("id") + long id) { + try { + SpaceTemplate spaceTemplate = spaceTemplateService.getSpaceTemplate(id, request.getRemoteUser(), request.getLocale(), true); + if (spaceTemplate == null) { + throw new ResponseStatusException(HttpStatus.NOT_FOUND); + } + return spaceTemplate; + } catch (IllegalAccessException e) { + throw new ResponseStatusException(HttpStatus.FORBIDDEN, e.getMessage()); + } + } + + @PostMapping + @Secured("users") + @Operation(summary = "Create a Space template", method = "POST", description = "This creates a new Space template") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Request fulfilled"), + @ApiResponse(responseCode = "403", description = "Forbidden"), + }) + public SpaceTemplate createSpaceTemplate(HttpServletRequest request, + @RequestBody + SpaceTemplate spaceTemplate) { + try { + return spaceTemplateService.createSpaceTemplate(spaceTemplate, request.getRemoteUser()); + } catch (IllegalArgumentException e) { + throw new ResponseStatusException(HttpStatus.BAD_REQUEST, e.getMessage()); + } catch (IllegalAccessException e) { + throw new ResponseStatusException(HttpStatus.FORBIDDEN, e.getMessage()); + } + } + + @PutMapping("{id}") + @Secured("users") + @Operation(summary = "Update a Space template", method = "PUT", description = "This updates an existing Space template") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Request fulfilled"), + @ApiResponse(responseCode = "403", description = "Forbidden"), + @ApiResponse(responseCode = "404", description = "Not found"), + }) + public void updateSpaceTemplate(HttpServletRequest request, + @Parameter(description = "Space template identifier") + @PathVariable("id") + long id, + @RequestBody + SpaceTemplate spaceTemplate) { + try { + spaceTemplate.setId(id); + spaceTemplateService.updateSpaceTemplate(spaceTemplate, request.getRemoteUser()); + } catch (IllegalArgumentException e) { + throw new ResponseStatusException(HttpStatus.BAD_REQUEST, e.getMessage()); + } catch (ObjectNotFoundException e) { + throw new ResponseStatusException(HttpStatus.NOT_FOUND, e.getMessage()); + } catch (IllegalAccessException e) { + throw new ResponseStatusException(HttpStatus.FORBIDDEN, e.getMessage()); + } + } + + @DeleteMapping("{id}") + @Secured("users") + @Operation(summary = "Deletes a Space template", method = "DELETE", description = "This deletes an existing Space template") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Request fulfilled"), + @ApiResponse(responseCode = "403", description = "Forbidden"), + @ApiResponse(responseCode = "404", description = "Not found"), + }) + public void deleteSpaceTemplate(HttpServletRequest request, + @Parameter(description = "Space template identifier") + @PathVariable("id") + long id) { + try { + spaceTemplateService.deleteSpaceTemplate(id, request.getRemoteUser()); + } catch (ObjectNotFoundException e) { + throw new ResponseStatusException(HttpStatus.NOT_FOUND, e.getMessage()); + } catch (IllegalAccessException e) { + throw new ResponseStatusException(HttpStatus.FORBIDDEN, e.getMessage()); + } + } + +} diff --git a/component/service/src/main/java/org/exoplatform/social/rest/impl/space/SpaceRest.java b/component/service/src/main/java/org/exoplatform/social/rest/impl/space/SpaceRest.java index 698593feb58..83cb5f3c623 100644 --- a/component/service/src/main/java/org/exoplatform/social/rest/impl/space/SpaceRest.java +++ b/component/service/src/main/java/org/exoplatform/social/rest/impl/space/SpaceRest.java @@ -437,6 +437,19 @@ public Response getSpaceById( return buildSpaceResponse(space, expand, uriInfo, request); } + @GET + @Path("countByTemplate") + @Produces(MediaType.APPLICATION_JSON) + @RolesAllowed("administrators") + @Operation( + summary = "Gets the spaces count by Space Template", + method = "GET", + description = "This returns the spaces count by Space template identifier") + @ApiResponses(value = { @ApiResponse(responseCode = "200", description = "Request fulfilled") }) + public Response countSpacesByTemplate() { + return Response.ok(spaceService.countSpacesByTemplate()).build(); + } + @GET @Path("byPrettyName/{prettyName}") @RolesAllowed("users") diff --git a/component/service/src/main/java/org/exoplatform/social/rest/impl/spacetemplates/SpaceTemplatesRest.java b/component/service/src/main/java/org/exoplatform/social/rest/impl/spacetemplates/SpaceTemplatesRest.java index 68d918bf7f1..7169c40bc56 100644 --- a/component/service/src/main/java/org/exoplatform/social/rest/impl/spacetemplates/SpaceTemplatesRest.java +++ b/component/service/src/main/java/org/exoplatform/social/rest/impl/spacetemplates/SpaceTemplatesRest.java @@ -49,6 +49,8 @@ import org.exoplatform.social.rest.api.RestUtils; import org.exoplatform.social.service.rest.api.VersionResources; +import io.meeds.social.space.template.rest.SpaceTemplateRest; + import io.swagger.v3.oas.annotations.Operation; import io.swagger.v3.oas.annotations.Parameter; import io.swagger.v3.oas.annotations.responses.ApiResponse; @@ -57,12 +59,12 @@ import jakarta.servlet.http.HttpServletRequest; /** - * * Provides REST Services for manipulating space templates. - * + * @deprecated will be replaced by {@link SpaceTemplateRest} */ @Path(VersionResources.VERSION_ONE + "/social/spaceTemplates") @Tag(name = VersionResources.VERSION_ONE + "/social/spaceTemplates", description = "Managing Spaces Templates") +@Deprecated(forRemoval = true) public class SpaceTemplatesRest implements ResourceContainer { private static final Log LOG = ExoLogger.getLogger(SpaceTemplatesRest.class); diff --git a/component/service/src/test/java/org/exoplatform/social/rest/impl/activity/ActivityRestResourcesTest.java b/component/service/src/test/java/org/exoplatform/social/rest/impl/activity/ActivityRestResourcesTest.java index fbafd4e2c36..e7c4b3a268e 100644 --- a/component/service/src/test/java/org/exoplatform/social/rest/impl/activity/ActivityRestResourcesTest.java +++ b/component/service/src/test/java/org/exoplatform/social/rest/impl/activity/ActivityRestResourcesTest.java @@ -28,8 +28,6 @@ public class ActivityRestResourcesTest extends AbstractResourceTest { private IdentityStorage identityStorage; - private IdentityManager identityManager; - private ActivityManager activityManager; private RelationshipManager relationshipManager; @@ -46,13 +44,12 @@ public class ActivityRestResourcesTest extends AbstractResourceTest { private Identity testSpaceIdentity; - public void setUp() throws Exception { + public void setUp() throws Exception { super.setUp(); System.setProperty("gatein.email.domain.url", "localhost:8080"); identityStorage = getContainer().getComponentInstanceOfType(IdentityStorage.class); - identityManager = getContainer().getComponentInstanceOfType(IdentityManager.class); activityManager = getContainer().getComponentInstanceOfType(ActivityManager.class); relationshipManager = getContainer().getComponentInstanceOfType(RelationshipManager.class); spaceService = getContainer().getComponentInstanceOfType(SpaceService.class); diff --git a/component/service/src/test/java/org/exoplatform/social/service/test/MockSpacesAdministrationService.java b/component/service/src/test/java/org/exoplatform/social/service/test/MockSpacesAdministrationService.java index d308ebf0031..273f90c9be1 100644 --- a/component/service/src/test/java/org/exoplatform/social/service/test/MockSpacesAdministrationService.java +++ b/component/service/src/test/java/org/exoplatform/social/service/test/MockSpacesAdministrationService.java @@ -1,6 +1,9 @@ package org.exoplatform.social.service.test; import org.apache.commons.lang3.StringUtils; + +import org.exoplatform.container.ExoContainerContext; +import org.exoplatform.portal.config.UserACL; import org.exoplatform.services.security.IdentityConstants; import org.exoplatform.services.security.MembershipEntry; import org.exoplatform.social.core.space.SpacesAdministrationService; @@ -12,7 +15,7 @@ public class MockSpacesAdministrationService implements SpacesAdministrationServ private List spacesAdministrators = new ArrayList<>(); - private List spacesCreators = new ArrayList<>(); + private List spacesCreators = new ArrayList<>(); @Override public List getSpacesAdministratorsMemberships() { @@ -21,7 +24,7 @@ public List getSpacesAdministratorsMemberships() { @Override public void updateSpacesAdministratorsMemberships(List permissionsExpressions) { - if(permissionsExpressions != null) { + if (permissionsExpressions != null) { spacesAdministrators = new ArrayList<>(permissionsExpressions); } else { spacesAdministrators.clear(); @@ -35,7 +38,7 @@ public List getSpacesCreatorsMemberships() { @Override public void updateSpacesCreatorsMemberships(List permissionsExpressions) { - if(permissionsExpressions != null) { + if (permissionsExpressions != null) { spacesCreators = new ArrayList<>(permissionsExpressions); } else { spacesCreators.clear(); @@ -44,11 +47,25 @@ public void updateSpacesCreatorsMemberships(List permissionsExp @Override public boolean canCreateSpace(String username) { - if (StringUtils.isBlank(username) || IdentityConstants.ANONIM.equals(username) || IdentityConstants.SYSTEM.equals(username)) { + return StringUtils.isNotBlank(username) + && !IdentityConstants.ANONIM.equals(username) + && !IdentityConstants.SYSTEM.equals(username); + } + + @Override + public boolean isSuperManager(String username) { + UserACL userAcl = ExoContainerContext.getService(UserACL.class); + if (StringUtils.isBlank(username) + || IdentityConstants.ANONIM.equals(username) + || IdentityConstants.SYSTEM.equals(username)) { return false; - } - else { + } else if (username.equals(userAcl.getSuperUser())) { return true; } + org.exoplatform.services.security.Identity identity = userAcl.getUserIdentity(username); + return identity != null && (identity.isMemberOf(userAcl.getAdminGroups()) + || getSpacesAdministratorsMemberships().stream() + .anyMatch(identity::isMemberOf)); } + } diff --git a/crowdin.yml b/crowdin.yml index 46576384da6..3c84dc1c3f4 100644 --- a/crowdin.yml +++ b/crowdin.yml @@ -71,9 +71,9 @@ files: [ "escape_special_characters": 0, "escape_quotes" : 0, }, - # extension + # webapp { - "source" : "/extension/war/src/main/resources/locale/notification/template/Notification_en.properties", + "source" : "/webapp/src/main/resources/locale/notification/template/Notification_en.properties", "translation" : "%original_path%/%file_name%!_%locale_with_underscore%.%file_extension%", "translation_replace" : { @@ -91,7 +91,7 @@ files: [ "escape_quotes" : 0, }, { - "source" : "/extension/war/src/main/resources/locale/portal/HamburgerMenu_en.properties", + "source" : "/webapp/src/main/resources/locale/portal/HamburgerMenu_en.properties", "translation" : "%original_path%/%file_name%!_%locale_with_underscore%.%file_extension%", "translation_replace" : { @@ -108,9 +108,8 @@ files: [ "escape_special_characters": 0, "escape_quotes" : 0, }, - # webapp { - "source": "/webapp/portlet/src/main/resources/locale/portal_en.properties", + "source": "/webapp/src/main/resources/locale/portal_en.properties", "translation": "%original_path%/%file_name%!_%locale_with_underscore%.%file_extension%", "translation_replace": { @@ -128,7 +127,7 @@ files: [ "escape_quotes": 0, }, { - "source": "/webapp/portlet/src/main/resources/locale/portlet/Portlets_en.properties", + "source": "/webapp/src/main/resources/locale/portlet/Portlets_en.properties", "translation": "%original_path%/%file_name%!_%locale_with_underscore%.%file_extension%", "translation_replace": { @@ -140,13 +139,13 @@ files: [ "sv_SE": "sv_SE","th_TH": "th","tl_PH": "tl","tr_TR": "tr","uk_UA": "uk","ur_IN": "ur_IN","vi_VN": "vi", "zh_CN": "zh_CN","zh_TW": "zh_TW", }, - "dest": "hub/social/webapp/Portlets.properties", + "dest": "hub/social/webapps.properties", "update_option": "update_as_unapproved", "escape_special_characters": 0, "escape_quotes": 0, }, { - "source": "/webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_en.properties", + "source": "/webapp/src/main/resources/locale/portlet/GeneralSettings_en.properties", "translation": "%original_path%/%file_name%!_%locale_with_underscore%.%file_extension%", "translation_replace": { @@ -164,7 +163,7 @@ files: [ "escape_quotes": 0, }, { - "source": "/webapp/portlet/src/main/resources/locale/portlet/Image_en.properties", + "source": "/webapp/src/main/resources/locale/portlet/Image_en.properties", "translation": "%original_path%/%file_name%!_%locale_with_underscore%.%file_extension%", "translation_replace": { @@ -182,7 +181,7 @@ files: [ "escape_quotes": 0, }, { - "source": "/webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_en.properties", + "source": "/webapp/src/main/resources/locale/portlet/social/SpaceInfosPortlet_en.properties", "translation": "%original_path%/%file_name%!_%locale_with_underscore%.%file_extension%", "translation_replace": { @@ -200,7 +199,7 @@ files: [ "escape_quotes": 0, }, { - "source": "/webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_en.properties", + "source": "/webapp/src/main/resources/locale/portlet/whoisonline/whoisonline_en.properties", "translation": "%original_path%/%file_name%!_%locale_with_underscore%.%file_extension%", "translation_replace": { @@ -218,7 +217,7 @@ files: [ "escape_quotes": 0, }, { - "source": "/webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_en.properties", + "source": "/webapp/src/main/resources/locale/portlet/social/GettingStartedPortlet_en.properties", "translation": "%original_path%/%file_name%!_%locale_with_underscore%.%file_extension%", "translation_replace": { @@ -236,7 +235,7 @@ files: [ "escape_quotes": 0, }, { - "source": "/webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_en.properties", + "source": "/webapp/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_en.properties", "translation": "%original_path%/%file_name%!_%locale_with_underscore%.%file_extension%", "translation_replace": { @@ -254,7 +253,7 @@ files: [ "escape_quotes": 0, }, { - "source": "/webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_en.properties", + "source": "/webapp/src/main/resources/locale/portlet/social/PeopleListApplication_en.properties", "translation": "%original_path%/%file_name%!_%locale_with_underscore%.%file_extension%", "translation_replace": { @@ -272,7 +271,7 @@ files: [ "escape_quotes": 0, }, { - "source": "/webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_en.properties", + "source": "/webapp/src/main/resources/locale/portlet/social/PeopleOverview_en.properties", "translation": "%original_path%/%file_name%!_%locale_with_underscore%.%file_extension%", "translation_replace": { @@ -290,7 +289,7 @@ files: [ "escape_quotes": 0, }, { - "source": "/webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_en.properties", + "source": "/webapp/src/main/resources/locale/portlet/social/ProfileAboutMe_en.properties", "translation": "%original_path%/%file_name%!_%locale_with_underscore%.%file_extension%", "translation_replace": { @@ -308,7 +307,7 @@ files: [ "escape_quotes": 0, }, { - "source": "/webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_en.properties", + "source": "/webapp/src/main/resources/locale/portlet/social/ProfileContactInformation_en.properties", "translation": "%original_path%/%file_name%!_%locale_with_underscore%.%file_extension%", "translation_replace": { @@ -326,7 +325,7 @@ files: [ "escape_quotes": 0, }, { - "source": "/webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_en.properties", + "source": "/webapp/src/main/resources/locale/portlet/social/ProfileHeader_en.properties", "translation": "%original_path%/%file_name%!_%locale_with_underscore%.%file_extension%", "translation_replace": { @@ -344,7 +343,7 @@ files: [ "escape_quotes": 0, }, { - "source": "/webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_en.properties", + "source": "/webapp/src/main/resources/locale/portlet/social/ProfileWorkExperience_en.properties", "translation": "%original_path%/%file_name%!_%locale_with_underscore%.%file_extension%", "translation_replace": { @@ -362,7 +361,7 @@ files: [ "escape_quotes": 0, }, { - "source": "/webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_en.properties", + "source": "/webapp/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_en.properties", "translation": "%original_path%/%file_name%!_%locale_with_underscore%.%file_extension%", "translation_replace": { @@ -380,7 +379,7 @@ files: [ "escape_quotes": 0, }, { - "source": "/webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_en.properties", + "source": "/webapp/src/main/resources/locale/portlet/social/SpacesListApplication_en.properties", "translation": "%original_path%/%file_name%!_%locale_with_underscore%.%file_extension%", "translation_replace": { @@ -398,7 +397,7 @@ files: [ "escape_quotes": 0, }, { - "source": "/webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_en.properties", + "source": "/webapp/src/main/resources/locale/portlet/social/UserPopup_en.properties", "translation": "%original_path%/%file_name%!_%locale_with_underscore%.%file_extension%", "translation_replace": { @@ -416,7 +415,7 @@ files: [ "escape_quotes": 0, }, { - "source": "/webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_en.properties", + "source": "/webapp/src/main/resources/locale/portlet/social/SpacesOverview_en.properties", "translation": "%original_path%/%file_name%!_%locale_with_underscore%.%file_extension%", "translation_replace": { @@ -434,7 +433,7 @@ files: [ "escape_quotes": 0, }, { - "source": "/webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_en.properties", + "source": "/webapp/src/main/resources/locale/portlet/social/SuggestionsPortlet_en.properties", "translation": "%original_path%/%file_name%!_%locale_with_underscore%.%file_extension%", "translation_replace": { @@ -452,7 +451,7 @@ files: [ "escape_quotes": 0, }, { - "source": "/webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_en.properties", + "source": "/webapp/src/main/resources/locale/portlet/social/ComplementaryFilter_en.properties", "translation": "%original_path%/%file_name%!_%locale_with_underscore%.%file_extension%", "translation_replace": { @@ -470,7 +469,7 @@ files: [ "escape_quotes": 0, }, { - "source": "/webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_en.properties", + "source": "/webapp/src/main/resources/locale/portlet/social/UserSettings_en.properties", "translation": "%original_path%/%file_name%!_%locale_with_underscore%.%file_extension%", "translation_replace": { @@ -488,7 +487,7 @@ files: [ "escape_quotes": 0, }, { - "source": "/webapp/portlet/src/main/resources/locale/portlet/Login_en.properties", + "source": "/webapp/src/main/resources/locale/portlet/Login_en.properties", "translation": "%original_path%/%file_name%!_%locale_with_underscore%.%file_extension%", "translation_replace": { @@ -506,7 +505,7 @@ files: [ "escape_quotes": 0, }, { - "source": "/webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_en.properties", + "source": "/webapp/src/main/resources/locale/portlet/UserNotificationPortlet_en.properties", "translation": "%original_path%/%file_name%!_%locale_with_underscore%.%file_extension%", "translation_replace": { @@ -524,7 +523,7 @@ files: [ "escape_quotes": 0, }, { - "source": "/webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_en.properties", + "source": "/webapp/src/main/resources/locale/portlet/NotificationAdministration_en.properties", "translation": "%original_path%/%file_name%!_%locale_with_underscore%.%file_extension%", "translation_replace": { @@ -542,7 +541,7 @@ files: [ "escape_quotes": 0, }, { - "source": "/webapp/portlet/src/main/resources/locale/portlet/Links_en.properties", + "source": "/webapp/src/main/resources/locale/portlet/Links_en.properties", "translation": "%original_path%/%file_name%!_%locale_with_underscore%.%file_extension%", "translation_replace": { @@ -560,7 +559,7 @@ files: [ "escape_quotes": 0, }, { - "source": "/webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_en.properties", + "source": "/webapp/src/main/resources/locale/portlet/PlatformSettings_en.properties", "translation": "%original_path%/%file_name%!_%locale_with_underscore%.%file_extension%", "translation_replace": { @@ -577,4 +576,21 @@ files: [ "escape_special_characters": 0, "escape_quotes": 0, }, + { + "source": "/webapp/src/main/resources/locale/portlet/SpaceTemplatesManagement_en.properties", + "translation": "%original_path%/%file_name%!_%locale_with_underscore%.%file_extension%", + "translation_replace": { + "_en!": "","ar_SA": "ar","ar_OM": "aro","az_AZ": "az","ca_ES": "ca","ceb_PH": "ceb", + "co_FR": "co","cs_CZ": "cs","de_DE": "de","el_GR": "el","en_US": "en","es_ES": "es_ES","eu_ES": "eu","fa_IR": "fa", + "fi_FI": "fi","fil_PH": "fil","fr_FR": "fr","hi_IN": "hi","hu_HU": "hu","id_ID": "id","it_IT": "it","ja_JP": "ja", + "kab_KAB": "kab","ko_KR": "ko","lt_LT": "lt","ms_MY": "ms","nl_NL": "nl","no_NO": "no","pcm_NG": "pcm","pl_PL": "pl", + "pt_BR": "pt_BR","pt_PT": "pt_PT","ro_RO": "ro","ru_RU": "ru","sk_SK": "sk","sl_SI": "sl","sq_AL": "sq", + "sv_SE": "sv_SE","th_TH": "th","tl_PH": "tl","tr_TR": "tr","uk_UA": "uk","ur_IN": "ur_IN","vi_VN": "vi", + "zh_CN": "zh_CN","zh_TW": "zh_TW", + }, + "dest": "hub/social/webapp/SpaceTemplatesManagement.properties", + "update_option": "update_as_unapproved", + "escape_special_characters": 0, + "escape_quotes": 0, + }, ] diff --git a/translations.properties b/translations.properties deleted file mode 100644 index f8cc735f808..00000000000 --- a/translations.properties +++ /dev/null @@ -1,59 +0,0 @@ -# -# Copyright (C) 2003-2013 eXo Platform SAS. -# -# This is free software; you can redistribute it and/or modify it -# under the terms of the GNU Lesser General Public License as -# published by the Free Software Foundation; either version 3 of -# the License, or (at your option) any later version. -# -# This software is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along 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. -# - -# Mandatory property that indicate the base directory where each file is located in Crowdin (must end with /). -baseDir=platform/social/ - -# Files -# component -component/Core.properties=component/core/src/main/resources/locale/social/Core_en.properties -component/Webui.properties=component/service/src/main/resources/locale/social/Webui_en.properties - -menu/webui.properties=component/service/src/main/resources/locale/social/menu/webui_en.properties - -# extension -extension/Notification.properties=extension/war/src/main/resources/locale/notification/template/Notification_en.properties -extension/hamburgerMenu.properties=extension/war/src/main/resources/locale/portal/HamburgerMenu_en.properties - -# webapp -webapp/portal.properties=webapp/portlet/src/main/resources/locale/portal_en.properties -webapp/Portlets.properties=webapp/portlet/src/main/resources/locale/portlet/Portlets_en.properties -webapp/GeneralSettings.properties=webapp/portlet/src/main/resources/locale/portlet/GeneralSettings_en.properties -webapp/SpaceInfosPortlet.properties=webapp/portlet/src/main/resources/locale/portlet/social/SpaceInfosPortlet_en.properties -webapp/whoisonline.properties=webapp/portlet/src/main/resources/locale/portlet/whoisonline/whoisonline_en.properties -webapp/GettingStarted.properties=webapp/portlet/src/main/resources/locale/portlet/social/GettingStartedPortlet_en.properties -webapp/ExternalSpacesListApplication.properties=webapp/portlet/src/main/resources/locale/portlet/social/ExternalSpacesListApplication_en.properties -webapp/PeopleListApplication.properties=webapp/portlet/src/main/resources/locale/portlet/social/PeopleListApplication_en.properties -webapp/PeopleOverview.properties=webapp/portlet/src/main/resources/locale/portlet/social/PeopleOverview_en.properties -webapp/ProfileAboutMe.properties=webapp/portlet/src/main/resources/locale/portlet/social/ProfileAboutMe_en.properties -webapp/ProfileContactInformation.properties=webapp/portlet/src/main/resources/locale/portlet/social/ProfileContactInformation_en.properties -webapp/ProfileHeader.properties=webapp/portlet/src/main/resources/locale/portlet/social/ProfileHeader_en.properties -webapp/ProfileWorkExperience.properties=webapp/portlet/src/main/resources/locale/portlet/social/ProfileWorkExperience_en.properties -webapp/SpaceAdministrationPortlet.properties=webapp/portlet/src/main/resources/locale/portlet/social/SpacesAdministrationPortlet_en.properties -webapp/SpacesListApplication.properties=webapp/portlet/src/main/resources/locale/portlet/social/SpacesListApplication_en.properties -webapp/UserPopup.properties=webapp/portlet/src/main/resources/locale/portlet/social/UserPopup_en.properties -webapp/SpacesOverview.properties=webapp/portlet/src/main/resources/locale/portlet/social/SpacesOverview_en.properties -webapp/SuggestionsPortlet.properties=webapp/portlet/src/main/resources/locale/portlet/social/SuggestionsPortlet_en.properties -webapp/UserSettings.properties=webapp/portlet/src/main/resources/locale/portlet/social/UserSettings_en.properties -webapp/Login.properties=webapp/portlet/src/main/resources/locale/portlet/Login_en.properties -webapp/UserNotificationPortlet.properties=webapp/portlet/src/main/resources/locale/portlet/UserNotificationPortlet_en.properties -webapp/NotificationAdministration.properties=webapp/portlet/src/main/resources/locale/portlet/NotificationAdministration_en.properties -webapp/Links.properties=webapp/portlet/src/main/resources/locale/portlet/Links_en.properties -webapp/PlatformSettings.properties=webapp/portlet/src/main/resources/locale/portlet/PlatformSettings_en.properties -webapp/ComplementaryFilter.properties=webapp/portlet/src/main/resources/locale/portlet/social/ComplementaryFilter_en.properties diff --git a/webapp/package-lock.json b/webapp/package-lock.json index 6e7c5641538..1a5e83326c5 100644 --- a/webapp/package-lock.json +++ b/webapp/package-lock.json @@ -1,12 +1,12 @@ { "name": "meeds-social", - "version": "6.2.0", - "lockfileVersion": 3, + "version": "7.0.0", + "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "meeds-social", - "version": "6.2.0", + "version": "7.0.0", "license": "LGPL", "devDependencies": { "babel-loader": "^8.3.0", @@ -874,6 +874,8 @@ "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", "dev": true, + "optional": true, + "peer": true, "dependencies": { "fast-deep-equal": "^3.1.3", "fast-uri": "^3.0.1", @@ -889,7 +891,9 @@ "version": "1.0.0", "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", - "dev": true + "dev": true, + "optional": true, + "peer": true }, "node_modules/ajv-keywords": { "version": "3.5.2", @@ -4013,5 +4017,2880 @@ "url": "https://github.com/sponsors/sindresorhus" } } + }, + "dependencies": { + "@ampproject/remapping": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.3.0.tgz", + "integrity": "sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==", + "dev": true, + "peer": true, + "requires": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.24" + } + }, + "@babel/code-frame": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.24.7.tgz", + "integrity": "sha512-BcYH1CVJBO9tvyIZ2jVeXgSIMvGZ2FDRvDdOIVQyuklNKSsx+eppDEBq/g47Ayw+RqNFE+URvOShmf+f/qwAlA==", + "dev": true, + "peer": true, + "requires": { + "@babel/highlight": "^7.24.7", + "picocolors": "^1.0.0" + } + }, + "@babel/compat-data": { + "version": "7.25.2", + "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.25.2.tgz", + "integrity": "sha512-bYcppcpKBvX4znYaPEeFau03bp89ShqNMLs+rmdptMw+heSZh9+z84d2YG+K7cYLbWwzdjtDoW/uqZmPjulClQ==", + "dev": true, + "peer": true + }, + "@babel/core": { + "version": "7.25.2", + "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.25.2.tgz", + "integrity": "sha512-BBt3opiCOxUr9euZ5/ro/Xv8/V7yJ5bjYMqG/C1YAo8MIKAnumZalCN+msbci3Pigy4lIQfPUpfMM27HMGaYEA==", + "dev": true, + "peer": true, + "requires": { + "@ampproject/remapping": "^2.2.0", + "@babel/code-frame": "^7.24.7", + "@babel/generator": "^7.25.0", + "@babel/helper-compilation-targets": "^7.25.2", + "@babel/helper-module-transforms": "^7.25.2", + "@babel/helpers": "^7.25.0", + "@babel/parser": "^7.25.0", + "@babel/template": "^7.25.0", + "@babel/traverse": "^7.25.2", + "@babel/types": "^7.25.2", + "convert-source-map": "^2.0.0", + "debug": "^4.1.0", + "gensync": "^1.0.0-beta.2", + "json5": "^2.2.3", + "semver": "^6.3.1" + } + }, + "@babel/generator": { + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.25.0.tgz", + "integrity": "sha512-3LEEcj3PVW8pW2R1SR1M89g/qrYk/m/mB/tLqn7dn4sbBUQyTqnlod+II2U4dqiGtUmkcnAmkMDralTFZttRiw==", + "dev": true, + "peer": true, + "requires": { + "@babel/types": "^7.25.0", + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.25", + "jsesc": "^2.5.1" + } + }, + "@babel/helper-compilation-targets": { + "version": "7.25.2", + "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.25.2.tgz", + "integrity": "sha512-U2U5LsSaZ7TAt3cfaymQ8WHh0pxvdHoEk6HVpaexxixjyEquMh0L0YNJNM6CTGKMXV1iksi0iZkGw4AcFkPaaw==", + "dev": true, + "peer": true, + "requires": { + "@babel/compat-data": "^7.25.2", + "@babel/helper-validator-option": "^7.24.8", + "browserslist": "^4.23.1", + "lru-cache": "^5.1.1", + "semver": "^6.3.1" + } + }, + "@babel/helper-module-imports": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.24.7.tgz", + "integrity": "sha512-8AyH3C+74cgCVVXow/myrynrAGv+nTVg5vKu2nZph9x7RcRwzmh0VFallJuFTZ9mx6u4eSdXZfcOzSqTUm0HCA==", + "dev": true, + "peer": true, + "requires": { + "@babel/traverse": "^7.24.7", + "@babel/types": "^7.24.7" + } + }, + "@babel/helper-module-transforms": { + "version": "7.25.2", + "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.25.2.tgz", + "integrity": "sha512-BjyRAbix6j/wv83ftcVJmBt72QtHI56C7JXZoG2xATiLpmoC7dpd8WnkikExHDVPpi/3qCmO6WY1EaXOluiecQ==", + "dev": true, + "peer": true, + "requires": { + "@babel/helper-module-imports": "^7.24.7", + "@babel/helper-simple-access": "^7.24.7", + "@babel/helper-validator-identifier": "^7.24.7", + "@babel/traverse": "^7.25.2" + } + }, + "@babel/helper-simple-access": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.24.7.tgz", + "integrity": "sha512-zBAIvbCMh5Ts+b86r/CjU+4XGYIs+R1j951gxI3KmmxBMhCg4oQMsv6ZXQ64XOm/cvzfU1FmoCyt6+owc5QMYg==", + "dev": true, + "peer": true, + "requires": { + "@babel/traverse": "^7.24.7", + "@babel/types": "^7.24.7" + } + }, + "@babel/helper-string-parser": { + "version": "7.24.8", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.24.8.tgz", + "integrity": "sha512-pO9KhhRcuUyGnJWwyEgnRJTSIZHiT+vMD0kPeD+so0l7mxkMT19g3pjY9GTnHySck/hDzq+dtW/4VgnMkippsQ==", + "dev": true + }, + "@babel/helper-validator-identifier": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.24.7.tgz", + "integrity": "sha512-rR+PBcQ1SMQDDyF6X0wxtG8QyLCgUB0eRAGguqRLfkCA87l7yAP7ehq8SNj96OOGTO8OBV70KhuFYcIkHXOg0w==", + "dev": true + }, + "@babel/helper-validator-option": { + "version": "7.24.8", + "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.24.8.tgz", + "integrity": "sha512-xb8t9tD1MHLungh/AIoWYN+gVHaB9kwlu8gffXGSt3FFEIT7RjS+xWbc2vUD1UTZdIpKj/ab3rdqJ7ufngyi2Q==", + "dev": true, + "peer": true + }, + "@babel/helpers": { + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.25.0.tgz", + "integrity": "sha512-MjgLZ42aCm0oGjJj8CtSM3DB8NOOf8h2l7DCTePJs29u+v7yO/RBX9nShlKMgFnRks/Q4tBAe7Hxnov9VkGwLw==", + "dev": true, + "peer": true, + "requires": { + "@babel/template": "^7.25.0", + "@babel/types": "^7.25.0" + } + }, + "@babel/highlight": { + "version": "7.24.7", + "resolved": "https://registry.npmjs.org/@babel/highlight/-/highlight-7.24.7.tgz", + "integrity": "sha512-EStJpq4OuY8xYfhGVXngigBJRWxftKX9ksiGDnmlY3o7B/V7KIAc9X4oiK87uPJSc/vs5L869bem5fhZa8caZw==", + "dev": true, + "peer": true, + "requires": { + "@babel/helper-validator-identifier": "^7.24.7", + "chalk": "^2.4.2", + "js-tokens": "^4.0.0", + "picocolors": "^1.0.0" + } + }, + "@babel/parser": { + "version": "7.25.3", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.25.3.tgz", + "integrity": "sha512-iLTJKDbJ4hMvFPgQwwsVoxtHyWpKKPBrxkANrSYewDPaPpT5py5yeVkgPIJ7XYXhndxJpaA3PyALSXQ7u8e/Dw==", + "dev": true, + "requires": { + "@babel/types": "^7.25.2" + } + }, + "@babel/template": { + "version": "7.25.0", + "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.25.0.tgz", + "integrity": "sha512-aOOgh1/5XzKvg1jvVz7AVrx2piJ2XBi227DHmbY6y+bM9H2FlN+IfecYu4Xl0cNiiVejlsCri89LUsbj8vJD9Q==", + "dev": true, + "peer": true, + "requires": { + "@babel/code-frame": "^7.24.7", + "@babel/parser": "^7.25.0", + "@babel/types": "^7.25.0" + } + }, + "@babel/traverse": { + "version": "7.25.3", + "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.25.3.tgz", + "integrity": "sha512-HefgyP1x754oGCsKmV5reSmtV7IXj/kpaE1XYY+D9G5PvKKoFfSbiS4M77MdjuwlZKDIKFCffq9rPU+H/s3ZdQ==", + "dev": true, + "peer": true, + "requires": { + "@babel/code-frame": "^7.24.7", + "@babel/generator": "^7.25.0", + "@babel/parser": "^7.25.3", + "@babel/template": "^7.25.0", + "@babel/types": "^7.25.2", + "debug": "^4.3.1", + "globals": "^11.1.0" + } + }, + "@babel/types": { + "version": "7.25.2", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.25.2.tgz", + "integrity": "sha512-YTnYtra7W9e6/oAZEHj0bJehPRUlLH9/fbpT5LfB0NhQXyALCRkRs3zH9v07IYhkgpqX6Z78FnuccZr/l4Fs4Q==", + "dev": true, + "requires": { + "@babel/helper-string-parser": "^7.24.8", + "@babel/helper-validator-identifier": "^7.24.7", + "to-fast-properties": "^2.0.0" + } + }, + "@discoveryjs/json-ext": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz", + "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==", + "dev": true + }, + "@eslint-community/eslint-utils": { + "version": "4.4.0", + "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.4.0.tgz", + "integrity": "sha512-1/sA4dwrzBAyeUoQ6oxahHKmrZvsnLCg4RfxW3ZFGGmQkSNQPFNLV9CUEFQP1x9EYXHTo5p6xdhZM1Ne9p/AfA==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^3.3.0" + } + }, + "@eslint-community/regexpp": { + "version": "4.11.0", + "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.11.0.tgz", + "integrity": "sha512-G/M/tIiMrTAxEWRfLfQJMmGNX28IxBg4PBz8XqQhqUHLFI6TL2htpIB1iQCj144V5ee/JaKyT9/WZ0MGZWfA7A==", + "dev": true + }, + "@eslint/eslintrc": { + "version": "2.1.4", + "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-2.1.4.tgz", + "integrity": "sha512-269Z39MS6wVJtsoUl10L60WdkhJVdPG24Q4eZTH3nnF6lpvSShEK3wQjDX9JRWAUPvPh7COouPpU9IrqaZFvtQ==", + "dev": true, + "requires": { + "ajv": "^6.12.4", + "debug": "^4.3.2", + "espree": "^9.6.0", + "globals": "^13.19.0", + "ignore": "^5.2.0", + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "minimatch": "^3.1.2", + "strip-json-comments": "^3.1.1" + }, + "dependencies": { + "globals": { + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "dev": true, + "requires": { + "type-fest": "^0.20.2" + } + } + } + }, + "@eslint/js": { + "version": "8.57.0", + "resolved": "https://registry.npmjs.org/@eslint/js/-/js-8.57.0.tgz", + "integrity": "sha512-Ys+3g2TaW7gADOJzPt83SJtCDhMjndcDMFVQ/Tj9iA1BfJzFKD9mAUXT3OenpuPHbI6P/myECxRJrofUsDx/5g==", + "dev": true + }, + "@humanwhocodes/config-array": { + "version": "0.11.14", + "resolved": "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.11.14.tgz", + "integrity": "sha512-3T8LkOmg45BV5FICb15QQMsyUSWrQ8AygVfC7ZG32zOalnqrilm018ZVCw0eapXux8FtA33q8PSRSstjee3jSg==", + "dev": true, + "requires": { + "@humanwhocodes/object-schema": "^2.0.2", + "debug": "^4.3.1", + "minimatch": "^3.0.5" + } + }, + "@humanwhocodes/module-importer": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", + "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", + "dev": true + }, + "@humanwhocodes/object-schema": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/@humanwhocodes/object-schema/-/object-schema-2.0.3.tgz", + "integrity": "sha512-93zYdMES/c1D69yZiKDBj0V24vqNzB/koF26KPaagAfd3P/4gUlh3Dys5ogAK+Exi9QyzlD8x/08Zt7wIKcDcA==", + "dev": true + }, + "@jridgewell/gen-mapping": { + "version": "0.3.5", + "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.5.tgz", + "integrity": "sha512-IzL8ZoEDIBRWEzlCcRhOaCupYyN5gdIK+Q6fbFdPDg6HqX6jpkItn7DFIpW9LQzXG6Df9sA7+OKnq0qlz/GaQg==", + "dev": true, + "requires": { + "@jridgewell/set-array": "^1.2.1", + "@jridgewell/sourcemap-codec": "^1.4.10", + "@jridgewell/trace-mapping": "^0.3.24" + } + }, + "@jridgewell/resolve-uri": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", + "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", + "dev": true + }, + "@jridgewell/set-array": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.2.1.tgz", + "integrity": "sha512-R8gLRTZeyp03ymzP/6Lil/28tGeGEzhx1q2k703KGWRAI1VdvPIXdG70VJc2pAMw3NA6JKL5hhFu1sJX0Mnn/A==", + "dev": true + }, + "@jridgewell/source-map": { + "version": "0.3.6", + "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.6.tgz", + "integrity": "sha512-1ZJTZebgqllO79ue2bm3rIGud/bOe0pP5BjSRCRxxYkEZS8STV7zN84UBbiYu7jy+eCKSnVIUgoWWE/tt+shMQ==", + "dev": true, + "requires": { + "@jridgewell/gen-mapping": "^0.3.5", + "@jridgewell/trace-mapping": "^0.3.25" + } + }, + "@jridgewell/sourcemap-codec": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.0.tgz", + "integrity": "sha512-gv3ZRaISU3fjPAgNsriBRqGWQL6quFx04YMPW/zD8XMLsU32mhCCbfbO6KZFLjvYpCZ8zyDEgqsgf+PwPaM7GQ==", + "dev": true + }, + "@jridgewell/trace-mapping": { + "version": "0.3.25", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.25.tgz", + "integrity": "sha512-vNk6aEwybGtawWmy/PzwnGDOjCkLWSD2wqvjGGAgOAwCGWySYXfYoxt00IJkTF+8Lb57DwOb3Aa0o9CApepiYQ==", + "dev": true, + "requires": { + "@jridgewell/resolve-uri": "^3.1.0", + "@jridgewell/sourcemap-codec": "^1.4.14" + } + }, + "@nodelib/fs.scandir": { + "version": "2.1.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", + "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", + "dev": true, + "requires": { + "@nodelib/fs.stat": "2.0.5", + "run-parallel": "^1.1.9" + } + }, + "@nodelib/fs.stat": { + "version": "2.0.5", + "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", + "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", + "dev": true + }, + "@nodelib/fs.walk": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", + "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", + "dev": true, + "requires": { + "@nodelib/fs.scandir": "2.1.5", + "fastq": "^1.6.0" + } + }, + "@types/eslint": { + "version": "8.56.11", + "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-8.56.11.tgz", + "integrity": "sha512-sVBpJMf7UPo/wGecYOpk2aQya2VUGeHhe38WG7/mN5FufNSubf5VT9Uh9Uyp8/eLJpu1/tuhJ/qTo4mhSB4V4Q==", + "dev": true, + "requires": { + "@types/estree": "*", + "@types/json-schema": "*" + } + }, + "@types/estree": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.5.tgz", + "integrity": "sha512-/kYRxGDLWzHOB7q+wtSUQlFrtcdUccpfy+X+9iMBpHK8QLLhx2wIPYuS5DYtR9Wa/YlZAbIovy7qVdB1Aq6Lyw==", + "dev": true + }, + "@types/json-schema": { + "version": "7.0.15", + "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", + "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", + "dev": true + }, + "@types/node": { + "version": "22.3.0", + "resolved": "https://registry.npmjs.org/@types/node/-/node-22.3.0.tgz", + "integrity": "sha512-nrWpWVaDZuaVc5X84xJ0vNrLvomM205oQyLsRt7OHNZbSHslcWsvgFR7O7hire2ZonjLrWBbedmotmIlJDVd6g==", + "dev": true, + "requires": { + "undici-types": "~6.18.2" + } + }, + "@ungap/structured-clone": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.2.0.tgz", + "integrity": "sha512-zuVdFrMJiuCDQUMCzQaD6KL28MjnqqN8XnAqiEq9PNm/hCPTSGfrXCOfwj1ow4LFb/tNymJPwsNbVePc1xFqrQ==", + "dev": true + }, + "@vue/compiler-sfc": { + "version": "2.7.16", + "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-2.7.16.tgz", + "integrity": "sha512-KWhJ9k5nXuNtygPU7+t1rX6baZeqOYLEforUPjgNDBnLicfHCoi48H87Q8XyLZOrNNsmhuwKqtpDQWjEFe6Ekg==", + "dev": true, + "requires": { + "@babel/parser": "^7.23.5", + "postcss": "^8.4.14", + "prettier": "^1.18.2 || ^2.0.0", + "source-map": "^0.6.1" + } + }, + "@vue/component-compiler-utils": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/@vue/component-compiler-utils/-/component-compiler-utils-3.3.0.tgz", + "integrity": "sha512-97sfH2mYNU+2PzGrmK2haqffDpVASuib9/w2/noxiFi31Z54hW+q3izKQXXQZSNhtiUpAI36uSuYepeBe4wpHQ==", + "dev": true, + "requires": { + "consolidate": "^0.15.1", + "hash-sum": "^1.0.2", + "lru-cache": "^4.1.2", + "merge-source-map": "^1.1.0", + "postcss": "^7.0.36", + "postcss-selector-parser": "^6.0.2", + "prettier": "^1.18.2 || ^2.0.0", + "source-map": "~0.6.1", + "vue-template-es2015-compiler": "^1.9.0" + }, + "dependencies": { + "lru-cache": { + "version": "4.1.5", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.5.tgz", + "integrity": "sha512-sWZlbEP2OsHNkXrMl5GYk/jKk70MBng6UU4YI/qGDYbgf6YbP4EvmqISbXCoJiRKs+1bSpFHVgQxvJ17F2li5g==", + "dev": true, + "requires": { + "pseudomap": "^1.0.2", + "yallist": "^2.1.2" + } + }, + "picocolors": { + "version": "0.2.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-0.2.1.tgz", + "integrity": "sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==", + "dev": true + }, + "postcss": { + "version": "7.0.39", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-7.0.39.tgz", + "integrity": "sha512-yioayjNbHn6z1/Bywyb2Y4s3yvDAeXGOyxqD+LnVOinq6Mdmd++SW2wUNVzavyyHxd6+DxzWGIuosg6P1Rj8uA==", + "dev": true, + "requires": { + "picocolors": "^0.2.1", + "source-map": "^0.6.1" + } + }, + "yallist": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz", + "integrity": "sha512-ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A==", + "dev": true + } + } + }, + "@webassemblyjs/ast": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.12.1.tgz", + "integrity": "sha512-EKfMUOPRRUTy5UII4qJDGPpqfwjOmZ5jeGFwid9mnoqIFK+e0vqoi1qH56JpmZSzEL53jKnNzScdmftJyG5xWg==", + "dev": true, + "requires": { + "@webassemblyjs/helper-numbers": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6" + } + }, + "@webassemblyjs/floating-point-hex-parser": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.6.tgz", + "integrity": "sha512-ejAj9hfRJ2XMsNHk/v6Fu2dGS+i4UaXBXGemOfQ/JfQ6mdQg/WXtwleQRLLS4OvfDhv8rYnVwH27YJLMyYsxhw==", + "dev": true + }, + "@webassemblyjs/helper-api-error": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.6.tgz", + "integrity": "sha512-o0YkoP4pVu4rN8aTJgAyj9hC2Sv5UlkzCHhxqWj8butaLvnpdc2jOwh4ewE6CX0txSfLn/UYaV/pheS2Txg//Q==", + "dev": true + }, + "@webassemblyjs/helper-buffer": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.12.1.tgz", + "integrity": "sha512-nzJwQw99DNDKr9BVCOZcLuJJUlqkJh+kVzVl6Fmq/tI5ZtEyWT1KZMyOXltXLZJmDtvLCDgwsyrkohEtopTXCw==", + "dev": true + }, + "@webassemblyjs/helper-numbers": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.6.tgz", + "integrity": "sha512-vUIhZ8LZoIWHBohiEObxVm6hwP034jwmc9kuq5GdHZH0wiLVLIPcMCdpJzG4C11cHoQ25TFIQj9kaVADVX7N3g==", + "dev": true, + "requires": { + "@webassemblyjs/floating-point-hex-parser": "1.11.6", + "@webassemblyjs/helper-api-error": "1.11.6", + "@xtuc/long": "4.2.2" + } + }, + "@webassemblyjs/helper-wasm-bytecode": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.6.tgz", + "integrity": "sha512-sFFHKwcmBprO9e7Icf0+gddyWYDViL8bpPjJJl0WHxCdETktXdmtWLGVzoHbqUcY4Be1LkNfwTmXOJUFZYSJdA==", + "dev": true + }, + "@webassemblyjs/helper-wasm-section": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.12.1.tgz", + "integrity": "sha512-Jif4vfB6FJlUlSbgEMHUyk1j234GTNG9dBJ4XJdOySoj518Xj0oGsNi59cUQF4RRMS9ouBUxDDdyBVfPTypa5g==", + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-buffer": "1.12.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/wasm-gen": "1.12.1" + } + }, + "@webassemblyjs/ieee754": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.11.6.tgz", + "integrity": "sha512-LM4p2csPNvbij6U1f19v6WR56QZ8JcHg3QIJTlSwzFcmx6WSORicYj6I63f9yU1kEUtrpG+kjkiIAkevHpDXrg==", + "dev": true, + "requires": { + "@xtuc/ieee754": "^1.2.0" + } + }, + "@webassemblyjs/leb128": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.11.6.tgz", + "integrity": "sha512-m7a0FhE67DQXgouf1tbN5XQcdWoNgaAuoULHIfGFIEVKA6tu/edls6XnIlkmS6FrXAquJRPni3ZZKjw6FSPjPQ==", + "dev": true, + "requires": { + "@xtuc/long": "4.2.2" + } + }, + "@webassemblyjs/utf8": { + "version": "1.11.6", + "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.11.6.tgz", + "integrity": "sha512-vtXf2wTQ3+up9Zsg8sa2yWiQpzSsMyXj0qViVP6xKGCUT8p8YJ6HqI7l5eCnWx1T/FYdsv07HQs2wTFbbof/RA==", + "dev": true + }, + "@webassemblyjs/wasm-edit": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.12.1.tgz", + "integrity": "sha512-1DuwbVvADvS5mGnXbE+c9NfA8QRcZ6iKquqjjmR10k6o+zzsRVesil54DKexiowcFCPdr/Q0qaMgB01+SQ1u6g==", + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-buffer": "1.12.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/helper-wasm-section": "1.12.1", + "@webassemblyjs/wasm-gen": "1.12.1", + "@webassemblyjs/wasm-opt": "1.12.1", + "@webassemblyjs/wasm-parser": "1.12.1", + "@webassemblyjs/wast-printer": "1.12.1" + } + }, + "@webassemblyjs/wasm-gen": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.12.1.tgz", + "integrity": "sha512-TDq4Ojh9fcohAw6OIMXqiIcTq5KUXTGRkVxbSo1hQnSy6lAM5GSdfwWeSxpAo0YzgsgF182E/U0mDNhuA0tW7w==", + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" + } + }, + "@webassemblyjs/wasm-opt": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.12.1.tgz", + "integrity": "sha512-Jg99j/2gG2iaz3hijw857AVYekZe2SAskcqlWIZXjji5WStnOpVoat3gQfT/Q5tb2djnCjBtMocY/Su1GfxPBg==", + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-buffer": "1.12.1", + "@webassemblyjs/wasm-gen": "1.12.1", + "@webassemblyjs/wasm-parser": "1.12.1" + } + }, + "@webassemblyjs/wasm-parser": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.12.1.tgz", + "integrity": "sha512-xikIi7c2FHXysxXe3COrVUPSheuBtpcfhbpFj4gmu7KRLYOzANztwUU0IbsqvMqzuNK2+glRGWCEqZo1WCLyAQ==", + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.12.1", + "@webassemblyjs/helper-api-error": "1.11.6", + "@webassemblyjs/helper-wasm-bytecode": "1.11.6", + "@webassemblyjs/ieee754": "1.11.6", + "@webassemblyjs/leb128": "1.11.6", + "@webassemblyjs/utf8": "1.11.6" + } + }, + "@webassemblyjs/wast-printer": { + "version": "1.12.1", + "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.12.1.tgz", + "integrity": "sha512-+X4WAlOisVWQMikjbcvY2e0rwPsKQ9F688lksZhBcPycBBuii3O7m8FACbDMWDojpAqvjIncrG8J0XHKyQfVeA==", + "dev": true, + "requires": { + "@webassemblyjs/ast": "1.12.1", + "@xtuc/long": "4.2.2" + } + }, + "@webpack-cli/configtest": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/configtest/-/configtest-1.2.0.tgz", + "integrity": "sha512-4FB8Tj6xyVkyqjj1OaTqCjXYULB9FMkqQ8yGrZjRDrYh0nOE+7Lhs45WioWQQMV+ceFlE368Ukhe6xdvJM9Egg==", + "dev": true, + "requires": {} + }, + "@webpack-cli/info": { + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/info/-/info-1.5.0.tgz", + "integrity": "sha512-e8tSXZpw2hPl2uMJY6fsMswaok5FdlGNRTktvFk2sD8RjH0hE2+XistawJx1vmKteh4NmGmNUrp+Tb2w+udPcQ==", + "dev": true, + "requires": { + "envinfo": "^7.7.3" + } + }, + "@webpack-cli/serve": { + "version": "1.7.0", + "resolved": "https://registry.npmjs.org/@webpack-cli/serve/-/serve-1.7.0.tgz", + "integrity": "sha512-oxnCNGj88fL+xzV+dacXs44HcDwf1ovs3AuEzvP7mqXw7fQntqIhQ1BRmynh4qEKQSSSRSWVyXRjmTbZIX9V2Q==", + "dev": true, + "requires": {} + }, + "@xtuc/ieee754": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz", + "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==", + "dev": true + }, + "@xtuc/long": { + "version": "4.2.2", + "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz", + "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==", + "dev": true + }, + "acorn": { + "version": "8.12.1", + "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.12.1.tgz", + "integrity": "sha512-tcpGyI9zbizT9JbV6oYE477V6mTlXvvi0T0G3SNIYE2apm/G5huBa1+K89VGeovbg+jycCrfhl3ADxErOuO6Jg==", + "dev": true + }, + "acorn-import-attributes": { + "version": "1.9.5", + "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz", + "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==", + "dev": true, + "requires": {} + }, + "acorn-jsx": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", + "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", + "dev": true, + "requires": {} + }, + "ajv": { + "version": "6.12.6", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", + "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.1", + "fast-json-stable-stringify": "^2.0.0", + "json-schema-traverse": "^0.4.1", + "uri-js": "^4.2.2" + } + }, + "ajv-formats": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/ajv-formats/-/ajv-formats-2.1.1.tgz", + "integrity": "sha512-Wx0Kx52hxE7C18hkMEggYlEifqWZtYaRgouJor+WMdPnQyEK13vgEWyVNup7SoeeoLMsr4kf5h6dOW11I15MUA==", + "dev": true, + "requires": {}, + "dependencies": { + "ajv": { + "version": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", + "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", + "dev": true, + "optional": true, + "peer": true, + "requires": { + "fast-deep-equal": "^3.1.3", + "fast-uri": "^3.0.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2" + } + }, + "json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true, + "optional": true, + "peer": true + } + } + }, + "ajv-keywords": { + "version": "3.5.2", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz", + "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==", + "dev": true, + "requires": {} + }, + "ansi-regex": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", + "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", + "dev": true + }, + "ansi-styles": { + "version": "3.2.1", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz", + "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==", + "dev": true, + "peer": true, + "requires": { + "color-convert": "^1.9.0" + } + }, + "anymatch": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", + "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", + "dev": true, + "requires": { + "normalize-path": "^3.0.0", + "picomatch": "^2.0.4" + } + }, + "argparse": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", + "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", + "dev": true + }, + "aria-query": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/aria-query/-/aria-query-5.3.0.tgz", + "integrity": "sha512-b0P0sZPKtyu8HkeRAfCq0IfURZK+SuwMjY1UXGBU27wpAiTwQAIlq56IbIO+ytk/JjS1fMR14ee5WBBfKi5J6A==", + "dev": true, + "requires": { + "dequal": "^2.0.3" + } + }, + "babel-loader": { + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.3.0.tgz", + "integrity": "sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==", + "dev": true, + "requires": { + "find-cache-dir": "^3.3.1", + "loader-utils": "^2.0.0", + "make-dir": "^3.1.0", + "schema-utils": "^2.6.5" + } + }, + "balanced-match": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", + "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", + "dev": true + }, + "big.js": { + "version": "5.2.2", + "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz", + "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==", + "dev": true + }, + "binary-extensions": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", + "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", + "dev": true + }, + "bluebird": { + "version": "3.7.2", + "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", + "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", + "dev": true + }, + "boolbase": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", + "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", + "dev": true + }, + "brace-expansion": { + "version": "1.1.11", + "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz", + "integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==", + "dev": true, + "requires": { + "balanced-match": "^1.0.0", + "concat-map": "0.0.1" + } + }, + "braces": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", + "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", + "dev": true, + "requires": { + "fill-range": "^7.1.1" + } + }, + "browserslist": { + "version": "4.23.3", + "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.23.3.tgz", + "integrity": "sha512-btwCFJVjI4YWDNfau8RhZ+B1Q/VLoUITrm3RlP6y1tYGWIOa+InuYiRGXUBXo8nA1qKmHMyLB/iVQg5TT4eFoA==", + "dev": true, + "requires": { + "caniuse-lite": "^1.0.30001646", + "electron-to-chromium": "^1.5.4", + "node-releases": "^2.0.18", + "update-browserslist-db": "^1.1.0" + } + }, + "buffer-from": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", + "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", + "dev": true + }, + "callsites": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", + "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", + "dev": true + }, + "caniuse-lite": { + "version": "1.0.30001651", + "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001651.tgz", + "integrity": "sha512-9Cf+Xv1jJNe1xPZLGuUXLNkE1BoDkqRqYyFJ9TDYSqhduqA4hu4oR9HluGoWYQC/aj8WHjsGVV+bwkh0+tegRg==", + "dev": true + }, + "chalk": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz", + "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==", + "dev": true, + "peer": true, + "requires": { + "ansi-styles": "^3.2.1", + "escape-string-regexp": "^1.0.5", + "supports-color": "^5.3.0" + } + }, + "chokidar": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", + "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", + "dev": true, + "requires": { + "anymatch": "~3.1.2", + "braces": "~3.0.2", + "fsevents": "~2.3.2", + "glob-parent": "~5.1.2", + "is-binary-path": "~2.1.0", + "is-glob": "~4.0.1", + "normalize-path": "~3.0.0", + "readdirp": "~3.6.0" + }, + "dependencies": { + "glob-parent": { + "version": "5.1.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", + "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", + "dev": true, + "requires": { + "is-glob": "^4.0.1" + } + } + } + }, + "chrome-trace-event": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz", + "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==", + "dev": true + }, + "clone-deep": { + "version": "4.0.1", + "resolved": "https://registry.npmjs.org/clone-deep/-/clone-deep-4.0.1.tgz", + "integrity": "sha512-neHB9xuzh/wk0dIHweyAXv2aPGZIVk3pLMe+/RNzINf17fe0OG96QroktYAUm7SM1PBnzTabaLboqqxDyMU+SQ==", + "dev": true, + "requires": { + "is-plain-object": "^2.0.4", + "kind-of": "^6.0.2", + "shallow-clone": "^3.0.0" + } + }, + "color-convert": { + "version": "1.9.3", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz", + "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==", + "dev": true, + "peer": true, + "requires": { + "color-name": "1.1.3" + } + }, + "color-name": { + "version": "1.1.3", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz", + "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw==", + "dev": true, + "peer": true + }, + "colorette": { + "version": "2.0.20", + "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz", + "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w==", + "dev": true + }, + "commander": { + "version": "2.20.3", + "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", + "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", + "dev": true + }, + "commondir": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", + "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==", + "dev": true + }, + "concat-map": { + "version": "0.0.1", + "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", + "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", + "dev": true + }, + "consolidate": { + "version": "0.15.1", + "resolved": "https://registry.npmjs.org/consolidate/-/consolidate-0.15.1.tgz", + "integrity": "sha512-DW46nrsMJgy9kqAbPt5rKaCr7uFtpo4mSUvLHIUbJEjm0vo+aY5QLwBUq3FK4tRnJr/X0Psc0C4jf/h+HtXSMw==", + "dev": true, + "requires": { + "bluebird": "^3.1.1" + } + }, + "convert-source-map": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", + "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", + "dev": true, + "peer": true + }, + "cross-spawn": { + "version": "7.0.3", + "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.3.tgz", + "integrity": "sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==", + "dev": true, + "requires": { + "path-key": "^3.1.0", + "shebang-command": "^2.0.0", + "which": "^2.0.1" + } + }, + "css-loader": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-7.1.2.tgz", + "integrity": "sha512-6WvYYn7l/XEGN8Xu2vWFt9nVzrCn39vKyTEFf/ExEyoksJjjSZV/0/35XPlMbpnr6VGhZIUg5yJrL8tGfes/FA==", + "dev": true, + "peer": true, + "requires": { + "icss-utils": "^5.1.0", + "postcss": "^8.4.33", + "postcss-modules-extract-imports": "^3.1.0", + "postcss-modules-local-by-default": "^4.0.5", + "postcss-modules-scope": "^3.2.0", + "postcss-modules-values": "^4.0.0", + "postcss-value-parser": "^4.2.0", + "semver": "^7.5.4" + }, + "dependencies": { + "semver": { + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "dev": true, + "peer": true + } + } + }, + "cssesc": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", + "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", + "dev": true + }, + "csstype": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz", + "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==", + "dev": true + }, + "de-indent": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/de-indent/-/de-indent-1.0.2.tgz", + "integrity": "sha512-e/1zu3xH5MQryN2zdVaF0OrdNLUbvWxzMbi+iNA6Bky7l1RoP8a2fIbRocyHclXt/arDrrR6lL3TqFD9pMQTsg==", + "dev": true + }, + "debug": { + "version": "4.3.6", + "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.6.tgz", + "integrity": "sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg==", + "dev": true, + "requires": { + "ms": "2.1.2" + } + }, + "deep-is": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", + "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", + "dev": true + }, + "dequal": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", + "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==", + "dev": true + }, + "doctrine": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", + "integrity": "sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==", + "dev": true, + "requires": { + "esutils": "^2.0.2" + } + }, + "electron-to-chromium": { + "version": "1.5.9", + "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.9.tgz", + "integrity": "sha512-HfkT8ndXR0SEkU8gBQQM3rz035bpE/hxkZ1YIt4KJPEFES68HfIU6LzKukH0H794Lm83WJtkSAMfEToxCs15VA==", + "dev": true + }, + "emoji-regex": { + "version": "10.3.0", + "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.3.0.tgz", + "integrity": "sha512-QpLs9D9v9kArv4lfDEgg1X/gN5XLnf/A6l9cs8SPZLRZR3ZkY9+kwIQTxm+fsSej5UMYGE8fdoaZVIBlqG0XTw==", + "dev": true + }, + "emojis-list": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz", + "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==", + "dev": true + }, + "enhanced-resolve": { + "version": "5.17.1", + "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.17.1.tgz", + "integrity": "sha512-LMHl3dXhTcfv8gM4kEzIUeTQ+7fpdA0l2tUf34BddXPkz2A5xJ5L/Pchd5BL6rdccM9QGvu0sWZzK1Z1t4wwyg==", + "dev": true, + "requires": { + "graceful-fs": "^4.2.4", + "tapable": "^2.2.0" + } + }, + "envinfo": { + "version": "7.13.0", + "resolved": "https://registry.npmjs.org/envinfo/-/envinfo-7.13.0.tgz", + "integrity": "sha512-cvcaMr7KqXVh4nyzGTVqTum+gAiL265x5jUWQIDLq//zOGbW+gSW/C+OWLleY/rs9Qole6AZLMXPbtIFQbqu+Q==", + "dev": true + }, + "es-module-lexer": { + "version": "1.5.4", + "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.5.4.tgz", + "integrity": "sha512-MVNK56NiMrOwitFB7cqDwq0CQutbw+0BvLshJSse0MUNU+y1FC3bUS/AQg7oUng+/wKrrki7JfmwtVHkVfPLlw==", + "dev": true + }, + "escalade": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.1.2.tgz", + "integrity": "sha512-ErCHMCae19vR8vQGe50xIsVomy19rg6gFu3+r3jkEO46suLMWBksvVyoGgQV+jOfl84ZSOSlmv6Gxa89PmTGmA==", + "dev": true + }, + "escape-string-regexp": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", + "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", + "dev": true, + "peer": true + }, + "eslint": { + "version": "8.57.0", + "resolved": "https://registry.npmjs.org/eslint/-/eslint-8.57.0.tgz", + "integrity": "sha512-dZ6+mexnaTIbSBZWgou51U6OmzIhYM2VcNdtiTtI7qPNZm35Akpr0f6vtw3w1Kmn5PYo+tZVfh13WrhpS6oLqQ==", + "dev": true, + "requires": { + "@eslint-community/eslint-utils": "^4.2.0", + "@eslint-community/regexpp": "^4.6.1", + "@eslint/eslintrc": "^2.1.4", + "@eslint/js": "8.57.0", + "@humanwhocodes/config-array": "^0.11.14", + "@humanwhocodes/module-importer": "^1.0.1", + "@nodelib/fs.walk": "^1.2.8", + "@ungap/structured-clone": "^1.2.0", + "ajv": "^6.12.4", + "chalk": "^4.0.0", + "cross-spawn": "^7.0.2", + "debug": "^4.3.2", + "doctrine": "^3.0.0", + "escape-string-regexp": "^4.0.0", + "eslint-scope": "^7.2.2", + "eslint-visitor-keys": "^3.4.3", + "espree": "^9.6.1", + "esquery": "^1.4.2", + "esutils": "^2.0.2", + "fast-deep-equal": "^3.1.3", + "file-entry-cache": "^6.0.1", + "find-up": "^5.0.0", + "glob-parent": "^6.0.2", + "globals": "^13.19.0", + "graphemer": "^1.4.0", + "ignore": "^5.2.0", + "imurmurhash": "^0.1.4", + "is-glob": "^4.0.0", + "is-path-inside": "^3.0.3", + "js-yaml": "^4.1.0", + "json-stable-stringify-without-jsonify": "^1.0.1", + "levn": "^0.4.1", + "lodash.merge": "^4.6.2", + "minimatch": "^3.1.2", + "natural-compare": "^1.4.0", + "optionator": "^0.9.3", + "strip-ansi": "^6.0.1", + "text-table": "^0.2.0" + }, + "dependencies": { + "ansi-styles": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", + "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, + "requires": { + "color-convert": "^2.0.1" + } + }, + "chalk": { + "version": "4.1.2", + "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", + "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, + "requires": { + "ansi-styles": "^4.1.0", + "supports-color": "^7.1.0" + } + }, + "color-convert": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", + "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, + "requires": { + "color-name": "~1.1.4" + } + }, + "color-name": { + "version": "1.1.4", + "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", + "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true + }, + "escape-string-regexp": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", + "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", + "dev": true + }, + "globals": { + "version": "13.24.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-13.24.0.tgz", + "integrity": "sha512-AhO5QUcj8llrbG09iWhPU2B204J1xnPeL8kQmVorSsy+Sjj1sk8gIyh6cUocGmH4L0UuhAJy+hJMRA4mgA4mFQ==", + "dev": true, + "requires": { + "type-fest": "^0.20.2" + } + }, + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", + "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "eslint-config-meedsio": { + "version": "1.0.5", + "resolved": "https://registry.npmjs.org/eslint-config-meedsio/-/eslint-config-meedsio-1.0.5.tgz", + "integrity": "sha512-eSae9Ald7T7g4gIdomPGJ7/H+aVd9L+wLvDUICvc8vKfLeKoJSdOH1uoJ1beUytObQbzbJJJC+cHvf+8BxYDdg==", + "dev": true + }, + "eslint-plugin-vue": { + "version": "8.7.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-8.7.1.tgz", + "integrity": "sha512-28sbtm4l4cOzoO1LtzQPxfxhQABararUb1JtqusQqObJpWX2e/gmVyeYVfepizPFne0Q5cILkYGiBoV36L12Wg==", + "dev": true, + "requires": { + "eslint-utils": "^3.0.0", + "natural-compare": "^1.4.0", + "nth-check": "^2.0.1", + "postcss-selector-parser": "^6.0.9", + "semver": "^7.3.5", + "vue-eslint-parser": "^8.0.1" + }, + "dependencies": { + "semver": { + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "dev": true + } + } + }, + "eslint-plugin-vuejs-accessibility": { + "version": "2.4.1", + "resolved": "https://registry.npmjs.org/eslint-plugin-vuejs-accessibility/-/eslint-plugin-vuejs-accessibility-2.4.1.tgz", + "integrity": "sha512-ZRZhPdslplZXSF71MtSG+zXYRAT5KiHR4JVuo/DERQf9noAkDvi5W418VOE1qllmJd7wTenndxi1q8XeDMxdHw==", + "dev": true, + "requires": { + "aria-query": "^5.3.0", + "emoji-regex": "^10.0.0", + "vue-eslint-parser": "^9.0.1" + }, + "dependencies": { + "semver": { + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "dev": true + }, + "vue-eslint-parser": { + "version": "9.4.3", + "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-9.4.3.tgz", + "integrity": "sha512-2rYRLWlIpaiN8xbPiDyXZXRgLGOtWxERV7ND5fFAv5qo1D2N9Fu9MNajBNc6o13lZ+24DAWCkQCvj4klgmcITg==", + "dev": true, + "requires": { + "debug": "^4.3.4", + "eslint-scope": "^7.1.1", + "eslint-visitor-keys": "^3.3.0", + "espree": "^9.3.1", + "esquery": "^1.4.0", + "lodash": "^4.17.21", + "semver": "^7.3.6" + } + } + } + }, + "eslint-scope": { + "version": "7.2.2", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.2.2.tgz", + "integrity": "sha512-dOt21O7lTMhDM+X9mB4GX+DZrZtCUJPL/wlcTqxyrx5IvO0IYtILdtrQGQp+8n5S0gwSVmOf9NQrjMOgfQZlIg==", + "dev": true, + "requires": { + "esrecurse": "^4.3.0", + "estraverse": "^5.2.0" + } + }, + "eslint-utils": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", + "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", + "dev": true, + "requires": { + "eslint-visitor-keys": "^2.0.0" + }, + "dependencies": { + "eslint-visitor-keys": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", + "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", + "dev": true + } + } + }, + "eslint-visitor-keys": { + "version": "3.4.3", + "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", + "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", + "dev": true + }, + "eslint-webpack-plugin": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/eslint-webpack-plugin/-/eslint-webpack-plugin-3.2.0.tgz", + "integrity": "sha512-avrKcGncpPbPSUHX6B3stNGzkKFto3eL+DKM4+VyMrVnhPc3vRczVlCq3uhuFOdRvDHTVXuzwk1ZKUrqDQHQ9w==", + "dev": true, + "requires": { + "@types/eslint": "^7.29.0 || ^8.4.1", + "jest-worker": "^28.0.2", + "micromatch": "^4.0.5", + "normalize-path": "^3.0.0", + "schema-utils": "^4.0.0" + }, + "dependencies": { + "ajv": { + "version": "8.17.1", + "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", + "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.3", + "fast-uri": "^3.0.1", + "json-schema-traverse": "^1.0.0", + "require-from-string": "^2.0.2" + } + }, + "ajv-keywords": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-5.1.0.tgz", + "integrity": "sha512-YCS/JNFAUyr5vAuhk1DWm1CBxRHW9LbJ2ozWeemrIqpbsqKjHVxYPyi5GC0rjZIT5JxJ3virVTS8wk4i/Z+krw==", + "dev": true, + "requires": { + "fast-deep-equal": "^3.1.3" + } + }, + "json-schema-traverse": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", + "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", + "dev": true + }, + "schema-utils": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-4.2.0.tgz", + "integrity": "sha512-L0jRsrPpjdckP3oPug3/VxNKt2trR8TcabrM6FOAAlvC/9Phcmm+cuAgTlxBqdBR1WJx7Naj9WHw+aOmheSVbw==", + "dev": true, + "requires": { + "@types/json-schema": "^7.0.9", + "ajv": "^8.9.0", + "ajv-formats": "^2.1.1", + "ajv-keywords": "^5.1.0" + } + } + } + }, + "espree": { + "version": "9.6.1", + "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", + "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", + "dev": true, + "requires": { + "acorn": "^8.9.0", + "acorn-jsx": "^5.3.2", + "eslint-visitor-keys": "^3.4.1" + } + }, + "esquery": { + "version": "1.6.0", + "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", + "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", + "dev": true, + "requires": { + "estraverse": "^5.1.0" + } + }, + "esrecurse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", + "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", + "dev": true, + "requires": { + "estraverse": "^5.2.0" + } + }, + "estraverse": { + "version": "5.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", + "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", + "dev": true + }, + "esutils": { + "version": "2.0.3", + "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", + "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", + "dev": true + }, + "events": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", + "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", + "dev": true + }, + "fast-deep-equal": { + "version": "3.1.3", + "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", + "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", + "dev": true + }, + "fast-json-stable-stringify": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", + "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", + "dev": true + }, + "fast-levenshtein": { + "version": "2.0.6", + "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", + "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", + "dev": true + }, + "fast-uri": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.1.tgz", + "integrity": "sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw==", + "dev": true + }, + "fastest-levenshtein": { + "version": "1.0.16", + "resolved": "https://registry.npmjs.org/fastest-levenshtein/-/fastest-levenshtein-1.0.16.tgz", + "integrity": "sha512-eRnCtTTtGZFpQCwhJiUOuxPQWRXVKYDn0b2PeHfXL6/Zi53SLAzAHfVhVWK2AryC/WH05kGfxhFIPvTF0SXQzg==", + "dev": true + }, + "fastq": { + "version": "1.17.1", + "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.17.1.tgz", + "integrity": "sha512-sRVD3lWVIXWg6By68ZN7vho9a1pQcN/WBFaAAsDDFzlJjvoGx0P8z7V1t72grFJfJhu3YPZBuu25f7Kaw2jN1w==", + "dev": true, + "requires": { + "reusify": "^1.0.4" + } + }, + "file-entry-cache": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-6.0.1.tgz", + "integrity": "sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==", + "dev": true, + "requires": { + "flat-cache": "^3.0.4" + } + }, + "fill-range": { + "version": "7.1.1", + "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", + "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", + "dev": true, + "requires": { + "to-regex-range": "^5.0.1" + } + }, + "find-cache-dir": { + "version": "3.3.2", + "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz", + "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==", + "dev": true, + "requires": { + "commondir": "^1.0.1", + "make-dir": "^3.0.2", + "pkg-dir": "^4.1.0" + } + }, + "find-up": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", + "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", + "dev": true, + "requires": { + "locate-path": "^6.0.0", + "path-exists": "^4.0.0" + } + }, + "flat": { + "version": "5.0.2", + "resolved": "https://registry.npmjs.org/flat/-/flat-5.0.2.tgz", + "integrity": "sha512-b6suED+5/3rTpUBdG1gupIl8MPFCAMA0QXwmljLhvCUKcUvdE4gWky9zpuGCcXHOsz4J9wPGNWq6OKpmIzz3hQ==", + "dev": true + }, + "flat-cache": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-3.2.0.tgz", + "integrity": "sha512-CYcENa+FtcUKLmhhqyctpclsq7QF38pKjZHsGNiSQF5r4FtoKDWabFDl3hzaEQMvT1LHEysw5twgLvpYYb4vbw==", + "dev": true, + "requires": { + "flatted": "^3.2.9", + "keyv": "^4.5.3", + "rimraf": "^3.0.2" + } + }, + "flatted": { + "version": "3.3.1", + "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.1.tgz", + "integrity": "sha512-X8cqMLLie7KsNUDSdzeN8FYK9rEt4Dt67OsG/DNGnYTSDBG4uFAJFBnUeiV+zCVAvwFy56IjM9sH51jVaEhNxw==", + "dev": true + }, + "fs.realpath": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", + "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", + "dev": true + }, + "fsevents": { + "version": "2.3.3", + "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", + "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", + "dev": true, + "optional": true + }, + "function-bind": { + "version": "1.1.2", + "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", + "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", + "dev": true + }, + "gensync": { + "version": "1.0.0-beta.2", + "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", + "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", + "dev": true, + "peer": true + }, + "glob": { + "version": "7.2.3", + "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", + "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", + "dev": true, + "requires": { + "fs.realpath": "^1.0.0", + "inflight": "^1.0.4", + "inherits": "2", + "minimatch": "^3.1.1", + "once": "^1.3.0", + "path-is-absolute": "^1.0.0" + } + }, + "glob-parent": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", + "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", + "dev": true, + "requires": { + "is-glob": "^4.0.3" + } + }, + "glob-to-regexp": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz", + "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==", + "dev": true + }, + "globals": { + "version": "11.12.0", + "resolved": "https://registry.npmjs.org/globals/-/globals-11.12.0.tgz", + "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==", + "dev": true, + "peer": true + }, + "graceful-fs": { + "version": "4.2.11", + "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", + "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", + "dev": true + }, + "graphemer": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz", + "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==", + "dev": true + }, + "has-flag": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz", + "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==", + "dev": true, + "peer": true + }, + "hash-sum": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/hash-sum/-/hash-sum-1.0.2.tgz", + "integrity": "sha512-fUs4B4L+mlt8/XAtSOGMUO1TXmAelItBPtJG7CyHJfYTdDjwisntGO2JQz7oUsatOY9o68+57eziUVNw/mRHmA==", + "dev": true + }, + "hasown": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", + "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", + "dev": true, + "requires": { + "function-bind": "^1.1.2" + } + }, + "he": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz", + "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==", + "dev": true + }, + "icss-utils": { + "version": "5.1.0", + "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz", + "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==", + "dev": true, + "peer": true, + "requires": {} + }, + "ignore": { + "version": "5.3.2", + "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", + "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", + "dev": true + }, + "immutable": { + "version": "4.3.7", + "resolved": "https://registry.npmjs.org/immutable/-/immutable-4.3.7.tgz", + "integrity": "sha512-1hqclzwYwjRDFLjcFxOM5AYkkG0rpFPpr1RLPMEuGczoS7YA8gLhy8SWXYRAA/XwfEHpfo3cw5JGioS32fnMRw==", + "dev": true + }, + "import-fresh": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.0.tgz", + "integrity": "sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==", + "dev": true, + "requires": { + "parent-module": "^1.0.0", + "resolve-from": "^4.0.0" + } + }, + "import-local": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz", + "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==", + "dev": true, + "requires": { + "pkg-dir": "^4.2.0", + "resolve-cwd": "^3.0.0" + } + }, + "imurmurhash": { + "version": "0.1.4", + "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", + "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", + "dev": true + }, + "inflight": { + "version": "1.0.6", + "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", + "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", + "dev": true, + "requires": { + "once": "^1.3.0", + "wrappy": "1" + } + }, + "inherits": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true + }, + "interpret": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/interpret/-/interpret-2.2.0.tgz", + "integrity": "sha512-Ju0Bz/cEia55xDwUWEa8+olFpCiQoypjnQySseKtmjNrnps3P+xfpUmGr90T7yjlVJmOtybRvPXhKMbHr+fWnw==", + "dev": true + }, + "is-binary-path": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", + "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", + "dev": true, + "requires": { + "binary-extensions": "^2.0.0" + } + }, + "is-core-module": { + "version": "2.15.0", + "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.15.0.tgz", + "integrity": "sha512-Dd+Lb2/zvk9SKy1TGCt1wFJFo/MWBPMX5x7KcvLajWTGuomczdQX61PvY5yK6SVACwpoexWo81IfFyoKY2QnTA==", + "dev": true, + "requires": { + "hasown": "^2.0.2" + } + }, + "is-extglob": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", + "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", + "dev": true + }, + "is-glob": { + "version": "4.0.3", + "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", + "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", + "dev": true, + "requires": { + "is-extglob": "^2.1.1" + } + }, + "is-number": { + "version": "7.0.0", + "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", + "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", + "dev": true + }, + "is-path-inside": { + "version": "3.0.3", + "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz", + "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==", + "dev": true + }, + "is-plain-object": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz", + "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==", + "dev": true, + "requires": { + "isobject": "^3.0.1" + } + }, + "isexe": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", + "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", + "dev": true + }, + "isobject": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz", + "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==", + "dev": true + }, + "jest-worker": { + "version": "28.1.3", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-28.1.3.tgz", + "integrity": "sha512-CqRA220YV/6jCo8VWvAt1KKx6eek1VIHMPeLEbpcfSfkEeWyBNppynM/o6q+Wmw+sOhos2ml34wZbSX3G13//g==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" + }, + "dependencies": { + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "js-tokens": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", + "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", + "dev": true, + "peer": true + }, + "js-yaml": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", + "integrity": "sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==", + "dev": true, + "requires": { + "argparse": "^2.0.1" + } + }, + "jsesc": { + "version": "2.5.2", + "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-2.5.2.tgz", + "integrity": "sha512-OYu7XEzjkCQ3C5Ps3QIZsQfNpqoJyZZA99wd9aWd05NCtC5pWOkShK2mkL6HXQR6/Cy2lbNdPlZBpuQHXE63gA==", + "dev": true, + "peer": true + }, + "json-buffer": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", + "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", + "dev": true + }, + "json-parse-even-better-errors": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", + "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", + "dev": true + }, + "json-schema-traverse": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", + "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", + "dev": true + }, + "json-stable-stringify-without-jsonify": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", + "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", + "dev": true + }, + "json5": { + "version": "2.2.3", + "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", + "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", + "dev": true + }, + "keyv": { + "version": "4.5.4", + "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", + "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", + "dev": true, + "requires": { + "json-buffer": "3.0.1" + } + }, + "kind-of": { + "version": "6.0.3", + "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz", + "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==", + "dev": true + }, + "levn": { + "version": "0.4.1", + "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", + "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", + "dev": true, + "requires": { + "prelude-ls": "^1.2.1", + "type-check": "~0.4.0" + } + }, + "loader-runner": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz", + "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==", + "dev": true + }, + "loader-utils": { + "version": "2.0.4", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz", + "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==", + "dev": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^2.1.2" + } + }, + "locate-path": { + "version": "6.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", + "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", + "dev": true, + "requires": { + "p-locate": "^5.0.0" + } + }, + "lodash": { + "version": "4.17.21", + "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", + "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", + "dev": true + }, + "lodash.merge": { + "version": "4.6.2", + "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", + "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", + "dev": true + }, + "lru-cache": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", + "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", + "dev": true, + "peer": true, + "requires": { + "yallist": "^3.0.2" + } + }, + "make-dir": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", + "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", + "dev": true, + "requires": { + "semver": "^6.0.0" + } + }, + "merge-source-map": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/merge-source-map/-/merge-source-map-1.1.0.tgz", + "integrity": "sha512-Qkcp7P2ygktpMPh2mCQZaf3jhN6D3Z/qVZHSdWvQ+2Ef5HgRAPBO57A77+ENm0CPx2+1Ce/MYKi3ymqdfuqibw==", + "dev": true, + "requires": { + "source-map": "^0.6.1" + } + }, + "merge-stream": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz", + "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w==", + "dev": true + }, + "micromatch": { + "version": "4.0.7", + "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.7.tgz", + "integrity": "sha512-LPP/3KorzCwBxfeUuZmaR6bG2kdeHSbe0P2tY3FLRU4vYrjYz5hI4QZwV0njUx3jeuKe67YukQ1LSPZBKDqO/Q==", + "dev": true, + "requires": { + "braces": "^3.0.3", + "picomatch": "^2.3.1" + } + }, + "mime-db": { + "version": "1.52.0", + "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", + "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", + "dev": true + }, + "mime-types": { + "version": "2.1.35", + "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", + "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", + "dev": true, + "requires": { + "mime-db": "1.52.0" + } + }, + "minimatch": { + "version": "3.1.2", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", + "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", + "dev": true, + "requires": { + "brace-expansion": "^1.1.7" + } + }, + "minimist": { + "version": "1.2.8", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", + "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", + "dev": true + }, + "ms": { + "version": "2.1.2", + "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz", + "integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==", + "dev": true + }, + "nanoid": { + "version": "3.3.7", + "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.7.tgz", + "integrity": "sha512-eSRppjcPIatRIMC1U6UngP8XFcz8MQWGQdt1MTBQ7NaAmvXDfvNxbvWV3x2y6CdEUciCSsDHDQZbhYaB8QEo2g==", + "dev": true + }, + "natural-compare": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", + "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", + "dev": true + }, + "neo-async": { + "version": "2.6.2", + "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", + "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", + "dev": true + }, + "node-releases": { + "version": "2.0.18", + "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.18.tgz", + "integrity": "sha512-d9VeXT4SJ7ZeOqGX6R5EM022wpL+eWPooLI+5UpWn2jCT1aosUQEhQP214x33Wkwx3JQMvIm+tIoVOdodFS40g==", + "dev": true + }, + "normalize-path": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", + "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", + "dev": true + }, + "nth-check": { + "version": "2.1.1", + "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", + "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", + "dev": true, + "requires": { + "boolbase": "^1.0.0" + } + }, + "once": { + "version": "1.4.0", + "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", + "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", + "dev": true, + "requires": { + "wrappy": "1" + } + }, + "optionator": { + "version": "0.9.4", + "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", + "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", + "dev": true, + "requires": { + "deep-is": "^0.1.3", + "fast-levenshtein": "^2.0.6", + "levn": "^0.4.1", + "prelude-ls": "^1.2.1", + "type-check": "^0.4.0", + "word-wrap": "^1.2.5" + } + }, + "p-limit": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", + "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", + "dev": true, + "requires": { + "yocto-queue": "^0.1.0" + } + }, + "p-locate": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", + "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", + "dev": true, + "requires": { + "p-limit": "^3.0.2" + } + }, + "p-try": { + "version": "2.2.0", + "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", + "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", + "dev": true + }, + "parent-module": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", + "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", + "dev": true, + "requires": { + "callsites": "^3.0.0" + } + }, + "path-exists": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", + "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", + "dev": true + }, + "path-is-absolute": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", + "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", + "dev": true + }, + "path-key": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", + "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", + "dev": true + }, + "path-parse": { + "version": "1.0.7", + "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", + "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", + "dev": true + }, + "picocolors": { + "version": "1.0.1", + "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.0.1.tgz", + "integrity": "sha512-anP1Z8qwhkbmu7MFP5iTt+wQKXgwzf7zTyGlcdzabySa9vd0Xt392U0rVmz9poOaBj0uHJKyyo9/upk0HrEQew==", + "dev": true + }, + "picomatch": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", + "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", + "dev": true + }, + "pkg-dir": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", + "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", + "dev": true, + "requires": { + "find-up": "^4.0.0" + }, + "dependencies": { + "find-up": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", + "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", + "dev": true, + "requires": { + "locate-path": "^5.0.0", + "path-exists": "^4.0.0" + } + }, + "locate-path": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", + "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", + "dev": true, + "requires": { + "p-locate": "^4.1.0" + } + }, + "p-limit": { + "version": "2.3.0", + "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", + "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", + "dev": true, + "requires": { + "p-try": "^2.0.0" + } + }, + "p-locate": { + "version": "4.1.0", + "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", + "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", + "dev": true, + "requires": { + "p-limit": "^2.2.0" + } + } + } + }, + "postcss": { + "version": "8.4.41", + "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.41.tgz", + "integrity": "sha512-TesUflQ0WKZqAvg52PWL6kHgLKP6xB6heTOdoYM0Wt2UHyxNa4K25EZZMgKns3BH1RLVbZCREPpLY0rhnNoHVQ==", + "dev": true, + "requires": { + "nanoid": "^3.3.7", + "picocolors": "^1.0.1", + "source-map-js": "^1.2.0" + } + }, + "postcss-modules-extract-imports": { + "version": "3.1.0", + "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz", + "integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==", + "dev": true, + "peer": true, + "requires": {} + }, + "postcss-modules-local-by-default": { + "version": "4.0.5", + "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.0.5.tgz", + "integrity": "sha512-6MieY7sIfTK0hYfafw1OMEG+2bg8Q1ocHCpoWLqOKj3JXlKu4G7btkmM/B7lFubYkYWmRSPLZi5chid63ZaZYw==", + "dev": true, + "peer": true, + "requires": { + "icss-utils": "^5.0.0", + "postcss-selector-parser": "^6.0.2", + "postcss-value-parser": "^4.1.0" + } + }, + "postcss-modules-scope": { + "version": "3.2.0", + "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.0.tgz", + "integrity": "sha512-oq+g1ssrsZOsx9M96c5w8laRmvEu9C3adDSjI8oTcbfkrTE8hx/zfyobUoWIxaKPO8bt6S62kxpw5GqypEw1QQ==", + "dev": true, + "peer": true, + "requires": { + "postcss-selector-parser": "^6.0.4" + } + }, + "postcss-modules-values": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz", + "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==", + "dev": true, + "peer": true, + "requires": { + "icss-utils": "^5.0.0" + } + }, + "postcss-selector-parser": { + "version": "6.1.2", + "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz", + "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==", + "dev": true, + "requires": { + "cssesc": "^3.0.0", + "util-deprecate": "^1.0.2" + } + }, + "postcss-value-parser": { + "version": "4.2.0", + "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", + "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", + "dev": true, + "peer": true + }, + "prelude-ls": { + "version": "1.2.1", + "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", + "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", + "dev": true + }, + "prettier": { + "version": "2.8.8", + "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.8.8.tgz", + "integrity": "sha512-tdN8qQGvNjw4CHbY+XXk0JgCXn9QiF21a55rBe5LJAU+kDyC4WQn4+awm2Xfk2lQMk5fKup9XgzTZtGkjBdP9Q==", + "dev": true, + "optional": true + }, + "pseudomap": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz", + "integrity": "sha512-b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ==", + "dev": true + }, + "punycode": { + "version": "2.3.1", + "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", + "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", + "dev": true + }, + "queue-microtask": { + "version": "1.2.3", + "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", + "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", + "dev": true + }, + "randombytes": { + "version": "2.1.0", + "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz", + "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==", + "dev": true, + "requires": { + "safe-buffer": "^5.1.0" + } + }, + "readdirp": { + "version": "3.6.0", + "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", + "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", + "dev": true, + "requires": { + "picomatch": "^2.2.1" + } + }, + "rechoir": { + "version": "0.7.1", + "resolved": "https://registry.npmjs.org/rechoir/-/rechoir-0.7.1.tgz", + "integrity": "sha512-/njmZ8s1wVeR6pjTZ+0nCnv8SpZNRMT2D1RLOJQESlYFDBvwpTA4KWJpZ+sBJ4+vhjILRcK7JIFdGCdxEAAitg==", + "dev": true, + "requires": { + "resolve": "^1.9.0" + } + }, + "require-from-string": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", + "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", + "dev": true + }, + "resolve": { + "version": "1.22.8", + "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.8.tgz", + "integrity": "sha512-oKWePCxqpd6FlLvGV1VU0x7bkPmmCNolxzjMf4NczoDnQcIWrAF+cPtZn5i6n+RfD2d9i0tzpKnG6Yk168yIyw==", + "dev": true, + "requires": { + "is-core-module": "^2.13.0", + "path-parse": "^1.0.7", + "supports-preserve-symlinks-flag": "^1.0.0" + } + }, + "resolve-cwd": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", + "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", + "dev": true, + "requires": { + "resolve-from": "^5.0.0" + }, + "dependencies": { + "resolve-from": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", + "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", + "dev": true + } + } + }, + "resolve-from": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", + "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", + "dev": true + }, + "reusify": { + "version": "1.0.4", + "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz", + "integrity": "sha512-U9nH88a3fc/ekCF1l0/UP1IosiuIjyTh7hBvXVMHYgVcfGvt897Xguj2UOLDeI5BG2m7/uwyaLVT6fbtCwTyzw==", + "dev": true + }, + "rimraf": { + "version": "3.0.2", + "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", + "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", + "dev": true, + "requires": { + "glob": "^7.1.3" + } + }, + "run-parallel": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", + "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", + "dev": true, + "requires": { + "queue-microtask": "^1.2.2" + } + }, + "safe-buffer": { + "version": "5.2.1", + "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", + "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", + "dev": true + }, + "sass": { + "version": "1.77.8", + "resolved": "https://registry.npmjs.org/sass/-/sass-1.77.8.tgz", + "integrity": "sha512-4UHg6prsrycW20fqLGPShtEvo/WyHRVRHwOP4DzkUrObWoWI05QBSfzU71TVB7PFaL104TwNaHpjlWXAZbQiNQ==", + "dev": true, + "requires": { + "chokidar": ">=3.0.0 <4.0.0", + "immutable": "^4.0.0", + "source-map-js": ">=0.6.2 <2.0.0" + } + }, + "sass-loader": { + "version": "16.0.0", + "resolved": "https://registry.npmjs.org/sass-loader/-/sass-loader-16.0.0.tgz", + "integrity": "sha512-n13Z+3rU9A177dk4888czcVFiC8CL9dii4qpXWUg3YIIgZEvi9TCFKjOQcbK0kJM7DJu9VucrZFddvNfYCPwtw==", + "dev": true, + "requires": { + "neo-async": "^2.6.2" + } + }, + "schema-utils": { + "version": "2.7.1", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz", + "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==", + "dev": true, + "requires": { + "@types/json-schema": "^7.0.5", + "ajv": "^6.12.4", + "ajv-keywords": "^3.5.2" + } + }, + "semver": { + "version": "6.3.1", + "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", + "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", + "dev": true + }, + "serialize-javascript": { + "version": "6.0.2", + "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz", + "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==", + "dev": true, + "requires": { + "randombytes": "^2.1.0" + } + }, + "shallow-clone": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/shallow-clone/-/shallow-clone-3.0.1.tgz", + "integrity": "sha512-/6KqX+GVUdqPuPPd2LxDDxzX6CAbjJehAAOKlNpqqUpAqPM6HeL8f+o3a+JsyGjn2lv0WY8UsTgUJjU9Ok55NA==", + "dev": true, + "requires": { + "kind-of": "^6.0.2" + } + }, + "shebang-command": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", + "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", + "dev": true, + "requires": { + "shebang-regex": "^3.0.0" + } + }, + "shebang-regex": { + "version": "3.0.0", + "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", + "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", + "dev": true + }, + "source-map": { + "version": "0.6.1", + "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", + "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", + "dev": true + }, + "source-map-js": { + "version": "1.2.0", + "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.0.tgz", + "integrity": "sha512-itJW8lvSA0TXEphiRoawsCksnlf8SyvmFzIhltqAHluXd88pkCd+cXJVHTDwdCr0IzwptSm035IHQktUu1QUMg==", + "dev": true + }, + "source-map-support": { + "version": "0.5.21", + "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", + "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "dev": true, + "requires": { + "buffer-from": "^1.0.0", + "source-map": "^0.6.0" + } + }, + "strip-ansi": { + "version": "6.0.1", + "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", + "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", + "dev": true, + "requires": { + "ansi-regex": "^5.0.1" + } + }, + "strip-json-comments": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", + "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", + "dev": true + }, + "supports-color": { + "version": "5.5.0", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz", + "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==", + "dev": true, + "peer": true, + "requires": { + "has-flag": "^3.0.0" + } + }, + "supports-preserve-symlinks-flag": { + "version": "1.0.0", + "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", + "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", + "dev": true + }, + "tapable": { + "version": "2.2.1", + "resolved": "https://registry.npmjs.org/tapable/-/tapable-2.2.1.tgz", + "integrity": "sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ==", + "dev": true + }, + "terser": { + "version": "5.31.6", + "resolved": "https://registry.npmjs.org/terser/-/terser-5.31.6.tgz", + "integrity": "sha512-PQ4DAriWzKj+qgehQ7LK5bQqCFNMmlhjR2PFFLuqGCpuCAauxemVBWwWOxo3UIwWQx8+Pr61Df++r76wDmkQBg==", + "dev": true, + "requires": { + "@jridgewell/source-map": "^0.3.3", + "acorn": "^8.8.2", + "commander": "^2.20.0", + "source-map-support": "~0.5.20" + } + }, + "terser-webpack-plugin": { + "version": "5.3.10", + "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.10.tgz", + "integrity": "sha512-BKFPWlPDndPs+NGGCr1U59t0XScL5317Y0UReNrHaw9/FwhPENlq6bfgs+4yPfyP51vqC1bQ4rp1EfXW5ZSH9w==", + "dev": true, + "requires": { + "@jridgewell/trace-mapping": "^0.3.20", + "jest-worker": "^27.4.5", + "schema-utils": "^3.1.1", + "serialize-javascript": "^6.0.1", + "terser": "^5.26.0" + }, + "dependencies": { + "has-flag": { + "version": "4.0.0", + "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", + "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true + }, + "jest-worker": { + "version": "27.5.1", + "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz", + "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==", + "dev": true, + "requires": { + "@types/node": "*", + "merge-stream": "^2.0.0", + "supports-color": "^8.0.0" + } + }, + "schema-utils": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", + "dev": true, + "requires": { + "@types/json-schema": "^7.0.8", + "ajv": "^6.12.5", + "ajv-keywords": "^3.5.2" + } + }, + "supports-color": { + "version": "8.1.1", + "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz", + "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==", + "dev": true, + "requires": { + "has-flag": "^4.0.0" + } + } + } + }, + "text-table": { + "version": "0.2.0", + "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz", + "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==", + "dev": true + }, + "to-fast-properties": { + "version": "2.0.0", + "resolved": "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz", + "integrity": "sha512-/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog==", + "dev": true + }, + "to-regex-range": { + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", + "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", + "dev": true, + "requires": { + "is-number": "^7.0.0" + } + }, + "type-check": { + "version": "0.4.0", + "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", + "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", + "dev": true, + "requires": { + "prelude-ls": "^1.2.1" + } + }, + "type-fest": { + "version": "0.20.2", + "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.20.2.tgz", + "integrity": "sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==", + "dev": true + }, + "undici-types": { + "version": "6.18.2", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.18.2.tgz", + "integrity": "sha512-5ruQbENj95yDYJNS3TvcaxPMshV7aizdv/hWYjGIKoANWKjhWNBsr2YEuYZKodQulB1b8l7ILOuDQep3afowQQ==", + "dev": true + }, + "update-browserslist-db": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.0.tgz", + "integrity": "sha512-EdRAaAyk2cUE1wOf2DkEhzxqOQvFOoRJFNS6NeyJ01Gp2beMRpBAINjM2iDXE3KCuKhwnvHIQCJm6ThL2Z+HzQ==", + "dev": true, + "requires": { + "escalade": "^3.1.2", + "picocolors": "^1.0.1" + } + }, + "uri-js": { + "version": "4.4.1", + "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", + "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", + "dev": true, + "requires": { + "punycode": "^2.1.0" + } + }, + "util-deprecate": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", + "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", + "dev": true + }, + "vue": { + "version": "2.7.16", + "resolved": "https://registry.npmjs.org/vue/-/vue-2.7.16.tgz", + "integrity": "sha512-4gCtFXaAA3zYZdTp5s4Hl2sozuySsgz4jy1EnpBHNfpMa9dK1ZCG7viqBPCwXtmgc8nHqUsAu3G4gtmXkkY3Sw==", + "dev": true, + "requires": { + "@vue/compiler-sfc": "2.7.16", + "csstype": "^3.1.0" + } + }, + "vue-eslint-parser": { + "version": "8.3.0", + "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-8.3.0.tgz", + "integrity": "sha512-dzHGG3+sYwSf6zFBa0Gi9ZDshD7+ad14DGOdTLjruRVgZXe2J+DcZ9iUhyR48z5g1PqRa20yt3Njna/veLJL/g==", + "dev": true, + "requires": { + "debug": "^4.3.2", + "eslint-scope": "^7.0.0", + "eslint-visitor-keys": "^3.1.0", + "espree": "^9.0.0", + "esquery": "^1.4.0", + "lodash": "^4.17.21", + "semver": "^7.3.5" + }, + "dependencies": { + "semver": { + "version": "7.6.3", + "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz", + "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==", + "dev": true + } + } + }, + "vue-hot-reload-api": { + "version": "2.3.4", + "resolved": "https://registry.npmjs.org/vue-hot-reload-api/-/vue-hot-reload-api-2.3.4.tgz", + "integrity": "sha512-BXq3jwIagosjgNVae6tkHzzIk6a8MHFtzAdwhnV5VlvPTFxDCvIttgSiHWjdGoTJvXtmRu5HacExfdarRcFhog==", + "dev": true + }, + "vue-loader": { + "version": "15.11.1", + "resolved": "https://registry.npmjs.org/vue-loader/-/vue-loader-15.11.1.tgz", + "integrity": "sha512-0iw4VchYLePqJfJu9s62ACWUXeSqM30SQqlIftbYWM3C+jpPcEHKSPUZBLjSF9au4HTHQ/naF6OGnO3Q/qGR3Q==", + "dev": true, + "requires": { + "@vue/component-compiler-utils": "^3.1.0", + "hash-sum": "^1.0.2", + "loader-utils": "^1.1.0", + "vue-hot-reload-api": "^2.3.0", + "vue-style-loader": "^4.1.0" + }, + "dependencies": { + "json5": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", + "dev": true, + "requires": { + "minimist": "^1.2.0" + } + }, + "loader-utils": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz", + "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==", + "dev": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^1.0.1" + } + } + } + }, + "vue-style-loader": { + "version": "4.1.3", + "resolved": "https://registry.npmjs.org/vue-style-loader/-/vue-style-loader-4.1.3.tgz", + "integrity": "sha512-sFuh0xfbtpRlKfm39ss/ikqs9AbKCoXZBpHeVZ8Tx650o0k0q/YCM7FRvigtxpACezfq6af+a7JeqVTWvncqDg==", + "dev": true, + "requires": { + "hash-sum": "^1.0.2", + "loader-utils": "^1.0.2" + }, + "dependencies": { + "json5": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz", + "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==", + "dev": true, + "requires": { + "minimist": "^1.2.0" + } + }, + "loader-utils": { + "version": "1.4.2", + "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-1.4.2.tgz", + "integrity": "sha512-I5d00Pd/jwMD2QCduo657+YM/6L3KZu++pmX9VFncxaxvHcru9jx1lBaFft+r4Mt2jK0Yhp41XlRAihzPxHNCg==", + "dev": true, + "requires": { + "big.js": "^5.2.2", + "emojis-list": "^3.0.0", + "json5": "^1.0.1" + } + } + } + }, + "vue-template-compiler": { + "version": "2.7.16", + "resolved": "https://registry.npmjs.org/vue-template-compiler/-/vue-template-compiler-2.7.16.tgz", + "integrity": "sha512-AYbUWAJHLGGQM7+cNTELw+KsOG9nl2CnSv467WobS5Cv9uk3wFcnr1Etsz2sEIHEZvw1U+o9mRlEO6QbZvUPGQ==", + "dev": true, + "requires": { + "de-indent": "^1.0.2", + "he": "^1.2.0" + } + }, + "vue-template-es2015-compiler": { + "version": "1.9.1", + "resolved": "https://registry.npmjs.org/vue-template-es2015-compiler/-/vue-template-es2015-compiler-1.9.1.tgz", + "integrity": "sha512-4gDntzrifFnCEvyoO8PqyJDmguXgVPxKiIxrBKjIowvL9l+N66196+72XVYR8BBf1Uv1Fgt3bGevJ+sEmxfZzw==", + "dev": true + }, + "watchpack": { + "version": "2.4.2", + "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz", + "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==", + "dev": true, + "requires": { + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.1.2" + } + }, + "webpack": { + "version": "5.94.0", + "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.94.0.tgz", + "integrity": "sha512-KcsGn50VT+06JH/iunZJedYGUJS5FGjow8wb9c0v5n1Om8O1g4L6LjtfxwlXIATopoQu+vOXXa7gYisWxCoPyg==", + "dev": true, + "requires": { + "@types/estree": "^1.0.5", + "@webassemblyjs/ast": "^1.12.1", + "@webassemblyjs/wasm-edit": "^1.12.1", + "@webassemblyjs/wasm-parser": "^1.12.1", + "acorn": "^8.7.1", + "acorn-import-attributes": "^1.9.5", + "browserslist": "^4.21.10", + "chrome-trace-event": "^1.0.2", + "enhanced-resolve": "^5.17.1", + "es-module-lexer": "^1.2.1", + "eslint-scope": "5.1.1", + "events": "^3.2.0", + "glob-to-regexp": "^0.4.1", + "graceful-fs": "^4.2.11", + "json-parse-even-better-errors": "^2.3.1", + "loader-runner": "^4.2.0", + "mime-types": "^2.1.27", + "neo-async": "^2.6.2", + "schema-utils": "^3.2.0", + "tapable": "^2.1.1", + "terser-webpack-plugin": "^5.3.10", + "watchpack": "^2.4.1", + "webpack-sources": "^3.2.3" + }, + "dependencies": { + "eslint-scope": { + "version": "5.1.1", + "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz", + "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==", + "dev": true, + "requires": { + "esrecurse": "^4.3.0", + "estraverse": "^4.1.1" + } + }, + "estraverse": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", + "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", + "dev": true + }, + "schema-utils": { + "version": "3.3.0", + "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-3.3.0.tgz", + "integrity": "sha512-pN/yOAvcC+5rQ5nERGuwrjLlYvLTbCibnZ1I7B1LaiAz9BRBlE9GMgE/eqV30P7aJQUf7Ddimy/RsbYO/GrVGg==", + "dev": true, + "requires": { + "@types/json-schema": "^7.0.8", + "ajv": "^6.12.5", + "ajv-keywords": "^3.5.2" + } + } + } + }, + "webpack-cli": { + "version": "4.10.0", + "resolved": "https://registry.npmjs.org/webpack-cli/-/webpack-cli-4.10.0.tgz", + "integrity": "sha512-NLhDfH/h4O6UOy+0LSso42xvYypClINuMNBVVzX4vX98TmTaTUxwRbXdhucbFMd2qLaCTcLq/PdYrvi8onw90w==", + "dev": true, + "requires": { + "@discoveryjs/json-ext": "^0.5.0", + "@webpack-cli/configtest": "^1.2.0", + "@webpack-cli/info": "^1.5.0", + "@webpack-cli/serve": "^1.7.0", + "colorette": "^2.0.14", + "commander": "^7.0.0", + "cross-spawn": "^7.0.3", + "fastest-levenshtein": "^1.0.12", + "import-local": "^3.0.2", + "interpret": "^2.2.0", + "rechoir": "^0.7.0", + "webpack-merge": "^5.7.3" + }, + "dependencies": { + "commander": { + "version": "7.2.0", + "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz", + "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==", + "dev": true + } + } + }, + "webpack-merge": { + "version": "5.10.0", + "resolved": "https://registry.npmjs.org/webpack-merge/-/webpack-merge-5.10.0.tgz", + "integrity": "sha512-+4zXKdx7UnO+1jaN4l2lHVD+mFvnlZQP/6ljaJVb4SZiwIKeUnrT5l0gkT8z+n4hKpC+jpOv6O9R+gLtag7pSA==", + "dev": true, + "requires": { + "clone-deep": "^4.0.1", + "flat": "^5.0.2", + "wildcard": "^2.0.0" + } + }, + "webpack-sources": { + "version": "3.2.3", + "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz", + "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==", + "dev": true + }, + "which": { + "version": "2.0.2", + "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", + "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", + "dev": true, + "requires": { + "isexe": "^2.0.0" + } + }, + "wildcard": { + "version": "2.0.1", + "resolved": "https://registry.npmjs.org/wildcard/-/wildcard-2.0.1.tgz", + "integrity": "sha512-CC1bOL87PIWSBhDcTrdeLo6eGT7mCFtrg0uIJtqJUFyK+eJnzl8A1niH56uu7KMa5XFrtiV+AQuHO3n7DsHnLQ==", + "dev": true + }, + "word-wrap": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", + "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", + "dev": true + }, + "wrappy": { + "version": "1.0.2", + "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", + "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", + "dev": true + }, + "yallist": { + "version": "3.1.1", + "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", + "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", + "dev": true, + "peer": true + }, + "yocto-queue": { + "version": "0.1.0", + "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", + "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", + "dev": true + } } } diff --git a/webapp/package.json b/webapp/package.json index 4563ae02caf..10db92123f2 100644 --- a/webapp/package.json +++ b/webapp/package.json @@ -1,6 +1,6 @@ { "name": "meeds-social", - "version": "6.2.0", + "version": "7.0.0", "description": "Meeds Space poetlets", "repository": { "type": "git", diff --git a/webapp/src/main/java/io/meeds/social/SocialApplication.java b/webapp/src/main/java/io/meeds/social/SocialApplication.java new file mode 100644 index 00000000000..23d7d67737b --- /dev/null +++ b/webapp/src/main/java/io/meeds/social/SocialApplication.java @@ -0,0 +1,42 @@ +/* + * This file is part of the Meeds project (https://meeds.io/). + * Copyright (C) 2020 - 2022 Meeds Association contact@meeds.io + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package io.meeds.social; + +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.liquibase.LiquibaseAutoConfiguration; +import org.springframework.context.annotation.PropertySource; +import org.springframework.data.jpa.repository.config.EnableJpaRepositories; + +import io.meeds.spring.AvailableIntegration; +import io.meeds.spring.kernel.PortalApplicationContextInitializer; + +@SpringBootApplication(scanBasePackages = { + SocialApplication.MODULE_NAME, + AvailableIntegration.KERNEL_MODULE, + AvailableIntegration.JPA_MODULE, + AvailableIntegration.WEB_MODULE, +}, exclude = { + LiquibaseAutoConfiguration.class, +}) +@EnableJpaRepositories(basePackages = SocialApplication.MODULE_NAME) +@PropertySource("classpath:application.properties") +@PropertySource("classpath:application-common.properties") +@PropertySource("classpath:social.properties") +public class SocialApplication extends PortalApplicationContextInitializer { + + public static final String MODULE_NAME = "io.meeds.social"; + +} diff --git a/webapp/src/main/resources/locale/portlet/SpaceTemplatesManagement_en.properties b/webapp/src/main/resources/locale/portlet/SpaceTemplatesManagement_en.properties new file mode 100644 index 00000000000..265cbd60032 --- /dev/null +++ b/webapp/src/main/resources/locale/portlet/SpaceTemplatesManagement_en.properties @@ -0,0 +1,33 @@ +spaceTemplates.title=Space Templates +spaceTemplates.add=Add +spaceTemplates.filter.placeholder=Filter by name, description +spaceTemplates.label.name=Name +spaceTemplates.label.description=Description +spaceTemplates.label.permissions=Creation +spaceTemplates.label.spacesCount=Spaces +spaceTemplates.label.status=Status +spaceTemplates.label.actions=Actions +spaceTemplates.menu.open=Open Menu +spaceTemplate.label.preview=Preview of {0} template +spaceTemplate.status.update.success=Template status successfully updated +spaceTemplate.status.update.error=An unknown error occurred while updating template status. Please contact the administrator or try agan later. +spaceTemplate.layout.update.success=Template layout successfully updated +spaceTemplate.layout.update.error=An unknown error occurred while updating template layout. Please contact the administrator or try agan later. +spaceTemplate.delete.success=Template successfully deleted +spaceTemplate.delete.error=An unknown error occurred while deleting template. Please contact the administrator or try agan later. +spaceTemplate.label.delete=Delete +spaceTemplate.label.editLayout=Edit Layout +spaceTemplate.label.editProperties=Edit Properties +spaceTemplate.label.duplicate=Duplicate +spaceTemplate.label.templateMenu={0} +spaceTemplate.label.closeMenu=Close Menu +spaceTemplate.label.close=Close +spaceTemplate.label.openIllustrationPreview=Open illustration Preview +spaceTemplate.label.enableTemplate=Enable Template +spaceTemplate.label.disableTemplate=Disable Template +spaceTemplate.label.system.noDelete=This product template cannot be deleted +spaceTemplate.label.system.noEditLayout=This product template's layout cannot be updated +spaceTemplate.label.confirmDeleteTitle=Delete space template? +spaceTemplate.label.confirmDeleteMessage=Would you like to delete space template: {0} +spaceTemplate.label.confirm=Confirm +spaceTemplate.label.cancel=Cancel diff --git a/webapp/src/main/resources/social.properties b/webapp/src/main/resources/social.properties new file mode 100644 index 00000000000..bdf205b419e --- /dev/null +++ b/webapp/src/main/resources/social.properties @@ -0,0 +1,18 @@ +# +# This file is part of the Meeds project (https://meeds.io/). +# +# Copyright (C) 2024 Meeds Association contact@meeds.io +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 3 of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public License +# along with this program; if not, write to the Free Software Foundation, +# Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. diff --git a/webapp/src/main/webapp/WEB-INF/gatein-resources.xml b/webapp/src/main/webapp/WEB-INF/gatein-resources.xml index ebd4521927e..65e13dca69e 100644 --- a/webapp/src/main/webapp/WEB-INF/gatein-resources.xml +++ b/webapp/src/main/webapp/WEB-INF/gatein-resources.xml @@ -2046,6 +2046,38 @@ + + SpaceTemplateManagement + + spaceTemplateManagement + + + vue + + + vuetify + + + translationField + + + commonVueComponents + + + applicationToolbarComponent + + + eXoVueI18n + + + extensionRegistry + + + + siteDetailsComponent vueGRP diff --git a/webapp/src/main/webapp/WEB-INF/portlet.xml b/webapp/src/main/webapp/WEB-INF/portlet.xml index 6dfc8971117..81f620b384b 100644 --- a/webapp/src/main/webapp/WEB-INF/portlet.xml +++ b/webapp/src/main/webapp/WEB-INF/portlet.xml @@ -1087,4 +1087,26 @@ Organizational Chart + + + SpaceTemplateManagement + Space Template Management + org.exoplatform.commons.api.portlet.GenericDispatchedViewPortlet + + portlet-view-dispatched-file-path + /html/spaceTemplateManagement.html + + -1 + PUBLIC + + text/html + + en + locale.portlet.SpaceTemplateManagement + + Space Template Management + Space Template Management + + + diff --git a/webapp/src/main/webapp/html/spaceTemplateManagement.html b/webapp/src/main/webapp/html/spaceTemplateManagement.html new file mode 100644 index 00000000000..2cbaacc41a2 --- /dev/null +++ b/webapp/src/main/webapp/html/spaceTemplateManagement.html @@ -0,0 +1,9 @@ +
+
+ +
+
diff --git a/webapp/src/main/webapp/vue-apps/common/js/SpaceService.js b/webapp/src/main/webapp/vue-apps/common/js/SpaceService.js index f33d1b26614..896005926d5 100644 --- a/webapp/src/main/webapp/vue-apps/common/js/SpaceService.js +++ b/webapp/src/main/webapp/vue-apps/common/js/SpaceService.js @@ -13,6 +13,19 @@ export function getSpaceTemplates() { }); } +export function getSpacesCountByTemplates() { + return fetch(`${eXo.env.portal.context}/${eXo.env.portal.rest}/v1/social/spaces/countByTemplate`, { + method: 'GET', + credentials: 'include', + }).then(resp => { + if (resp?.ok) { + return resp.json(); + } else { + throw new Error('Response code indicates a server error', resp); + } + }); +} + export function findSpaceExternalInvitationsBySpaceId(spaceId) { return fetch(`${eXo.env.portal.context}/${eXo.env.portal.rest}/v1/social/spaces/${spaceId}/externalInvitations`, { method: 'GET', diff --git a/webapp/src/main/webapp/vue-apps/space-templates-management/components/SpaceTemplatesManagement.vue b/webapp/src/main/webapp/vue-apps/space-templates-management/components/SpaceTemplatesManagement.vue new file mode 100644 index 00000000000..354d0237131 --- /dev/null +++ b/webapp/src/main/webapp/vue-apps/space-templates-management/components/SpaceTemplatesManagement.vue @@ -0,0 +1,43 @@ + + + diff --git a/webapp/src/main/webapp/vue-apps/space-templates-management/components/header/Toolbar.vue b/webapp/src/main/webapp/vue-apps/space-templates-management/components/header/Toolbar.vue new file mode 100644 index 00000000000..61e6456c697 --- /dev/null +++ b/webapp/src/main/webapp/vue-apps/space-templates-management/components/header/Toolbar.vue @@ -0,0 +1,50 @@ + + + diff --git a/webapp/src/main/webapp/vue-apps/space-templates-management/components/list/SpaceTemplateItem.vue b/webapp/src/main/webapp/vue-apps/space-templates-management/components/list/SpaceTemplateItem.vue new file mode 100644 index 00000000000..c0553da532b --- /dev/null +++ b/webapp/src/main/webapp/vue-apps/space-templates-management/components/list/SpaceTemplateItem.vue @@ -0,0 +1,103 @@ + + \ No newline at end of file diff --git a/webapp/src/main/webapp/vue-apps/space-templates-management/components/list/SpaceTemplateItemMenu.vue b/webapp/src/main/webapp/vue-apps/space-templates-management/components/list/SpaceTemplateItemMenu.vue new file mode 100644 index 00000000000..568e22c8d86 --- /dev/null +++ b/webapp/src/main/webapp/vue-apps/space-templates-management/components/list/SpaceTemplateItemMenu.vue @@ -0,0 +1,158 @@ + + \ No newline at end of file diff --git a/webapp/src/main/webapp/vue-apps/space-templates-management/components/list/SpaceTemplates.vue b/webapp/src/main/webapp/vue-apps/space-templates-management/components/list/SpaceTemplates.vue new file mode 100644 index 00000000000..d2c76ffc3d4 --- /dev/null +++ b/webapp/src/main/webapp/vue-apps/space-templates-management/components/list/SpaceTemplates.vue @@ -0,0 +1,169 @@ + + diff --git a/webapp/src/main/webapp/vue-apps/space-templates-management/initComponents.js b/webapp/src/main/webapp/vue-apps/space-templates-management/initComponents.js new file mode 100644 index 00000000000..b8ca05ff2f5 --- /dev/null +++ b/webapp/src/main/webapp/vue-apps/space-templates-management/initComponents.js @@ -0,0 +1,37 @@ +/* + * This file is part of the Meeds project (https://meeds.io/). + * + * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +import SpaceTemplatesManagement from './components/SpaceTemplatesManagement.vue'; + +import Toolbar from './components/header/Toolbar.vue'; +import SpaceTemplates from './components/list/SpaceTemplates.vue'; + +import SpaceTemplateItem from './components/list/SpaceTemplateItem.vue'; +import SpaceTemplateItemMenu from './components/list/SpaceTemplateItemMenu.vue'; + +const components = { + 'space-templates-management': SpaceTemplatesManagement, + 'space-templates-management-toolbar': Toolbar, + 'space-templates-management-list': SpaceTemplates, + 'space-templates-management-item': SpaceTemplateItem, + 'space-templates-management-item-menu': SpaceTemplateItemMenu, +}; + +for (const key in components) { + Vue.component(key, components[key]); +} diff --git a/webapp/src/main/webapp/vue-apps/space-templates-management/js/SpaceTemplateService.js b/webapp/src/main/webapp/vue-apps/space-templates-management/js/SpaceTemplateService.js new file mode 100644 index 00000000000..2da60797bac --- /dev/null +++ b/webapp/src/main/webapp/vue-apps/space-templates-management/js/SpaceTemplateService.js @@ -0,0 +1,87 @@ +/* + * This file is part of the Meeds project (https://meeds.io/). + * + * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +export function getSpaceTemplates(includeDisabled) { + return fetch(`/social/rest/space/templates?includeDisabled=${includeDisabled || false}`, { + method: 'GET', + credentials: 'include', + }).then(resp => { + if (!resp?.ok) { + throw new Error('Error when retrieving space templates'); + } else { + return resp.json(); + } + }); +} + +export function getSpaceTemplate(id) { + return fetch(`/social/rest/space/templates/${id}`, { + method: 'GET', + credentials: 'include', + }).then(resp => { + if (!resp?.ok) { + throw new Error('Error when retrieving space template'); + } else { + return resp.json(); + } + }); +} + +export function createSpaceTemplate(spaceTemplate) { + return fetch('/social/rest/space/templates', { + credentials: 'include', + method: 'POST', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify(spaceTemplate), + }).then((resp) => { + if (resp?.ok) { + return resp.json(); + } else { + throw new Error('Error when creating space template'); + } + }); +} + +export function updateSpaceTemplate(spaceTemplate) { + return fetch(`/social/rest/space/templates/${spaceTemplate.id}`, { + credentials: 'include', + method: 'PUT', + headers: { + 'Content-Type': 'application/json', + }, + body: JSON.stringify(spaceTemplate), + }).then((resp) => { + if (!resp?.ok) { + throw new Error('Error when updating space template'); + } + }); +} + +export function deleteSpaceTemplate(id) { + return fetch(`/social/rest/space/templates/${id}`, { + credentials: 'include', + method: 'DELETE', + }).then((resp) => { + if (!resp?.ok) { + throw new Error('Error when deleting space template'); + } + }); +} diff --git a/webapp/src/main/webapp/vue-apps/space-templates-management/main.js b/webapp/src/main/webapp/vue-apps/space-templates-management/main.js new file mode 100644 index 00000000000..2468efe72ee --- /dev/null +++ b/webapp/src/main/webapp/vue-apps/space-templates-management/main.js @@ -0,0 +1,57 @@ +/* + * This file is part of the Meeds project (https://meeds.io/). + * + * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +import './initComponents.js'; +import './services.js'; + +// get overridden components if exists +if (extensionRegistry) { + const components = extensionRegistry.loadComponents('SpaceTemplatesManagement'); + if (components && components.length > 0) { + components.forEach(cmp => { + Vue.component(cmp.componentName, cmp.componentOptions); + }); + } +} + +const lang = eXo?.env.portal.language || 'en'; +const url = `/social/i18n/locale.portlet.SpaceTemplatesManagement?lang=${lang}`; + +const appId = 'SpaceTemplatesManagement'; +export function init() { + exoi18n.loadLanguageAsync(lang, url) + .then(i18n => + Vue.createApp({ + data: { + spacesCountByTemplates: null, + }, + computed: { + isMobile() { + return this.$vuetify.breakpoint.mobile; + }, + }, + async created() { + this.spacesCountByTemplates = await this.$spaceService.getSpacesCountByTemplates(); + }, + template: ``, + vuetify: Vue.prototype.vuetifyOptions, + i18n, + }, `#${appId}`, 'Space Templates') + ); +} diff --git a/webapp/src/main/webapp/vue-apps/space-templates-management/services.js b/webapp/src/main/webapp/vue-apps/space-templates-management/services.js new file mode 100644 index 00000000000..692c8dbd8aa --- /dev/null +++ b/webapp/src/main/webapp/vue-apps/space-templates-management/services.js @@ -0,0 +1,26 @@ +/* + * This file is part of the Meeds project (https://meeds.io/). + * + * Copyright (C) 2020 - 2024 Meeds Association contact@meeds.io + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 3 of the License, or (at your option) any later version. + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public License + * along with this program; if not, write to the Free Software Foundation, + * Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ + +import * as spaceTemplateService from './js/SpaceTemplateService.js'; + +if (!Vue.prototype.$spaceTemplateService) { + window.Object.defineProperty(Vue.prototype, '$spaceTemplateService', { + value: spaceTemplateService, + }); +} diff --git a/webapp/webpack.common.js b/webapp/webpack.common.js index 1697a3aaf57..9385e440d3e 100644 --- a/webapp/webpack.common.js +++ b/webapp/webpack.common.js @@ -37,6 +37,7 @@ let config = { spacesListComponents: './src/main/webapp/vue-apps/spaces-list/initComponents.js', spacesList: './src/main/webapp/vue-apps/spaces-list/main.js', spacesOverview: './src/main/webapp/vue-apps/spaces-overview/main.js', + spaceTemplateManagement: './src/main/webapp/vue-apps/space-templates-management/main.js', suggestions: './src/main/webapp/vue-apps/suggestions-people-space/main.js', peopleListComponents: './src/main/webapp/vue-apps/people-list/main-components.js', peopleList: './src/main/webapp/vue-apps/people-list/main.js', From 89393d2ba69d228189bc7a1574c5058854d9c207 Mon Sep 17 00:00:00 2001 From: Boubaker Khanfir Date: Thu, 17 Oct 2024 16:55:36 +0100 Subject: [PATCH 03/18] feat: Add Space Template Form Drawers - MEED-7612 - Meeds-io/MIPs#150 (#4121) This change will add Two drawers to allow creating and editing a Space Template. --- .../SpaceTemplateTranslationPlugin.java | 4 +- .../service/SpaceTemplateService.java | 2 +- .../template/rest/SpaceTemplateRest.java | 3 +- .../SpaceTemplatesManagement_en.properties | 62 ++- .../main/webapp/WEB-INF/gatein-resources.xml | 10 + .../webapp/images/defaultSpaceBanner.webp | Bin 0 -> 8642 bytes webapp/src/main/webapp/js/lib/jquery.atwho.js | 2 +- webapp/src/main/webapp/js/suggester.js | 7 +- .../components/ExoIdentitySuggester.vue | 14 +- .../vue-apps/common/js/IdentityService.js | 5 +- .../vue-apps/common/js/SuggesterService.js | 5 +- .../components/SpaceTemplatesManagement.vue | 3 +- .../SpaceTemplateCharacteristicsDrawer.vue | 376 ++++++++++++++++++ .../drawer/SpaceTemplateNameDrawer.vue | 187 +++++++++ .../components/form/SpaceTemplateAccess.vue | 96 +++++ .../components/form/SpaceTemplateBanner.vue | 134 +++++++ .../form/SpaceTemplatePermissions.vue | 199 +++++++++ .../SpaceTemplatePermissionsEditorial.vue | 57 +++ .../form/SpaceTemplateVisibility.vue | 82 ++++ .../components/header/Toolbar.vue | 2 +- .../components/list/SpaceTemplateItem.vue | 31 +- .../components/list/SpaceTemplateItemMenu.vue | 32 +- .../list/SpaceTemplateItemPermission.vue | 88 ++++ .../components/list/SpaceTemplates.vue | 24 +- .../initComponents.js | 18 + .../space-templates-management/main.js | 11 + .../space-templates-management/services.js | 5 + 27 files changed, 1431 insertions(+), 28 deletions(-) create mode 100644 webapp/src/main/webapp/images/defaultSpaceBanner.webp create mode 100644 webapp/src/main/webapp/vue-apps/space-templates-management/components/drawer/SpaceTemplateCharacteristicsDrawer.vue create mode 100644 webapp/src/main/webapp/vue-apps/space-templates-management/components/drawer/SpaceTemplateNameDrawer.vue create mode 100644 webapp/src/main/webapp/vue-apps/space-templates-management/components/form/SpaceTemplateAccess.vue create mode 100644 webapp/src/main/webapp/vue-apps/space-templates-management/components/form/SpaceTemplateBanner.vue create mode 100644 webapp/src/main/webapp/vue-apps/space-templates-management/components/form/SpaceTemplatePermissions.vue create mode 100644 webapp/src/main/webapp/vue-apps/space-templates-management/components/form/SpaceTemplatePermissionsEditorial.vue create mode 100644 webapp/src/main/webapp/vue-apps/space-templates-management/components/form/SpaceTemplateVisibility.vue create mode 100644 webapp/src/main/webapp/vue-apps/space-templates-management/components/list/SpaceTemplateItemPermission.vue diff --git a/component/core/src/main/java/io/meeds/social/space/template/plugin/translation/SpaceTemplateTranslationPlugin.java b/component/core/src/main/java/io/meeds/social/space/template/plugin/translation/SpaceTemplateTranslationPlugin.java index 65c2604d839..6b673a18de1 100644 --- a/component/core/src/main/java/io/meeds/social/space/template/plugin/translation/SpaceTemplateTranslationPlugin.java +++ b/component/core/src/main/java/io/meeds/social/space/template/plugin/translation/SpaceTemplateTranslationPlugin.java @@ -37,9 +37,9 @@ public class SpaceTemplateTranslationPlugin extends TranslationPlugin { public static final String OBJECT_TYPE = "spaceTemplate"; - public static final String DESCRIPTION_FIELD_NAME = "description"; + public static final String NAME_FIELD_NAME = "name"; - public static final String TITLE_FIELD_NAME = "title"; + public static final String DESCRIPTION_FIELD_NAME = "description"; @Autowired protected SpaceTemplateService spaceTemplateService; diff --git a/component/core/src/main/java/io/meeds/social/space/template/service/SpaceTemplateService.java b/component/core/src/main/java/io/meeds/social/space/template/service/SpaceTemplateService.java index cfe601023f9..306c1142f72 100644 --- a/component/core/src/main/java/io/meeds/social/space/template/service/SpaceTemplateService.java +++ b/component/core/src/main/java/io/meeds/social/space/template/service/SpaceTemplateService.java @@ -200,7 +200,7 @@ public void deleteSpaceTemplate(long templateId) throws ObjectNotFoundException private void computeSpaceTemplateAttributes(SpaceTemplate spaceTemplate, Locale locale) { spaceTemplate.setName(translationService.getTranslationLabelOrDefault(SpaceTemplateTranslationPlugin.OBJECT_TYPE, spaceTemplate.getId(), - SpaceTemplateTranslationPlugin.TITLE_FIELD_NAME, + SpaceTemplateTranslationPlugin.NAME_FIELD_NAME, locale)); spaceTemplate.setDescription(translationService.getTranslationLabelOrDefault(SpaceTemplateTranslationPlugin.OBJECT_TYPE, spaceTemplate.getId(), diff --git a/component/service/src/main/java/io/meeds/social/space/template/rest/SpaceTemplateRest.java b/component/service/src/main/java/io/meeds/social/space/template/rest/SpaceTemplateRest.java index ac4eb20404d..4ab25ddf0b5 100644 --- a/component/service/src/main/java/io/meeds/social/space/template/rest/SpaceTemplateRest.java +++ b/component/service/src/main/java/io/meeds/social/space/template/rest/SpaceTemplateRest.java @@ -106,7 +106,8 @@ public SpaceTemplate createSpaceTemplate(HttpServletRequest request, @RequestBody SpaceTemplate spaceTemplate) { try { - return spaceTemplateService.createSpaceTemplate(spaceTemplate, request.getRemoteUser()); + spaceTemplate = spaceTemplateService.createSpaceTemplate(spaceTemplate, request.getRemoteUser()); + return getSpaceTemplate(request, spaceTemplate.getId()); } catch (IllegalArgumentException e) { throw new ResponseStatusException(HttpStatus.BAD_REQUEST, e.getMessage()); } catch (IllegalAccessException e) { diff --git a/webapp/src/main/resources/locale/portlet/SpaceTemplatesManagement_en.properties b/webapp/src/main/resources/locale/portlet/SpaceTemplatesManagement_en.properties index 265cbd60032..7b0e82cc189 100644 --- a/webapp/src/main/resources/locale/portlet/SpaceTemplatesManagement_en.properties +++ b/webapp/src/main/resources/locale/portlet/SpaceTemplatesManagement_en.properties @@ -18,7 +18,6 @@ spaceTemplate.delete.error=An unknown error occurred while deleting template. Pl spaceTemplate.label.delete=Delete spaceTemplate.label.editLayout=Edit Layout spaceTemplate.label.editProperties=Edit Properties -spaceTemplate.label.duplicate=Duplicate spaceTemplate.label.templateMenu={0} spaceTemplate.label.closeMenu=Close Menu spaceTemplate.label.close=Close @@ -31,3 +30,64 @@ spaceTemplate.label.confirmDeleteTitle=Delete space template? spaceTemplate.label.confirmDeleteMessage=Would you like to delete space template: {0} spaceTemplate.label.confirm=Confirm spaceTemplate.label.cancel=Cancel +spaceTemplate.add.drawer.newTemplate=Add Space Template +spaceTemplate.add.drawer.editTemplate=Edit Space Template +spaceTemplate.nameLabel=Name +spaceTemplate.namePlaceholder=Give a name to your template +spaceTemplate.nameDrawerTitle=Space Template Name +spaceTemplate.nameExceedsMaxLength=Name length should be less than {0} +spaceTemplate.descriptionLabel=Description +spaceTemplate.descriptionPlaceholder=Explain how this template can be used +spaceTemplate.descriptionDrawerTitle=Space Template Description +spaceTemplate.descriptionExceedsMaxLength=The description length should be less than {0} +spaceTemplate.start=Start +spaceTemplate.mandatoryCreationStep=Mandatory Creation steps +spaceTemplate.editName=Edit name, description or icon +spaceTemplate.mandatoryCreationStepDescription=To create a space, creators must complete the following: +spaceTemplate.mandatoryCreationStepName=Name +spaceTemplate.mandatoryCreationStepInvitation=Invitation +spaceTemplate.mandatoryCreationStepProperties=Properties (Description, logo, banner) +spaceTemplate.mandatoryCreationStepAccessControl=Access Control +spaceTemplate.mandatoryCreationStepNameOrInvitationMandatory=Name or Invitation must be selected at minimum +spaceTemplate.defaultSpaceConfigurationStep=Default Space Configuration +spaceTemplate.defaultSpaceConfigurationStepDescription=Select the default configuration for space created using this template. +spaceTemplate.defaultSpaceConfigurationStepBanner=Default {0}Banner{1} +spaceTemplate.defaultSpaceConfigurationStepBannerTooltip=Why using a banner? +spaceTemplate.defaultSpaceConfigurationStepBannerHelp1=The banner can be used to feature your space in its public site. It also can be used in any pages of your space. +spaceTemplate.defaultSpaceConfigurationStepBannerHelp2=Recommended banner size: 1280 x 175 pixels +spaceTemplate.defaultSpaceConfigurationStepBannerCropperDrawer=Sapce Template Banner +spaceTemplate.defaultSpaceConfigurationStepBannerButtonTooltip=Change Banner +spaceTemplate.defaultSpaceConfigurationStepAccess=Access +spaceTemplate.defaultSpaceConfigurationStepAccessOpen=Open +spaceTemplate.defaultSpaceConfigurationStepAccessOpenDescription=Any user can join the space. No approval required. +spaceTemplate.defaultSpaceConfigurationStepAccessValidation=Request Approval +spaceTemplate.defaultSpaceConfigurationStepAccessValidationDescription=User can request to join. Membership must be approved by an admin +spaceTemplate.defaultSpaceConfigurationStepAccessClosed=Invite Only +spaceTemplate.defaultSpaceConfigurationStepAccessClosedDescription=Users can't request to join. Admins must send invitations +spaceTemplate.defaultSpaceConfigurationStepVisibility=Visibility +spaceTemplate.defaultSpaceConfigurationStepVisibilityListed=Listed +spaceTemplate.defaultSpaceConfigurationStepVisibilityListedDescription=The space is visible in the directory +spaceTemplate.defaultSpaceConfigurationStepVisibilityUnlisted=Unlisted +spaceTemplate.defaultSpaceConfigurationStepVisibilityUnlistedDescription=The space is not listed in the space directory +spaceTemplate.permissionsStep=Permissions +spaceTemplate.permissionsStepDescription1=Permissions are managed using the {0}Spaces Management Page{1}. +spaceTemplate.permissionsStepDescription2=Yet, you can specify permissions for spaces created using this template. +spaceTemplate.permissionsStepCreateSpacePermissionLabel=Who can create spaces? +spaceTemplate.permissionsStepEditSpaceLayoutPermissionLabel=Who can edit navigation? +spaceTemplate.permissionsStepIsSpaceEditorialLabel=Are spaces editorial ones? +spaceTemplate.permissionsStepIsSpaceEditorialDescription=Only admins and content writers can add contents +spaceTemplate.permissionsStepDeleteSpacePermissionLabel=Who can delete spaces? +spaceTemplate.permissionsStepUsers=Users +spaceTemplate.permissionsStepAdministrators=Administrators +spaceTemplate.permissionsStepGroupMembers=Group Members +spaceTemplate.permissionsStepSpaceAdmins=Space Admins +spaceTemplate.groupSuggester.placeholder=Enter group +spaceTemplate.groupSuggester.noData=No data +spaceTemplate.previous=Previous +spaceTemplate.cancel=Cancel +spaceTemplate.next=Next +spaceTemplate.create=Create +spaceTemplate.update=Update +spaceTemplate.spaceTemplateCreatedSuccessfully=Space template created successfully +spaceTemplate.spaceTemplateUpdatedSuccessfully=Space template updated successfully +spaceTemplate.bannerImage=Banner Image diff --git a/webapp/src/main/webapp/WEB-INF/gatein-resources.xml b/webapp/src/main/webapp/WEB-INF/gatein-resources.xml index 65e13dca69e..88f87c1a354 100644 --- a/webapp/src/main/webapp/WEB-INF/gatein-resources.xml +++ b/webapp/src/main/webapp/WEB-INF/gatein-resources.xml @@ -113,6 +113,13 @@ ImageCropper
+ + social + SpaceTemplateManagement + Enterprise + ImageCropper + + social SpaceTopbarMenu @@ -2069,6 +2076,9 @@ applicationToolbarComponent + + imageCropper + eXoVueI18n diff --git a/webapp/src/main/webapp/images/defaultSpaceBanner.webp b/webapp/src/main/webapp/images/defaultSpaceBanner.webp new file mode 100644 index 0000000000000000000000000000000000000000..86b3f1c34b8f53e768a866d077ab99fa9bc26195 GIT binary patch literal 8642 zcmV;zAwAwwNk&GxApihZMM6+kP&il$0000G000301OT4^06|PpNFx9M009s1`u~WC zprCCVX8cK)!Ty$r{-@kC{KtR%$AA3C|0b4u09H^qAQ~Y60B}J8odGHU1)u-`001SW ztRhI|*|0yhq00|k3Or<1${96!UYzbY)2cFsJLhPEhqmcuW8ZT4|68s`H~0p8{Z{8p z*L9Kf-SEHWXAA%DvOas;c;0uL_dORLm02ac{P!`}|Neft{5a?Tw$32_kN^K^zt{H7 z|Nq!}X+$fc|GLjJP;dpSUp$u==b?-dho_+rtV=3=E|#(F#+h=^VxKs~ds&Jibum)e zM!lj+U1uaDW>8 z`<_BR4g2XFrhmV1?^yr?F~9-(OA|0KZZNjsnM{bT`cc*jvi4hW(i z@(KkEDI6&ad{Yh`b9N?@TyY4Je_#wNT>dB59;~Aw!GYg16h6%lD)Qben+)3e-8eVl z{R8bq%0BSXJfJLF)pUs)L1G+xo0AO(-cQ2z7=e?{#G zUqY)E3V`J)pw}2>DZ2tJgo_S>E3FLLFjceV%--SMt{n|Q0*Bee1Ca7)C~lA3Gs z-`E5LUSO6wXpZK@c;0p6p4DCOt7Job2Rm44G3H=akPbs6TrTnP)i=>62{8OpcN8JB zg0`uhV8=bZ{oL-hn{+&l6Uun)Y@vc^~9hW0>@YbL1*8ch^U5URxC^FPgn!R7J&$8Tk!rOdy z*SN;(vcXFE!Gl*KOu7KeMX$lRzz+yiS}C5G6f=aw{e2CscE8widk@^H(IApw)txb# zNt)Hi%y7Zt@$PYTG1jPqV^o_`^tt3wfqk{3EByak5$ROL80(m;Gp!?#G1_$eHb!P4eH6jX(BsZ3ImzlrSP`zbQoYw?g7`o@_%nA z6({M*^ts?zTypwmmYqcfLM1lEZU3sVq%|O=ir_hPl{rfO8)eI%lg9ZN{US|qYbaTh z+|uRy&=L-c6pd@-cBD?X7TD*XS0IP71%OKuTVW?AVYfk`*-5SZw^cUl$!Kg8cvYqA zf<|@xZ({nJ8~m6l7(COf*j$tQ4Q37WbI9M%y;6Pcov7r$EFW zJ|TDG0o^v|RGsWsW_F$l-0Elof1AYWOJgVQ;7UKF*{erD5IUnkd#&H+CJ>MGJI11^ z9@+fdeh|clfSwwh2j5P{_Sw%tVobI_>qb>MMHFwo7M57+bFhD9a2{Z3DWRH+E%?Cl zmpUc;9M@pH!uEeOSpD=KA->zjW(#lI%Pr_Szv6 znAOqR>HpJdhJrVaV$xu`3MjQwb}~o_?10ct&p?**`o!_X%)SPkuw^>M$F(q+xH6aN zmTi!Crgq!f^Y?Y69@zl`p!=q;1Xt?Na7JuERE*g&_DRs0Fm6vH<67pvicgv(8CL3Z zE|h&W7!Z^)rYp{nnmSx&Rttf|hZL+h@!c{bH=5?<`0ZTU8W52h9Xd2pmLh$yizn2u zj+@A*xqFjG6pGFg$-J?r#8tHQd|-3(brjnefjK! z%xZ8UGX4sY^CdPo0ay%P(jhpZ*H%NeV<~`Qi7epP&NF2NQU%5H`s;SAAiaNw1+rFu zoEdK-JWvBzr*OOSczNgsy;-lfbX zSt4vGdY%36BtP9Hwv7naDzTi_4|k`Y+tb6buH6^Ou+#7eIeQFx8vSB<=Mn|-eV$@+ zieVQap{2QpuV)P2TS=at{YXjy&w8r-r%7E2BkfRo7W#w$jG9IS*JOPd1$-fPx>h6? zip~7@!XK7-eI+ltNq@mjCkiW^3bP0|l%olQRx*i}d-TLu4m5=5NLwnQ<;3-)fIoN_>o& z-u{CjB;Eao5=LOscC9=;`(IUXM=`ROHW}@gsigFy)it*dbEQ$Z8Gh=j|Bb4+f{w@K zjr_@ZTll}d+EG=|6&s3>WzRc_V>*sG*xvi&epWJ1H~)TUYeX>G-C2$|95aJ@JD^6x zpi7oa1lAl{ex!UFUGcevI*S!3<2yj`O3q>NZy?y>z_zY^iq|pC=N788_eqkEA{MjT zB(SVwIf2eQn7Dt8YVTV1B;qBJgNoQQ_@R-}x0>MHjEP{i-TNwz%B;PMx^Ga_{|8+6 znfUr7))D0rwggMflAw700u{vF)_2d*%TCX~BTObRHau5Gk;q?WSw9ORCP^99x%=pp zn1f?o{)!l<8fL;$?UX=xBQG>2ZA#Uce((qeT#+ga z8lu-AN=xs5hli-j?l8hJgj2k6DD}c%)70SRf7Iai(_|BGUSCDJk-rT)ChL=&#%!g; zXQU}EAhp7^I6!f(x$Zhds2nqr?yI?Loyz2}IO!sA2Hh#Rt@kb32_z4za$CKNK#UL% zs};r^4?9K5h&HlkRhj@=p;DM!hcJUqNw6M65M-eICaKPps(Yp8Rf# zFQKe9$DYj+OGPNLkGk1|*c(iM-aXgrSD0SAFtdM~`VA zFq(bbik_ONv4vk z3=qs4mPi=RHstAEQrp>bI4%m0$mu=U*=Gc|l=TEWYOX-By?9t!pv}=dasSC}wv>z~ z4-3JTeR?)z1hWnPs(WM1esMqPg_%^3OW9r3bt2oGrp_v^d#%h(vm8U$s-><5lL97I z&?(4BiMmS?dK0|Gcmff2g(YA&h~7yeh>gz%U6N~C71nV!oqQb5*El}VSRr`y*826r z{MPpk>~=<&Ow4d^GFy)C9qE#QZXw((*+x?W4*o)PFLxl4DLqyK(g;5uciA|XY_H`L zcYg&`WD{h*bqEp=ZaP^iBwrse`Cs`+ksrq_C@?D)gH%J)C(UbeaWESOLQ+HLZWsnu zEhe478b*L7)w?u5Ir)c0@Ca`aVf+v^y7{55L2+t0p1(?o8J|$Faq5r4?M(vD6;t`9SQ@*voc7F`eG|4|C#;;At0f5C8XDR_M=33l0C=h zJ@)NLGgV?Ztc*cP^Yae-{)iDI7>K%_&&(|;FA;8uMquOzxY!XbKkZG(Lvo9qNN)-p- zBD*z{O6!^auvZN;M>gHCDeQn3VDZjYVc8<7NU*~IcZ(_=K5qZcZ}mM?$OPSs14FRW z@QKgfD7Wx)Kwls$-lnat6+Cegk0Gy=cALW9;6&e}?(+iF{9)g3dZALy(mV;jZfR8J ze!W@(44CpX%5Ojj79;lh4sb;hJ(|=|p+G%VjYL3COAY6W^~Jusm_3hJS8~KVep(x} z={iz|DJ8V7-zMfRIY=Lu_}+9;;(TaWI&ki;JS9ZD4Mp-Ny~N7@GTDHmv)P@k2P-}w z+x>QaoKw7H4H1jur-(7fssXx)L7vk=I~HGtS0rEx+y zGT0kX3yq0JX=_$N9k%)1ZtW{f*R$tVOM++De_C9P(sHbYW8PGimrj>s021&-7KyQM9rt%aKaDv1JHRYS4HQVyu{SBs51 z>oW;yj`FnYS_TUqAdZ4uL){H>Z)(#C(@{myA&~unTLr(yH*l-c6Gw%+ZupJ z5NT;sbD_A@HaW5VMYza-wm6nc?qEr?&onm98DkGx>H&%vJS20gCC_9dU7!~JRK>&O!GvgS z6qA2gf1&hKEs#ejx#eLo#fF+<$o^L3?iV+%JYnBTf#v8T(q2Qr80_GU?5G~~_0uzR7qnRLvUsT--fyh8HDk}y_ z$7SgL64b+{G&OvK@yH5lQ6>I_&4|;p19KFW(Dg16=r_l4PwwsJ$8(aoqwnRQ(fu2q zCk2sDOMb=by%)#)g|*FIP9{ne78%79AdB*?5^#2baU0YO+hybiLQ5-pW8y!9{fR{| z2SQ_|TI*w<@_}7D%9>>wV45Yk)SdpD4;u(%R+u%G$xdn`+qu8{N(PYe!`|TUIJO0= z@(xVlNp7exZXJ0xd3N6-?wRV%og^u(d^KKH+M=zVIc_R6ST%Mh7~m6UYGUZ+10yQI zyekhbmUL0SGTi_U?|iMyq6PXGc7GvnWwq|eUQwp56{@h~S&r?Kv`cTKxpcRd*#_KY z!s&e`84Uhv{hVfbR_v7`b+fp^! zi|&zfKPNb=DI4N}?ked^7M%tQf7hYiII>Km?KU+=T^0P4(30g;xw35qPy^e0TZg@kQfU0UuVMQJuT`YsII+r$IY8 z0Yc=p3e?x20X{F)*7(%X(}ko2s3H##^3mVDAFfr>ef4o8G_L2)`zKJQGe<}X$(v`B14%B+sKb56%==w4fu z@kJ=;jvTE5JzG^WsHw~phKH7L-@sW}*FweSDIFXV7?8oZ0pqDPeR?pJ+Qmm5}-GWhm_=A5mi z!1r66XzB@~D{3W??nOeo!@|rGxYZ#o!yjhc=Fnl_HH}b2HEcr$^&QC%=UqE*4x~a2 zoa*=6Y-RLJ`NI-%F@ z<-{|tk$Y;t-AoLat1#Tm_TbYv>);?lP#w_lKZ*<)vE;g)B!F3ssv~7Id@lfAq6Udb z9LxX!4-@&`pdkdZ9erSnb`a}f(4cw>Fh@VsRQ3yr_T&p`DEfm#cO|hD=e{_0umt+b zC0tZiyGkB=89u>E0IX4DOzCBMp7+Wt^Vpt(NEsF&TrUtTVIw(f_Sl!kWj%}f3R?H* zc(ek+bH=uj(7%Rot|v4QAXVaKCLM+r?GH@2X`UH_*Pe(ZHn_Q-Vj{#sa-@4k3vujS z#@r*pHyPVuGJJ3BI+ZhWg0VXKJpsR9MD~7Mb5ddIKtmy#o`tG1Og4A%!lBevWmj?# z=~A^cf;>}daL_BkFE`B!a`}kpk~3;7i7B0qX!=Pu+go z8l(s3TOQuc7GXqWQbde{tBO6;NcAk__rsiWVtfZ3ny=H?u^;8PzE;}5oS&1s|2Spa z8uFS7J8&g($&mf6h*A`3M%C7@9IpU(8NbQa7EA-$)FE0{b`9%Urmo9KjUf^=P(qq< zN&*7_S|xC~gMnY0w!AE&?C8zvz3mf7{0t-W-+jgT~#7>$2DjK5`ay5zu8WW_^O zV1;=Yr5i8wKMVyhV^-7VD|12aa4VouGN^>Z8F{>)K!Piwp~3IeqoE4NcLiIDD}99@ zTEnmB4ffzleCoJK8CzymU-mrv_x={eMb*R$SY{lZqv;$4;|)3Ps3IHzYhXZID_Hxx z2;3tjR`JW-IFICJe5y?dttBD?t7MFI9fcjLQVn7d4iB}H(jnFCC|muh*4oeHTVp5m_yHmSKM!2EnHGTP~gi2imFvV6LU)u;nCcwrcGpk-Z zHc+=*;J=OX33zX zDD#!L^Wji@I^Kw7WPQJJl@YU-en?gsD(EMRJV=S~PAFMMtUqPbanBxr`N> ztC~<-_~0SkmZeH;+Mv^+^aMOkhY>NMFvxpiDOb8FnPk(wm8}Q{m35(UpQSvr)^xu6 z-prxvi$w_`aeYZjt2IoxrU14+ZcMPQ~&NdGul>)|6>MTs$4kZZS2U<0WF z6Pu#026JJWtpRixdTMtLj>8w2hyU%1@2yWJ`_S<7JJj|v&v#ga$>VQZ??WEJ?Y|~j z+Gdk+uMCOR(@TBe5nlRD(iLw8i`dd6?G8?^5V}L?8lj4zEn^Ug@vFC=*J)z@Yk$wF zOG601Yq&VhaB>*{gbws+*H==Qz*MDPd!eEn1fxJtE|~XEB#HqjH?1UTW=b-$dP0a~ z;GjBT?@fhG-Ok@doE;l=mn?>1D8q>8_YyZF!}#kM`YaOng5G30PssV6^nZ*p5`7oE zXPQap^#lF}$^sL>q^rx66Q-V#-2c3eQTOwv7vj8)5E@F@zk&Ef-VAt&XRY9@;McO@ zXH1J64?!j*Q;F~;aaRpc@_!bu!Lq*2=iq8B(Vfm@sOr}?jJB$?l*A7DLn2Q)z^fkw z4=K7`;MmE7;h&c=)vK)@ka4sSCG96TdYu`Bbz9tcUnrd!F^k8>4xe$Gyv7=j7D#Yc zps$R^(E!N_}-r--VqybS~D(|4Dpm zW7gAyy0e_GzVKvL@P>*^D1&RVd$m);z^(dQY(q*PkZM}7H~@hz%)b1@f|1MF+GMTD{FD0)SO#YAbAna zMDxLGpCp+ zNlq(DyqG8JS;B>YhdVbfP`yR)`&C!VNU-1VN%%h50zot3MDudIWzo$<)#v^8(Hw}_ zN5Z?m(J?arLiI~HPC;v}^w(v+r2zA&DTHF?IzRLRPOdYb8Gtb$0eAm=3-J@?hDL$t8e4u7 zU5$0qOB($Y!C)^KE$Ge%z*qCS4u}EW0WA=Zf=38v*TO-aKFR2 zQ#>P$p}rgmwW2Qzrq47N3QjhXXW(08g0)1!A(;V1dHs$HGMs`n0y^3s;1`%kMElRIXik(x3{PjHy~Ukq`@jWN|F6JanQRL<}W;956MKQ{4- zKWv8TsTMlm0{^|Gk1K4^<9PYy_#~U;6RIvPznXjNhu9S&Z)s(evMA|VdI8Ignx9ob z{NuhhjI=vW>~qJscj`PHeRC5h{;GYa)ykX}c}W+D?Ou^CZlC}zYgU1uTd^D2&_XgTfcBGP2yo>%^GkbJ4r8vFPmYG}mi@XIYIH3v z+Dhvp(`(+rWSzWdx1(^wEwLUjxbOeQYtLz6QkIAu?;nbO+{jS4&Ip{+&W)~Pe#3RO zBfJK@&OlTn9mrr2GxH>rkjLbDnoV^`wZCxQ7S7;F80j~%=|h@xux}P($0cU zmO}vc5rFzZO=$GJ(Vm^saX#aq{at8TyLkt6z!Pzm%Z+C!sd}9bIW5jbOc4-J&Ax_t zHhwtdTZYU5aLg1^EG2*!9vVVg&WYFm^(P(ETd;O z!t?p#M%>ga+W!d!RTzDsE%F{4YyVOgSGg3@m|2${q?_5a4)_7ly+CnY=JzBfj6Bml z+cqv&i3Fdpk>mZTO5DFG%j`hRJ*vQvO-S*<0UyYU%d{93!%3+r5wSN4J{cN%2~GQp zW{rDb1Eq7v#3Oy&1+Q=9Ozk`sBhl%2EAzBX5IZ(TAdt=5W|q zUB+~b@?}aH9yRc*-nrJ!kn?EnA( z000mGNB{r;0RRF3NB{r;0RRFxLP<>oC;$Ke000aC0006%@Bjb+0000uLP<>oLjV8( U000h9Vr5qW5C8@MWB>pF0NqlBTL1t6 literal 0 HcmV?d00001 diff --git a/webapp/src/main/webapp/js/lib/jquery.atwho.js b/webapp/src/main/webapp/js/lib/jquery.atwho.js index a9266c47832..112acaa9867 100644 --- a/webapp/src/main/webapp/js/lib/jquery.atwho.js +++ b/webapp/src/main/webapp/js/lib/jquery.atwho.js @@ -672,7 +672,7 @@ EditableController = (function(superClass) { EditableController.prototype._getRange = function() { var sel; sel = this.app.window.getSelection(); - if (sel.rangeCount > 0) { + if (sel?.rangeCount) { return sel.getRangeAt(0); } }; diff --git a/webapp/src/main/webapp/js/suggester.js b/webapp/src/main/webapp/js/suggester.js index 41075744858..ee40d3d26d3 100644 --- a/webapp/src/main/webapp/js/suggester.js +++ b/webapp/src/main/webapp/js/suggester.js @@ -262,7 +262,12 @@ .on('click', '.remove', function(e) { $(this).closest('[data-atwho-at-query]').remove(); }); - if (range = this._getRange()) { + try { + range = this._getRange() + } catch (e) { + return; + } + if (range) { if (this.query.el.length) { range.setEndAfter(this.query.el[0]); } diff --git a/webapp/src/main/webapp/vue-apps/common/components/ExoIdentitySuggester.vue b/webapp/src/main/webapp/vue-apps/common/components/ExoIdentitySuggester.vue index bbb7f68036f..75faf00b8bc 100644 --- a/webapp/src/main/webapp/vue-apps/common/components/ExoIdentitySuggester.vue +++ b/webapp/src/main/webapp/vue-apps/common/components/ExoIdentitySuggester.vue @@ -62,7 +62,14 @@ :close="!disabled" class="identitySuggesterItem" @click:close="remove(item)"> + + fa-users + \ No newline at end of file diff --git a/webapp/src/main/webapp/vue-apps/space-templates-management/components/drawer/SpaceTemplateNameDrawer.vue b/webapp/src/main/webapp/vue-apps/space-templates-management/components/drawer/SpaceTemplateNameDrawer.vue new file mode 100644 index 00000000000..2f2fb2c439d --- /dev/null +++ b/webapp/src/main/webapp/vue-apps/space-templates-management/components/drawer/SpaceTemplateNameDrawer.vue @@ -0,0 +1,187 @@ + + + \ No newline at end of file diff --git a/webapp/src/main/webapp/vue-apps/space-templates-management/components/form/SpaceTemplateAccess.vue b/webapp/src/main/webapp/vue-apps/space-templates-management/components/form/SpaceTemplateAccess.vue new file mode 100644 index 00000000000..66573d95c07 --- /dev/null +++ b/webapp/src/main/webapp/vue-apps/space-templates-management/components/form/SpaceTemplateAccess.vue @@ -0,0 +1,96 @@ + + + \ No newline at end of file diff --git a/webapp/src/main/webapp/vue-apps/space-templates-management/components/form/SpaceTemplateBanner.vue b/webapp/src/main/webapp/vue-apps/space-templates-management/components/form/SpaceTemplateBanner.vue new file mode 100644 index 00000000000..f1a9b93832d --- /dev/null +++ b/webapp/src/main/webapp/vue-apps/space-templates-management/components/form/SpaceTemplateBanner.vue @@ -0,0 +1,134 @@ + + + \ No newline at end of file diff --git a/webapp/src/main/webapp/vue-apps/space-templates-management/components/form/SpaceTemplatePermissions.vue b/webapp/src/main/webapp/vue-apps/space-templates-management/components/form/SpaceTemplatePermissions.vue new file mode 100644 index 00000000000..b4f923f79bc --- /dev/null +++ b/webapp/src/main/webapp/vue-apps/space-templates-management/components/form/SpaceTemplatePermissions.vue @@ -0,0 +1,199 @@ + + + \ No newline at end of file diff --git a/webapp/src/main/webapp/vue-apps/space-templates-management/components/form/SpaceTemplatePermissionsEditorial.vue b/webapp/src/main/webapp/vue-apps/space-templates-management/components/form/SpaceTemplatePermissionsEditorial.vue new file mode 100644 index 00000000000..bea18170afe --- /dev/null +++ b/webapp/src/main/webapp/vue-apps/space-templates-management/components/form/SpaceTemplatePermissionsEditorial.vue @@ -0,0 +1,57 @@ + + + \ No newline at end of file diff --git a/webapp/src/main/webapp/vue-apps/space-templates-management/components/form/SpaceTemplateVisibility.vue b/webapp/src/main/webapp/vue-apps/space-templates-management/components/form/SpaceTemplateVisibility.vue new file mode 100644 index 00000000000..911bf4ea57a --- /dev/null +++ b/webapp/src/main/webapp/vue-apps/space-templates-management/components/form/SpaceTemplateVisibility.vue @@ -0,0 +1,82 @@ + + + \ No newline at end of file diff --git a/webapp/src/main/webapp/vue-apps/space-templates-management/components/header/Toolbar.vue b/webapp/src/main/webapp/vue-apps/space-templates-management/components/header/Toolbar.vue index 61e6456c697..9801240e8d0 100644 --- a/webapp/src/main/webapp/vue-apps/space-templates-management/components/header/Toolbar.vue +++ b/webapp/src/main/webapp/vue-apps/space-templates-management/components/header/Toolbar.vue @@ -33,7 +33,7 @@ :aria-label="$t('spaceTemplates.add')" :class="$root.isMobile && 'px-0'" class="btn btn-primary text-truncate" - @click="$root.$emit('space-templates-create')"> + @click="$root.$emit('space-templates-name-open')"> fa-plus diff --git a/webapp/src/main/webapp/vue-apps/space-templates-management/components/list/SpaceTemplateItem.vue b/webapp/src/main/webapp/vue-apps/space-templates-management/components/list/SpaceTemplateItem.vue index c0553da532b..84db2bdb4c0 100644 --- a/webapp/src/main/webapp/vue-apps/space-templates-management/components/list/SpaceTemplateItem.vue +++ b/webapp/src/main/webapp/vue-apps/space-templates-management/components/list/SpaceTemplateItem.vue @@ -1,3 +1,23 @@ +