From 592b06e03c8ea983d3d3b328d02ced3e459fdfb0 Mon Sep 17 00:00:00 2001
From: alandavis <alan.davis@hyland.com>
Date: Mon, 8 Aug 2022 23:46:45 +0100
Subject: [PATCH] [release] 3.0.0-HXP-A1

---
 .travis.yml                                         |  2 +-
 .../transform/base/TransformController.java         | 13 +++++++++++++
 .../base/src/main/resources/templates/error.html    | 10 +++++-----
 engines/base/src/main/resources/templates/log.html  | 10 +++++-----
 engines/base/src/main/resources/templates/test.html | 10 +++++-----
 5 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index dd243fdf..bf18c50e 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -78,6 +78,6 @@ jobs:
 
     - name: "Release"
       stage: release
-      if: commit_message ~= /\[release\]/ AND branch ~= /^(master|SP\/.+|HF\/.+)$/
+      if: commit_message ~= /\[release\]/ AND branch ~= /^(master|ATS-0000_refactor_packages|SP\/.+|HF\/.+)$/
       before_script: travis_wait bash _ci/cache_artifacts.sh
       script: travis_wait 55 bash _ci/release.sh
diff --git a/engines/base/src/main/java/org/alfresco/transform/base/TransformController.java b/engines/base/src/main/java/org/alfresco/transform/base/TransformController.java
index 47f60ea3..3979ae96 100644
--- a/engines/base/src/main/java/org/alfresco/transform/base/TransformController.java
+++ b/engines/base/src/main/java/org/alfresco/transform/base/TransformController.java
@@ -147,6 +147,7 @@ public class TransformController
     public String test(Model model)
     {
         model.addAttribute("title", transformEngine.getTransformEngineName() + " Test Page");
+        model.addAttribute("proxyPathPrefix", getPathPrefix(transformEngine.getTransformEngineName()));
         TransformConfig transformConfig = ((TransformRegistry) transformRegistry).getTransformConfig();
         transformConfig = setOrClearCoreVersion(transformConfig, 0);
         model.addAttribute("transformOptions", optionLister.getOptionNames(transformConfig.getTransformOptions()));
@@ -160,6 +161,7 @@ public class TransformController
     public String error(Model model)
     {
         model.addAttribute("title", transformEngine.getTransformEngineName() + " Error Page");
+        model.addAttribute("proxyPathPrefix", getPathPrefix(transformEngine.getTransformEngineName()));
         return "error"; // display error.html
     }
 
@@ -170,6 +172,7 @@ public class TransformController
     String log(Model model)
     {
         model.addAttribute("title", transformEngine.getTransformEngineName() + " Log Entries");
+        model.addAttribute("proxyPathPrefix", getPathPrefix(transformEngine.getTransformEngineName()));
         Collection<LogEntry> log = LogEntry.getLog();
         if (!log.isEmpty())
         {
@@ -178,6 +181,16 @@ public class TransformController
         return "log"; // display log.html
     }
 
+    private static Object getPathPrefix(String transformEngineName)
+    {
+        int i = transformEngineName.lastIndexOf('-');
+        if (i != -1)
+        {
+            transformEngineName = transformEngineName.substring(i+1);
+        }
+        return "/"+transformEngineName.toLowerCase();
+    }
+
     /**
      * Kubernetes readiness probe.
      */
diff --git a/engines/base/src/main/resources/templates/error.html b/engines/base/src/main/resources/templates/error.html
index 03a557a8..5683623c 100644
--- a/engines/base/src/main/resources/templates/error.html
+++ b/engines/base/src/main/resources/templates/error.html
@@ -11,11 +11,11 @@
 
 <div>
     <br/>
-    <a href="/">Test</a>
-    <a href="/log">Log</a>
-    <a href="/ready">Ready</a>
-    <a href="/live">Live</a>
-    <a href="/transform/config?configVersion=9999">Config</a>
+    <a th:href="${proxyPathPrefix+'/'}">Test</a>
+    <a th:href="${proxyPathPrefix+'/log'}">Log</a>
+    <a th:href="${proxyPathPrefix+'/ready'}">Ready</a>
+    <a th:href="${proxyPathPrefix+'/live'}">Live</a>
+    <a th:href="${proxyPathPrefix+'/transform/config?configVersion=9999'}">Config</a>
 </div>
 
 </body>
diff --git a/engines/base/src/main/resources/templates/log.html b/engines/base/src/main/resources/templates/log.html
index 135bb6bd..0aa86a5b 100644
--- a/engines/base/src/main/resources/templates/log.html
+++ b/engines/base/src/main/resources/templates/log.html
@@ -35,11 +35,11 @@
 
     <div>
         <br/>
-        <a href="/">Test</a>
-        Log
-        <a href="/ready">Ready</a>
-        <a href="/live">Live</a>
-        <a href="/transform/config?configVersion=9999">Config</a>
+        <a th:href="${proxyPathPrefix+'/'}">Test</a>
+        <a th:href="${proxyPathPrefix+'/log'}">Log</a>
+        <a th:href="${proxyPathPrefix+'/ready'}">Ready</a>
+        <a th:href="${proxyPathPrefix+'/live'}">Live</a>
+        <a th:href="${proxyPathPrefix+'/transform/config?configVersion=9999'}">Config</a>
     </div>
 
 </body>
diff --git a/engines/base/src/main/resources/templates/test.html b/engines/base/src/main/resources/templates/test.html
index 66369ffe..c25b4d3d 100644
--- a/engines/base/src/main/resources/templates/test.html
+++ b/engines/base/src/main/resources/templates/test.html
@@ -2,7 +2,7 @@
 <body>
 	<div>
         <h2 th:text="${title}"></h2>
-        <form method="POST" enctype="multipart/form-data" action="/test">
+        <form method="POST" enctype="multipart/form-data" th:action="${proxyPathPrefix+'/test'}">
             <table>
                 <tr><td><div style="text-align:right">file</div></td><td><input type="file" name="file" /></td></tr>
                 <tr><td><div style="text-align:right">directAccessUrl</div></td><td><input type="text" name="directAccessUrl"/></td></tr>
@@ -49,10 +49,10 @@
     </div>
     <div>
         Test
-        <a href="/log">Log</a>
-        <a href="/ready">Ready</a>
-        <a href="/live">Live</a>
-        <a href="/transform/config?configVersion=9999">Config</a>
+        <a th:href="${proxyPathPrefix+'/log'}">Log</a>
+        <a th:href="${proxyPathPrefix+'/ready'}">Ready</a>
+        <a th:href="${proxyPathPrefix+'/live'}">Live</a>
+        <a th:href="${proxyPathPrefix+'/transform/config?configVersion=9999'}">Config</a>
     </div>
 </body>
 </html>