entando · eugeniosant · Oct 31, 2023 · Nov 2, 2023 · Nov 2, 2023 · Nov 2, 2023
diff --git a/.github/workflows/ga-publication.yml b/.github/workflows/ga-publication.yml
@@ -46,7 +46,7 @@ jobs:
       - name: "Configure GA Repository"
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
           server-id: maven-central
           server-username: MAVEN_USERNAME
           server-password: MAVEN_PASSWORD

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
@@ -72,10 +72,10 @@ jobs:
             --token "$ENTANDO_BOT_TOKEN" \
           ;
       #~ JDK
-      - name: "Set up JDK 11"
+      - name: "Set up JDK 17"
         uses: actions/setup-java@v1
         with:
-          java-version: 11
+          java-version: 17
       #~ MAVEN CACHE
       - name: "Cache Maven packages"
         uses: actions/cache@v2
@@ -119,10 +119,10 @@ jobs:
 #          ${{ secrets.ENTANDO_OPT_PPL_INSTALL_CMD }}
 #          ~/ppl-run checkout-branch pr --lcd "$LOCAL_CLONE_DIR"
 #      #~ JDK
-#      - name: "Set up JDK 11"
+#      - name: "Set up JDK 17"
 #        uses: actions/setup-java@v1
 #        with:
-#          java-version: 11
+#          java-version: 17
 #      #~ MAVEN CACHE
 #      - name: "Cache Maven packages"
 #        id: maven-cache

diff --git a/.github/workflows/publication.yml b/.github/workflows/publication.yml
@@ -10,17 +10,12 @@ env:
   ENTANDO_BOT_TOKEN: ${{ secrets.ENTANDO_BOT_TOKEN }}
   PR_CHECKER_PATH: ".github/pr-title-checker-config.json"
 
-  JDK_VERSION: 11
+  JDK_VERSION: 17
   BUILD_COMMANDS: mvn clean install;
-  DOCKER_EAP_IMAGE_BASE_NAME: entando/entando-de-app-eap
   DOCKER_TOMCAT_IMAGE_BASE_NAME: entando/entando-de-app-tomcat
-  DOCKER_WILDFLY_IMAGE_BASE_NAME: entando/entando-de-app-wildfly
-  DOCKER_EAP-WILDFLY_IMAGE_ARCHITECTURE: linux/amd64
   DOCKER_TOMCAT_IMAGE_ARCHITECTURE: linux/amd64,linux/arm64
   DOCKER_IMAGE_CONTEXT: .
-  DOCKER_EAP_IMAGE_FILE: Dockerfile.eap
   DOCKER_TOMCAT_IMAGE_FILE: Dockerfile.tomcat
-  DOCKER_WILDFLY_IMAGE_FILE: Dockerfile.wildfly
   DOCKER_IMAGE_PUSH: true
 
 jobs:
@@ -58,23 +53,6 @@ jobs:
       - name: Build with Maven
         run: ${{ env.BUILD_COMMANDS }}
 
-      - name: Docker meta-eap
-        id: meta-eap
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            ${{ env.DOCKER_EAP_IMAGE_BASE_NAME }}
-          tags: |
-            type=schedule
-            type=ref,event=branch
-            type=ref,event=pr,value={{base_ref}}
-            type=ref,event=tag
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=sha
-            type=raw,event=pr,value={{base_ref}}
-
       - name: Docker meta-tomcat
         id: meta-tomcat
         uses: docker/metadata-action@v4
@@ -92,23 +70,6 @@ jobs:
             type=sha
             type=raw,event=pr,value={{base_ref}}
 
-      - name: Docker meta-wildfly
-        id: meta-wildfly
-        uses: docker/metadata-action@v4
-        with:
-          images: |
-            ${{ env.DOCKER_WILDFLY_IMAGE_BASE_NAME }}
-          tags: |
-            type=schedule
-            type=ref,event=branch
-            type=ref,event=pr,value={{base_ref}}
-            type=ref,event=tag
-            type=semver,pattern={{version}}
-            type=semver,pattern={{major}}.{{minor}}
-            type=semver,pattern={{major}}
-            type=sha
-            type=raw,event=pr,value={{base_ref}}
-
       - name: Set up QEMU
         uses: docker/setup-qemu-action@v2
 
@@ -130,16 +91,6 @@ jobs:
           username: ${{ secrets.ENTANDO_RHT_DOCKER_USERNAME }}
           password: ${{ secrets.ENTANDO_RHT_DOCKER_PASSWORD }}
 
-      - name: Build and push eap Docker image
-        uses: docker/build-push-action@v4
-        with:
-          context: ${{ env.DOCKER_IMAGE_CONTEXT }}
-          file: ${{ env.DOCKER_EAP_IMAGE_FILE }}
-          push: ${{ env.DOCKER_IMAGE_PUSH }}
-          tags: ${{ steps.meta-eap.outputs.tags }}
-          labels: ${{ steps.meta-eap.outputs.labels }}
-          platforms: ${{ env.DOCKER_EAP-WILDFLY_IMAGE_ARCHITECTURE }}
-
       - name: Build tomcat Docker image for amd64
         uses: docker/build-push-action@v4
         with:
@@ -168,14 +119,4 @@ jobs:
           push: ${{ env.DOCKER_IMAGE_PUSH }}
           tags: ${{ steps.meta-tomcat.outputs.tags }}
           labels: ${{ steps.meta-tomcat.outputs.labels }}
-          platforms: ${{ env.DOCKER_TOMCAT_IMAGE_ARCHITECTURE }}
-
-      - name: Build and push wildfly Docker image
-        uses: docker/build-push-action@v4
-        with:
-          context: ${{ env.DOCKER_IMAGE_CONTEXT }}
-          file: ${{ env.DOCKER_WILDFLY_IMAGE_FILE }}
-          push: ${{ env.DOCKER_IMAGE_PUSH }}
-          tags: ${{ steps.meta-wildfly.outputs.tags }}
-          labels: ${{ steps.meta-wildfly.outputs.labels }}
-          platforms: ${{ env.DOCKER_EAP-WILDFLY_IMAGE_ARCHITECTURE }}
+          platforms: ${{ env.DOCKER_TOMCAT_IMAGE_ARCHITECTURE }}
diff --git a/Dockerfile.eap b/Dockerfile.eap
diff --git a/Dockerfile.tomcat b/Dockerfile.tomcat
@@ -1,12 +1,12 @@
-FROM registry.hub.docker.com/entando/entando-tomcat-base:7.3.0
+FROM registry.hub.docker.com/entando/entando-tomcat-base:v7.3.1-ENG-5347-PR-29-BB-release-2F-7.3
 ARG VERSION
 
 ### Required OpenShift Labels
 LABEL name="Entando App" \
       maintainer="[email protected]" \
       vendor="Entando Inc." \
       version="${VERSION}" \
-      release="7.3.0" \
+      release="7.3.1" \
       summary="Entando Application" \
       description="This Entando app engine application provides APIs and composition for Entando applications"
 

diff --git a/Dockerfile.wildfly b/Dockerfile.wildfly
diff --git a/admin-console/pom.xml b/admin-console/pom.xml
@@ -4,7 +4,7 @@
     <parent>
         <groupId>org.entando</groupId>
         <artifactId>app-engine</artifactId>
-        <version>7.3.0</version>
+        <version>7.3.1</version>
     </parent>
     <groupId>org.entando.entando</groupId>
     <artifactId>entando-admin-console</artifactId>

diff --git a/admin-console/src/main/webapp/404.jsp b/admin-console/src/main/webapp/404.jsp
diff --git a/admin-console/src/main/webapp/META-INF/MANIFEST.MF b/admin-console/src/main/webapp/META-INF/MANIFEST.MF
diff --git a/admin-console/src/main/webapp/META-INF/context.xml b/admin-console/src/main/webapp/META-INF/context.xml
diff --git a/admin-console/src/main/webapp/error.jsp b/admin-console/src/main/webapp/error.jsp
@@ -12,14 +12,14 @@
 <!DOCTYPE html>
 <html lang="en">
 	<head>
-		<title>Entando - Error</title>
+		<title>Error</title>
 		<meta name="viewport" content="width=device-width, initial-scale=1.0" />
 		<meta charset="utf-8" />
 		<link rel="stylesheet" href="<wp:resourceURL ignoreTenant="true" />administration/bootstrap/css/bootstrap.min.css" media="screen" />
 	</head>
 	<body>
 		<div class="container">
-			<h1>Entando - Error</h1>
+			<h1>Error</h1>
 			<p><a class="" href="<%=response.encodeURL(request.getContextPath()) %>">Go to Home</a></p>
 			<table class="table table-responsive table-striped">
 				<tr>

diff --git a/admin-console/src/main/webapp/index.jsp b/admin-console/src/main/webapp/index.jsp
diff --git a/admin-console/src/main/webapp/logout.jsp b/admin-console/src/main/webapp/logout.jsp
@@ -1,3 +1,4 @@
 <%@ taglib uri="/aps-core" prefix="wp" %>
-<wp:info key="startLang" var="startLangCode" />
-<jsp:forward page="/${startLangCode}/homepage.page"/>
+<wp:info key="startLang" var="startLangCodeVar" />
+<wp:info key="systemParam" paramName="homePageCode" var="homepageCodeVar" />
+<jsp:forward page="/${startLangCodeVar}/${homepageCodeVar}.page"/>
diff --git a/cds-plugin/pom.xml b/cds-plugin/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.entando</groupId>
         <artifactId>app-engine</artifactId>
-        <version>7.3.0</version>
+        <version>7.3.1</version>
     </parent>
     <artifactId>entando-plugin-jpcds</artifactId>
     <groupId>org.entando.entando.plugins</groupId>

diff --git a/.../src/main/java/org/entando/entando/plugins/jpcds/aps/system/storage/CdsConfiguration.java b/.../src/main/java/org/entando/entando/plugins/jpcds/aps/system/storage/CdsConfiguration.java
@@ -26,7 +26,7 @@
 @Component
 @CdsActive(true)
 public class CdsConfiguration {
-
+    
     @Value("${resourceRootURL}")
     private String baseURL;
     @Value("${resourceDiskRootFolder}")
@@ -39,6 +39,10 @@ public class CdsConfiguration {
     private boolean enabled;
     @Value("${CDS_PUBLIC_URL:https://cds.entando.org}")
     private String cdsPublicUrl;
+    @Value("${CDS_PUBLIC_PATH:}")
+    private String cdsPublicPath;
+    @Value("${CDS_INTERNAL_PUBLIC_SECTION:}")
+    private String cdsInternalPublicSection;
     @Value("${CDS_PRIVATE_URL:https://cds.entando.org}")
     private String cdsPrivateUrl;
     @Value("${CDS_PATH:/api/v1}")
@@ -51,6 +55,5 @@ public class CdsConfiguration {
     private String kcClientId;
     @Value("${KEYCLOAK_CLIENT_SECRET:}")
     private String kcClientSecret;
-
-
+
 }
diff --git a/...n/src/main/java/org/entando/entando/plugins/jpcds/aps/system/storage/CdsRemoteCaller.java b/...n/src/main/java/org/entando/entando/plugins/jpcds/aps/system/storage/CdsRemoteCaller.java
@@ -64,7 +64,8 @@ public class CdsRemoteCaller  {
     private Map<String, String> tenantsToken = new WeakHashMap<>();
 
     @Autowired
-    public CdsRemoteCaller(@Qualifier("keycloakRestTemplate")RestTemplate restTemplate,@Qualifier("keycloakRestTemplateWithRedirect")RestTemplate restTemplateWithRedirect,
+    public CdsRemoteCaller(@Qualifier("keycloakRestTemplate")RestTemplate restTemplate,
+            @Qualifier("keycloakRestTemplateWithRedirect")RestTemplate restTemplateWithRedirect,
             CdsConfiguration configuration) {
         this.restTemplate = restTemplate;
         this.restTemplateWithRedirect = restTemplateWithRedirect;