Merge PWA - Meeds-io/MIPs#134 (#1051)

Meeds-io · Aug 22, 2024 · 912df01 · 912df01
2 parents fccc873 + 2ab63eb
commit 912df01
Show file tree

Hide file tree

Showing 7 changed files with 6 additions and 47 deletions.
diff --git a/notes-social-integration/src/main/resources/conf/portal/configuration.xml b/notes-social-integration/src/main/resources/conf/portal/configuration.xml
@@ -18,23 +18,8 @@
 			</init-params>
     </component-plugin>
   </external-component-plugins>
-  <external-component-plugins>
-    <target-component>org.exoplatform.social.core.space.spi.SpaceService</target-component>
-    <component-plugin>
-      <name>portlets.prefs.required</name>
-      <set-method>setPortletsPrefsRequired</set-method>
-      <type>org.exoplatform.social.core.application.PortletPreferenceRequiredPlugin</type>
-      <init-params>      
-        <values-param>
-          <name>portletsPrefsRequired</name>
-          <value>WikiPortlet</value>
-        </values-param>
-      </init-params>
-    </component-plugin>
-  </external-component-plugins>
 
   <!-- End social intergration -->
-
 	<external-component-plugins>
 		<!-- The full qualified name of the ResourceBundleService -->
 		<target-component>org.exoplatform.services.resources.ResourceBundleService</target-component>

diff --git a/...src/main/resources/conf/configuration.xml → ...ebapp/META-INF/exo-conf/configuration.xml b/...src/main/resources/conf/configuration.xml → ...ebapp/META-INF/exo-conf/configuration.xml
@@ -8,7 +8,7 @@
       <name>Change PortalContainer Definitions</name>
       <set-method>registerChangePlugin</set-method>
       <type>org.exoplatform.container.definition.PortalContainerDefinitionChangePlugin</type>
-      <priority>25</priority>
+      <priority>130</priority>
       <init-params>
         <value-param>
           <name>apply.default</name>

diff --git a/notes-webapp/src/main/webapp/WEB-INF/gatein-resources.xml b/notes-webapp/src/main/webapp/WEB-INF/gatein-resources.xml
@@ -10,11 +10,7 @@
   with this software; if not, write to the Free Software Foundation, Inc., 
   51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site: 
   http://www.fsf.org. -->
-
-<gatein-resources
-  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://www.exoplatform.org/xml/ns/gatein_resources_1_5 http://www.exoplatform.org/xml/ns/gatein_resources_1_5"
-  xmlns="http://www.exoplatform.org/xml/ns/gatein_resources_1_5">
+<gatein-resources xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.exoplatform.org/xml/ns/gatein_resources_1_5 http://www.exoplatform.org/xml/ns/gatein_resources_1_5" xmlns="http://www.exoplatform.org/xml/ns/gatein_resources_1_5">
 
   <portal-skin>
     <skin-name>Enterprise</skin-name>

diff --git a/notes-webapp/src/main/webapp/WEB-INF/web.xml b/notes-webapp/src/main/webapp/WEB-INF/web.xml
@@ -10,13 +10,6 @@
   <display-name>notes</display-name>
   <absolute-ordering />
 
-  <jsp-config>
-    <taglib>
-      <taglib-uri>http://java.sun.com/portlet_2_0</taglib-uri>
-      <taglib-location>/tld/portlet_2_0.tld</taglib-location>
-    </taglib>
-  </jsp-config>
-
   <listener>
     <listener-class>org.exoplatform.container.web.PortalContainerConfigOwner</listener-class>
   </listener>
@@ -31,23 +24,8 @@
     <url-pattern>*.css</url-pattern>
     <url-pattern>*.js</url-pattern>
     <url-pattern>*.html</url-pattern>
+    <url-pattern>/i18n/*</url-pattern>
     <url-pattern>/images/*</url-pattern>
   </filter-mapping>
 
-  <!-- ============To override UIMaskWorkspace template for Preview wiki page============== -->
-  <listener>
-    <listener-class>org.exoplatform.container.web.PortalContainerConfigOwner</listener-class>
-  </listener>
-
-  <servlet>
-    <servlet-name>GateInServlet</servlet-name>
-    <servlet-class>org.gatein.wci.api.GateInServlet</servlet-class>
-    <load-on-startup>0</load-on-startup>
-  </servlet>
-
-  <servlet-mapping>
-    <servlet-name>GateInServlet</servlet-name>
-    <url-pattern>/gateinservlet</url-pattern>
-  </servlet-mapping>
-
 </web-app>
diff --git a/notes-webapp/src/main/webapp/vue-app/note-page-view/main.js b/notes-webapp/src/main/webapp/vue-app/note-page-view/main.js
@@ -30,7 +30,7 @@ if (extensionRegistry) {
 }
 
 const lang = eXo.env.portal.language;
-const url = `${eXo.env.portal.context}/${eXo.env.portal.rest}/i18n/bundle/locale.portlet.NotePageView-${lang}.json`;
+const url = `/notes/i18n/locale.portlet.NotePageView?lang=${lang}`;
 
 export function init(appId, name, canEdit) {
   exoi18n.loadLanguageAsync(lang, url)

diff --git a/notes-webapp/src/main/webapp/vue-app/notes-editor/main.js b/notes-webapp/src/main/webapp/vue-app/notes-editor/main.js
@@ -13,7 +13,7 @@ if (extensionRegistry) {
 
 const appId = 'notesEditorApplication';
 const lang = window.eXo?.env?.portal?.language || 'en';
-const url = `${eXo.env.portal.context}/${eXo.env.portal.rest}/i18n/bundle/locale.portlet.notes.notesPortlet-${lang}.json`;
+const url = `/notes/i18n/locale.portlet.notes.notesPortlet?lang=${lang}`;
 
 export function init() {
   exoi18n.loadLanguageAsync(lang, url)

diff --git a/notes-webapp/src/main/webapp/vue-app/notes/main.js b/notes-webapp/src/main/webapp/vue-app/notes/main.js
@@ -28,7 +28,7 @@ const appId = 'notesOverviewApplication';
 const lang = eXo?.env.portal.language || 'en';
 
 //should expose the locale ressources as REST API
-const url = `${eXo.env.portal.context}/${eXo.env.portal.rest}/i18n/bundle/locale.portlet.notes.notesPortlet-${lang}.json`;
+const url = `/notes/i18n/locale.portlet.notes.notesPortlet?lang=${lang}`;
 
 if (!Vue.prototype.$notesService) {
   window.Object.defineProperty(Vue.prototype, '$notesService', {