inteligr8/alfresco-transform-core
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-transform-core.git synced 2025-08-14 17:58:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

[release] 3.0.0-HXP-A1

Browse Source
This commit is contained in:
alandavis
2022-08-08 23:46:45 +01:00
parent 808636d767
commit 592b06e03c
5 changed files with 29 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -78,6 +78,6 @@ jobs:
- name: "Release" - name: "Release"
stage: 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 before_script: travis_wait bash _ci/cache_artifacts.sh
script: travis_wait 55 bash _ci/release.sh script: travis_wait 55 bash _ci/release.sh

13
engines/base/src/main/java/org/alfresco/transform/base/TransformController.java
View File

@@ -147,6 +147,7 @@ public class TransformController
public String test(Model model) public String test(Model model)
{ {
model.addAttribute("title", transformEngine.getTransformEngineName() + " Test Page"); model.addAttribute("title", transformEngine.getTransformEngineName() + " Test Page");
model.addAttribute("proxyPathPrefix", getPathPrefix(transformEngine.getTransformEngineName()));
TransformConfig transformConfig = ((TransformRegistry) transformRegistry).getTransformConfig(); TransformConfig transformConfig = ((TransformRegistry) transformRegistry).getTransformConfig();
transformConfig = setOrClearCoreVersion(transformConfig, 0); transformConfig = setOrClearCoreVersion(transformConfig, 0);
model.addAttribute("transformOptions", optionLister.getOptionNames(transformConfig.getTransformOptions())); model.addAttribute("transformOptions", optionLister.getOptionNames(transformConfig.getTransformOptions()));
@@ -160,6 +161,7 @@ public class TransformController
public String error(Model model) public String error(Model model)
{ {
model.addAttribute("title", transformEngine.getTransformEngineName() + " Error Page"); model.addAttribute("title", transformEngine.getTransformEngineName() + " Error Page");
model.addAttribute("proxyPathPrefix", getPathPrefix(transformEngine.getTransformEngineName()));
return "error"; // display error.html return "error"; // display error.html
} }
@@ -170,6 +172,7 @@ public class TransformController
String log(Model model) String log(Model model)
{ {
model.addAttribute("title", transformEngine.getTransformEngineName() + " Log Entries"); model.addAttribute("title", transformEngine.getTransformEngineName() + " Log Entries");
model.addAttribute("proxyPathPrefix", getPathPrefix(transformEngine.getTransformEngineName()));
Collection<LogEntry> log = LogEntry.getLog(); Collection<LogEntry> log = LogEntry.getLog();
if (!log.isEmpty()) if (!log.isEmpty())
{ {
@@ -178,6 +181,16 @@ public class TransformController
return "log"; // display log.html 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. * Kubernetes readiness probe.
*/ */

10
engines/base/src/main/resources/templates/error.html
View File

@@ -11,11 +11,11 @@
<div> <div>
<br/> <br/>
<a href="/">Test</a> <a th:href="${proxyPathPrefix+'/'}">Test</a>
<a href="/log">Log</a> <a th:href="${proxyPathPrefix+'/log'}">Log</a>
<a href="/ready">Ready</a> <a th:href="${proxyPathPrefix+'/ready'}">Ready</a>
<a href="/live">Live</a> <a th:href="${proxyPathPrefix+'/live'}">Live</a>
<a href="/transform/config?configVersion=9999">Config</a> <a th:href="${proxyPathPrefix+'/transform/config?configVersion=9999'}">Config</a>
</div> </div>
</body> </body>

10
engines/base/src/main/resources/templates/log.html
View File

@@ -35,11 +35,11 @@
<div> <div>
<br/> <br/>
<a href="/">Test</a> <a th:href="${proxyPathPrefix+'/'}">Test</a>
Log <a th:href="${proxyPathPrefix+'/log'}">Log</a>
<a href="/ready">Ready</a> <a th:href="${proxyPathPrefix+'/ready'}">Ready</a>
<a href="/live">Live</a> <a th:href="${proxyPathPrefix+'/live'}">Live</a>
<a href="/transform/config?configVersion=9999">Config</a> <a th:href="${proxyPathPrefix+'/transform/config?configVersion=9999'}">Config</a>
</div> </div>
</body> </body>

10
engines/base/src/main/resources/templates/test.html
View File

@@ -2,7 +2,7 @@
<body> <body>
<div> <div>
<h2 th:text="${title}"></h2> <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> <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">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> <tr><td><div style="text-align:right">directAccessUrl</div></td><td><input type="text" name="directAccessUrl"/></td></tr>
@@ -49,10 +49,10 @@
</div> </div>
<div> <div>
Test Test
<a href="/log">Log</a> <a th:href="${proxyPathPrefix+'/log'}">Log</a>
<a href="/ready">Ready</a> <a th:href="${proxyPathPrefix+'/ready'}">Ready</a>
<a href="/live">Live</a> <a th:href="${proxyPathPrefix+'/live'}">Live</a>
<a href="/transform/config?configVersion=9999">Config</a> <a th:href="${proxyPathPrefix+'/transform/config?configVersion=9999'}">Config</a>
</div> </div>
</body> </body>
</html> </html>