ENG-3071: WebUI Epic Features

.github/workflows/ga-publication.yml

@@ -6,7 +6,7 @@ on:
       - created
 
 env:
-  ENTANDO_OPT_USE_PPL_TAG: "v1.1.1"
+  ENTANDO_OPT_USE_PPL_TAG: "v1.2.0"
   ENTANDO_OPT_FEATURES: "${{ secrets.ENTANDO_OPT_FEATURES }}"
   ENTANDO_OPT_GLOBAL_FEATURES: "${{ secrets.ENTANDO_OPT_GLOBAL_FEATURES }}"
   ENTANDO_OPT_LOG_LEVEL: "${{ secrets.ENTANDO_OPT_LOG_LEVEL }}"

.github/workflows/post-merge.yml

@@ -4,9 +4,11 @@ on:
   push:
     branches:
       - develop
+      - epic/*
+      - release/*
 
 env:
-  ENTANDO_OPT_USE_PPL_TAG: "v1.1.1"
+  ENTANDO_OPT_USE_PPL_TAG: "v1.2.0"
   ENTANDO_OPT_FEATURES: "${{ secrets.ENTANDO_OPT_FEATURES }}"
   ENTANDO_OPT_GLOBAL_FEATURES: "${{ secrets.ENTANDO_OPT_GLOBAL_FEATURES }}"
   ENTANDO_OPT_LOG_LEVEL: "${{ secrets.ENTANDO_OPT_LOG_LEVEL }}"
@@ -22,10 +24,10 @@ jobs:
   # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
   # SNAPSHOT TAG
 
-  add-snapshot-tag:
+  add-version-tag:
     runs-on: ubuntu-latest
     steps:
-      - name: "ADD SNAPSOT TAG"
+      - name: "ADD SNAPSHOT TAG"
         run: |
           ${{ secrets.ENTANDO_OPT_PPL_INSTALL_CMD }}
 
@@ -34,6 +36,6 @@ jobs:
                 --id "CHECKOUT-BASE" \
                 --lcd "$LOCAL_CLONE_DIR" \
                 --token "${{ secrets.ENTANDO_BOT_TOKEN }}" \
-          .. release tag-snapshot-version \
-                --id "TAG-SNAPSHOT" \
+          .. publication tag-git-version \
+                --id "TAG-VERSION" \
                 --lcd "$LOCAL_CLONE_DIR"

.github/workflows/pr.yml

@@ -8,9 +8,11 @@ on:
       - reopened
     branches:
       - develop
+      - epic/*
+      - release/*
 
 env:
-  ENTANDO_OPT_USE_PPL_TAG: "v1.1.1"
+  ENTANDO_OPT_USE_PPL_TAG: "v1.2.0"
   ENTANDO_OPT_FEATURES: "${{ secrets.ENTANDO_OPT_FEATURES }}"
   ENTANDO_OPT_GLOBAL_FEATURES: "${{ secrets.ENTANDO_OPT_GLOBAL_FEATURES }}"
   ENTANDO_OPT_LOG_LEVEL: "${{ secrets.ENTANDO_OPT_LOG_LEVEL }}"
@@ -45,9 +47,9 @@ jobs:
           ${{ secrets.ENTANDO_OPT_PPL_INSTALL_CMD }}
           ~/ppl-run \
             .. status-report \
-            .. @checkout-branch pr --lcd "$LOCAL_CLONE_DIR" \
+            .. @checkout-branch --lcd "$LOCAL_CLONE_DIR" \
             .. @setup-feature-flags "PR_PREFLIGHT_CHECKS" "BOM_CHECK" "BOM" \
-            .. @setup-features-list "SCAN_MATRIX" --prefix "MTX-MVN-" \
+            .. @setup-features-list "SCAN_MATRIX" --prefix "MTX-MVN-,MTX-SCAN-" \
           ;
       - name: "PR preflight checks"
         if: steps.START.outputs.PR_PREFLIGHT_CHECKS != 'false'
@@ -63,6 +65,7 @@ jobs:
     needs: [ 'prepare' ]
     runs-on: ubuntu-latest
     env:
+      ENTANDO_BOT_TOKEN: ${{ secrets.ENTANDO_BOT_TOKEN }}
       ENTANDO_OPT_OKD_LOGIN_URL: "${{ secrets.ENTANDO_OPT_OKD_LOGIN_URL }}"
       ENTANDO_OPT_OKD_LOGIN_TOKEN: "${{ secrets.ENTANDO_OPT_OKD_LOGIN_TOKEN }}"
       ENTANDO_OPT_OKD_LOGIN_NAMESPACE: "${{ secrets.ENTANDO_OPT_OKD_LOGIN_NAMESPACE }}"
@@ -71,15 +74,14 @@ jobs:
     steps:
       #~ CHECKOUT
       - name: "CHECKOUT"
+        id: CHECKOUT
         run: |
           ${{ secrets.ENTANDO_OPT_PPL_INSTALL_CMD }}
-          ~/ppl-run checkout-branch pr \
+          ~/ppl-run checkout-branch \
             --lcd "$LOCAL_CLONE_DIR" \
-            --token "${{ secrets.ENTANDO_BOT_TOKEN }}" \
+            --token "$ENTANDO_BOT_TOKEN" \
           ;
-
-          # Refines the cache key
-          echo "BUILD_CACHE_KEY=$( sha256sum "$LOCAL_CLONE_DIR/pom.xml" --zero | cut -d' ' -f1 )" >> $GITHUB_ENV
+          ~/ppl-run generic GENERATE-BUILD-CACHE-KEY "BUILD_CACHE_KEY" --lcd "$LOCAL_CLONE_DIR" >> $GITHUB_ENV
       #~ JDK
       - name: "Set up JDK 11"
         uses: actions/setup-java@v1
@@ -134,8 +136,7 @@ jobs:
         run: |
           ${{ secrets.ENTANDO_OPT_PPL_INSTALL_CMD }}
           ~/ppl-run checkout-branch pr --lcd "$LOCAL_CLONE_DIR"
-
-          echo "BUILD_CACHE_KEY=$( sha256sum "$LOCAL_CLONE_DIR/pom.xml" --zero | cut -d' ' -f1 )" >> $GITHUB_ENV
+          ~/ppl-run generic GENERATE-BUILD-CACHE-KEY "BUILD_CACHE_KEY" --lcd "$LOCAL_CLONE_DIR" >> $GITHUB_ENV
       #~ JDK
       - name: "Set up JDK 11"
         uses: actions/setup-java@v1

.github/workflows/publication.yml

@@ -6,7 +6,7 @@ on:
       - 'v*'
 
 env:
-  ENTANDO_OPT_USE_PPL_TAG: "v1.1.1"
+  ENTANDO_OPT_USE_PPL_TAG: "v1.2.0"
   ENTANDO_OPT_FEATURES: "${{ secrets.ENTANDO_OPT_FEATURES }}"
   ENTANDO_OPT_GLOBAL_FEATURES: "${{ secrets.ENTANDO_OPT_GLOBAL_FEATURES }}"
   ENTANDO_OPT_LOG_LEVEL: "${{ secrets.ENTANDO_OPT_LOG_LEVEL }}"
@@ -34,21 +34,21 @@ jobs:
         id: START
         run: |
           ${{ secrets.ENTANDO_OPT_PPL_INSTALL_CMD }}
-          ~/ppl-run status-report \
+          ~/ppl-run \
+            .. status-report \
             .. @setup-feature-flags "PR_FORMAT_CHECK" "BOM_CHECK" "BOM" \
-            .. @setup-features-list "SCAN_MATRIX" true SONAR_SCAN OWASP_SCAN SNYK_SCAN \
           ;
       #~ CHECKOUT
-      - name: "Checkout"
+      - name: "CHECKOUT"
         id: CHECKOUT
         run: |
           ~/ppl-run \
-            .. checkout-branch base --id "CHECKOUT FOR NEXUS PUBLICATION" --lcd "$LOCAL_CLONE_DIR" \
+            .. checkout-branch --id "CHECKOUT FOR NEXUS PUBLICATION" \
+                  --lcd "$LOCAL_CLONE_DIR" \
+                  --token "$ENTANDO_BOT_TOKEN" \
             .. pr-preflight-checks --only flags --lcd "$LOCAL_CLONE_DIR" \
           ;
-
-          # Refines the cache key
-          echo "BUILD_CACHE_KEY=$( sha256sum "$LOCAL_CLONE_DIR/pom.xml" --zero | cut -d' ' -f1 )" >> $GITHUB_ENV
+          ~/ppl-run generic GENERATE-BUILD-CACHE-KEY "BUILD_CACHE_KEY" --lcd "$LOCAL_CLONE_DIR" >> $GITHUB_ENV
       #~ JDK
       - name: "Set up JDK 11"
         uses: actions/setup-java@v1
@@ -93,7 +93,8 @@ jobs:
           ~/ppl-run bom update-bom \
             --id "UPDATE-BOM" \
             --lcd "$LOCAL_CLONE_DIR" \
-            --token "$ENTANDO_BOT_TOKEN"
+            --token "$ENTANDO_BOT_TOKEN" \
+          ;
       #~ PUBLISH TO DOCKER IMAGE
       - name: "Publish docker"
         env:

pom.xml

@@ -34,17 +34,19 @@
     <properties>
         <!-- COMPONENTS -->
         <entando-core-parent.version>7.0.14</entando-core-parent.version>
-        <entando-engine.version>7.0.0-ENG-3319-PR-239</entando-engine.version>
-        <entando-admin-console.version>7.0.0-ENG-3286-PR-116</entando-admin-console.version>
+        <entando-engine.version>7.0.0-ENG-3071-PR-238</entando-engine.version>
+        <entando-admin-console.version>7.0.0-ENG-3214-PR-115</entando-admin-console.version>
+        <entando-portal-ui.version>7.0.0-ENG-3071-PR-46</entando-portal-ui.version>
         <entando-keycloak-plugin.version>7.0.0-ENG-3214-PR-66</entando-keycloak-plugin.version>
         <entando-plugin-jacms.version>7.0.0-ENG-3110-PR-151</entando-plugin-jacms.version>
         <entando-plugin-jpcontentscheduler.version>7.0.0-ENG-3110-PR-44</entando-plugin-jpcontentscheduler.version>
         <entando-plugin-jpmail.version>7.0.0-ENG-3214-PR-43</entando-plugin-jpmail.version>
-        <entando-plugin-jpredis.version>7.0.0-ENG-3214-PR-25</entando-plugin-jpredis.version>
-        <entando-plugin-jpseo.version>7.0.0-ENG-3214-PR-68</entando-plugin-jpseo.version>
         <entando-plugin-jpversioning.version>7.0.0-ENG-3214-PR-41</entando-plugin-jpversioning.version>
-        <entando-portal-ui.version>7.0.0-ENG-3214-PR-45</entando-portal-ui.version>
-
+        <entando-plugin-jpseo.version>7.0.0-ENG-3214-PR-68</entando-plugin-jpseo.version>
+        <entando-plugin-jpcontentscheduler.version>7.0.0-ENG-3214-PR-43</entando-plugin-jpcontentscheduler.version>
+        <entando-plugin-jpredis.version>7.0.0-ENG-3214-PR-25</entando-plugin-jpredis.version>
+        <entando-keycloak-plugin.version>7.0.0-ENG-3214-PR-66</entando-keycloak-plugin.version>
+
         <!-- SONAR -->
         <github.organization>entando</github.organization>
         <sonar.host.url>https://sonarcloud.io</sonar.host.url>
@@ -63,7 +65,7 @@
         <test.database.serv.url>
             jdbc:derby:${project.build.directory}/test/db/${project.artifactId}testServ;create=true
         </test.database.serv.url>
-        
+
         <docker.host.address>127.0.0.1</docker.host.address>
         <entando.engine.port>8080</entando.engine.port>
         <appbuilder.port>3000</appbuilder.port>
@@ -76,7 +78,7 @@
         <skipDocker>true</skipDocker>
         <skipSmokeTests>true</skipSmokeTests>
         <autoCreateNetwork>true</autoCreateNetwork>
-        
+
         <entando.version>6.3.0-SNAPSHOT</entando.version>
         <postgres.driver.version>42.2.25</postgres.driver.version>
         <oracle.driver.version>21.4.0.0.1</oracle.driver.version>

src/main/webapp/WEB-INF/web.xml

@@ -21,8 +21,7 @@
     </context-param>
     <context-param>
         <param-name>Struts2Config</param-name>
-        <param-value>struts-default.xml,struts-plugin.xml,struts.xml,entando-struts-plugin.xml,japs-struts-plugin.xml
-        </param-value>
+        <param-value>struts-default.xml,struts-plugin.xml,struts.xml,entando-struts-plugin.xml,japs-struts-plugin.xml</param-value>
     </context-param>
     <context-param>
         <param-name>org.apache.tiles.definition.DefinitionsFactory.DEFINITIONS_CONFIG</param-name>
@@ -98,6 +97,11 @@
         <servlet-class>org.entando.entando.aps.servlet.ControllerServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
+    <servlet>
+        <servlet-name>WebUiServlet</servlet-name>
+        <servlet-class>org.entando.entando.aps.servlet.WebUiServlet</servlet-class>
+        <load-on-startup>1</load-on-startup>
+    </servlet>
     <servlet>
         <servlet-name>PreviewControllerServlet</servlet-name>
         <servlet-class>org.entando.entando.aps.servlet.PreviewControllerServlet</servlet-class>
@@ -141,6 +145,10 @@
         <servlet-name>ControllerServlet</servlet-name>
         <url-pattern>/pages/*</url-pattern>
     </servlet-mapping>
+    <servlet-mapping>
+        <servlet-name>WebUiServlet</servlet-name>
+        <url-pattern>/webui/*</url-pattern>
+    </servlet-mapping>
     <servlet-mapping>
         <servlet-name>PreviewControllerServlet</servlet-name>
         <url-pattern>/preview/*</url-pattern>