From acb4ac4c54ff9ed6270184d88c7c11b6104e9aec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Olov=20Ylinenp=C3=A4=C3=A4?= Date: Thu, 28 Nov 2024 10:01:02 +0100 Subject: [PATCH] fix(emm): prepare for proxy... --- emm/build.gradle | 2 +- emm/src/main/java/whelk/EmmServlet.java | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/emm/build.gradle b/emm/build.gradle index f670e896c2..9263f522a1 100644 --- a/emm/build.gradle +++ b/emm/build.gradle @@ -60,7 +60,7 @@ task(appRun, dependsOn: "classes", type: JavaExec) { systemProperties( 'xl.secret.properties': System.getProperty("xl.secret.properties"), 'xl.logRoot': System.getProperty("xl.logRoot", "./logs"), - 'xl.http.port': System.getProperty("xl.http.port", "8182") + 'xl.http.port': System.getProperty("xl.http.port", "8186") ) args(System.getProperty("args", "").split() as String[]) diff --git a/emm/src/main/java/whelk/EmmServlet.java b/emm/src/main/java/whelk/EmmServlet.java index ae0ae72da2..04751bc655 100644 --- a/emm/src/main/java/whelk/EmmServlet.java +++ b/emm/src/main/java/whelk/EmmServlet.java @@ -45,7 +45,7 @@ public void doGet(HttpServletRequest req, HttpServletResponse res) { responseObject.put("@context", contexts); responseObject.put("type", "OrderedCollection"); responseObject.put("id", apiBaseUrl); - responseObject.put("url", apiBaseUrl + "full"); + responseObject.put("url", apiBaseUrl + (apiBaseUrl.endsWith("/") ? "full" : "/full")); var first = new LinkedHashMap<>(); first.put("type", "OrderedCollectionPage"); first.put("id", apiBaseUrl+"?until="+System.currentTimeMillis()); @@ -63,5 +63,4 @@ public void doGet(HttpServletRequest req, HttpServletResponse res) { } } - }