feat: Combine Social Web Archives to one single social.war - Meeds-io…

…/MIPs#150

This change will Modify the pages definition to use 'social' instead of 'social-portlet' to reference the Social Module portlets. See Meeds-io/social@9e0766a for more information about this change.
A dedicated configuration to upgrade the existing pages has been added to upgrade the existing pages to reference the new Webapp Module instead of deleted 'social-portlet' module.

packaging/plf-dependencies/pom.xml

@@ -94,19 +94,13 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
     <!-- Social -->
     <dependency>
       <groupId>io.meeds.social</groupId>
-      <artifactId>social-webapp-portlet</artifactId>
+      <artifactId>social-webapp</artifactId>
       <type>war</type>
       <scope>runtime</scope>
     </dependency>
     <dependency>
       <groupId>io.meeds.social</groupId>
-      <artifactId>social-extension-war</artifactId>
-      <type>war</type>
-      <scope>runtime</scope>
-    </dependency>
-    <dependency>
-      <groupId>io.meeds.social</groupId>
-      <artifactId>social-extension-war</artifactId>
+      <artifactId>social-webapp</artifactId>
       <type>pom</type>
       <scope>import</scope>
       <exclusions>

services/plf-configuration/src/main/resources/conf/platform/configuration.xml

@@ -77,10 +77,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                   <string>cometd</string>
                </value>
                <value>
-                  <string>social-extension</string>
-               </value>
-               <value>
-                  <string>social-portlet</string>
+                  <string>social</string>
                </value>
             </collection>
           </field>

webapps/plf-meeds-extension/src/main/webapp/WEB-INF/conf/social-extension/social/spaces-templates-configuration.xml

@@ -61,7 +61,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
             <field name="homePageApplication">
               <object type="org.exoplatform.social.core.space.SpaceApplication">
                 <field name="portletApp">
-                  <string>social-portlet</string>
+                  <string>social</string>
                 </field>
                 <field name="portletName">
                   <string>SpaceActivityStreamPortlet</string>
@@ -79,7 +79,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                 <value>
                   <object type="org.exoplatform.social.core.space.SpaceApplication">
                     <field name="portletApp">
-                      <string>social-portlet</string>
+                      <string>social</string>
                     </field>
                     <field name="portletName">
                       <string>MembersPortlet</string>
@@ -160,7 +160,7 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
                 <value>
                   <object type="org.exoplatform.social.core.space.SpaceApplication">
                     <field name="portletApp">
-                      <string>social-portlet</string>
+                      <string>social</string>
                     </field>
                     <field name="portletName">
                       <string>SpaceSettingPortlet</string>

webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/navigationWebsite/pages.xml

@@ -33,7 +33,7 @@
         <column col-span="12">
           <portlet-application>
             <portlet>
-              <application-ref>social-portlet</application-ref>
+              <application-ref>social</application-ref>
               <portlet-ref>Image</portlet-ref>
             </portlet>
           </portlet-application>
@@ -51,7 +51,7 @@
         <column col-span="4">
           <portlet-application>
             <portlet>
-              <application-ref>social-portlet</application-ref>
+              <application-ref>social</application-ref>
               <portlet-ref>Links</portlet-ref>
             </portlet>
           </portlet-application>

webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/navigationWebsite/portal.xml

@@ -38,7 +38,7 @@
           <access-permissions>Everyone</access-permissions>
           <portlet-application>
             <portlet>
-              <application-ref>social-portlet</application-ref>
+              <application-ref>social</application-ref>
               <portlet-ref>VerticalMenu</portlet-ref>
             </portlet>
             <title>Site Vertical Menu</title>
@@ -54,7 +54,7 @@
             <access-permissions>Everyone</access-permissions>
             <portlet-application>
               <portlet>
-                <application-ref>social-portlet</application-ref>
+                <application-ref>social</application-ref>
                 <portlet-ref>Breadcrumb</portlet-ref>
               </portlet>
               <title>Site Breadcrumb application</title>

webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/spacePublic/pages.xml

@@ -33,7 +33,7 @@
         <column col-span="12">
           <portlet-application>
             <portlet>
-              <application-ref>social-portlet</application-ref>
+              <application-ref>social</application-ref>
               <portlet-ref>SpaceBannerPortlet</portlet-ref>
             </portlet>
           </portlet-application>
@@ -43,21 +43,21 @@
         <column col-span="8">
           <portlet-application>
             <portlet>
-              <application-ref>social-portlet</application-ref>
+              <application-ref>social</application-ref>
               <portlet-ref>SpaceWidgetDescription</portlet-ref>
             </portlet>
           </portlet-application>
         </column>
         <column col-span="4">
           <portlet-application>
             <portlet>
-              <application-ref>social-portlet</application-ref>
+              <application-ref>social</application-ref>
               <portlet-ref>SpaceWidgetManagers</portlet-ref>
             </portlet>
           </portlet-application>
           <portlet-application>
             <portlet>
-              <application-ref>social-portlet</application-ref>
+              <application-ref>social</application-ref>
               <portlet-ref>SpaceWidgetMembers</portlet-ref>
             </portlet>
           </portlet-application>

webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/portal/template/spacePublic/portal.xml

@@ -33,7 +33,7 @@
         <access-permissions>Everyone</access-permissions>
         <portlet-application>
           <portlet>
-            <application-ref>social-portlet</application-ref>
+            <application-ref>social</application-ref>
             <portlet-ref>TopBarLogo</portlet-ref>
           </portlet>
           <title>Space Logo</title>
@@ -61,7 +61,7 @@
         <access-permissions>Everyone</access-permissions>
         <portlet-application>
           <portlet>
-            <application-ref>social-portlet</application-ref>
+            <application-ref>social</application-ref>
             <portlet-ref>TopBarLogin</portlet-ref>
           </portlet>
           <title>Login Button</title>

webapps/plf-sites-extension/src/main/webapp/WEB-INF/conf/portal/template/pages/spaceHomePage/page.xml

@@ -29,7 +29,7 @@
       <column col-span="12">
         <portlet-application>
           <portlet>
-            <application-ref>social-portlet</application-ref>
+            <application-ref>social</application-ref>
             <portlet-ref>Image</portlet-ref>
           </portlet>
           <title>Image</title>
@@ -45,7 +45,7 @@
       <column col-span="8">
         <portlet-application>
           <portlet>
-            <application-ref>social-portlet</application-ref>
+            <application-ref>social</application-ref>
             <portlet-ref>SpaceActivityStreamPortlet</portlet-ref>
           </portlet>
           <title>Space Activity Stream</title>
@@ -54,28 +54,28 @@
       <column col-span="4">
         <portlet-application>
           <portlet>
-            <application-ref>social-portlet</application-ref>
+            <application-ref>social</application-ref>
             <portlet-ref>SpaceWidgetDescription</portlet-ref>
           </portlet>
           <title>Space Description</title>
         </portlet-application>
         <portlet-application>
           <portlet>
-            <application-ref>social-portlet</application-ref>
+            <application-ref>social</application-ref>
             <portlet-ref>SpaceWidgetManagers</portlet-ref>
           </portlet>
           <title>Space Managers</title>
         </portlet-application>
         <portlet-application>
           <portlet>
-            <application-ref>social-portlet</application-ref>
+            <application-ref>social</application-ref>
             <portlet-ref>SpaceWidgetMembers</portlet-ref>
           </portlet>
           <title>Space Members</title>
         </portlet-application>
         <portlet-application>
           <portlet>
-            <application-ref>social-portlet</application-ref>
+            <application-ref>social</application-ref>
             <portlet-ref>WhoIsOnLinePortlet</portlet-ref>
           </portlet>
           <title>Who is on Line</title>