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 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 @@

- Test - Log - Ready - Live - Config + Test + Log + Ready + Live + Config
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 @@

- Test - Log - Ready - Live - Config + Test + Log + Ready + Live + Config
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 @@

-
+ @@ -49,10 +49,10 @@
Test - Log - Ready - Live - Config + Log + Ready + Live + Config
file
directAccessUrl