From 2e712a5af04eab1a93157f59f152811e6055c784 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Pro=C3=9F?= Date: Wed, 2 Apr 2025 14:54:10 +0200 Subject: [PATCH 1/2] Fix execution of all-in-one jar --- .../java/org/opengis/cite/wms13/CtlController.java | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/src/main/java/org/opengis/cite/wms13/CtlController.java b/src/main/java/org/opengis/cite/wms13/CtlController.java index 9fc99ee..351660a 100644 --- a/src/main/java/org/opengis/cite/wms13/CtlController.java +++ b/src/main/java/org/opengis/cite/wms13/CtlController.java @@ -3,6 +3,7 @@ import java.io.File; import java.io.IOException; import java.io.InputStream; +import java.net.MalformedURLException; import java.net.URI; import java.net.URISyntaxException; import java.net.URL; @@ -41,7 +42,7 @@ public CtlController() { try (InputStream is = getClass().getResourceAsStream("ets.properties")) { this.etsProperties.load(is); String mainScriptPath = etsProperties.getProperty("main-script"); - File ctlFile = findScriptFile(URI.create(mainScriptPath)); + Object ctlFile = findScriptFile(URI.create(mainScriptPath)); setupOpts.addSource(ctlFile); this.executor = new CtlExecutor(setupOpts); } @@ -115,7 +116,7 @@ public Source doTestRun(Document testRunArgs) throws Exception { * @param uri An absolute or relative URI. * @return A File object, or null if one could not be created. */ - final File findScriptFile(URI uri) { + final Object findScriptFile(URI uri) { File ctlFile = null; File baseDir = SetupOptions.getBaseConfigDirectory(); if (!uri.isAbsolute()) { @@ -124,6 +125,13 @@ final File findScriptFile(URI uri) { } if (null == ctlFile || !ctlFile.isFile()) { URL resource = getClass().getResource(uri.getPath()); + if (resource.getProtocol().equals("jar")) { + // See https://github.com/opengeospatial/ets-wms13/issues/120 and + // https://github.com/opengeospatial/teamengine/issues/632 + // will return an URL + return resource; + } + System.out.println(resource); try { ctlFile = new File(resource.toURI()); } From 92148e690bc562c80153b6530d6132a92ccc5d66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benjamin=20Pro=C3=9F?= Date: Thu, 3 Apr 2025 12:30:59 +0200 Subject: [PATCH 2/2] Remove sysout statement --- src/main/java/org/opengis/cite/wms13/CtlController.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/org/opengis/cite/wms13/CtlController.java b/src/main/java/org/opengis/cite/wms13/CtlController.java index 351660a..de0bd1c 100644 --- a/src/main/java/org/opengis/cite/wms13/CtlController.java +++ b/src/main/java/org/opengis/cite/wms13/CtlController.java @@ -131,7 +131,6 @@ final Object findScriptFile(URI uri) { // will return an URL return resource; } - System.out.println(resource); try { ctlFile = new File(resource.toURI()); }