[bugfix] harden WindowsPathResource wrapper and Jetty startup diagnostics

- Symmetric equals via delegate unwrapping
- Reorder wrapIfNeeded guards to prevent double-wrap on Windows
- Use OSUtil.isWindows() consistently
- Remove System.err from recordStartupFailure; rely on logger + test exception detail
- Document instanceof PathResource limitation in WindowsPathResource javadoc

Author: duncdrum

exist-core/src/main/java/org/exist/jetty/JettyStart.java

@@ -135,20 +135,13 @@ private static void consoleOut(final String msg) {
         System.out.println(msg); //NOSONAR this has to go to the console
     }
 
-    private static void consoleErr(final String msg) {
-        System.err.println(msg); //NOSONAR surfaced in Surefire output when test log4j root is OFF
-    }
-
     private synchronized void recordStartupFailure(final String detail, final Throwable cause) {
         webAppStartedSuccessfully = false;
         webAppStartupFailureDetail = detail;
         if (cause != null) {
             logger.fatal("Jetty startup failed: {}", detail, cause);
-            consoleErr("Jetty startup failed: " + detail);
-            cause.printStackTrace(System.err); //NOSONAR CI diagnostics when log4j is disabled in tests
         } else {
             logger.fatal("Jetty startup failed: {}", detail);
-            consoleErr("Jetty startup failed: " + detail);
         }
     }
 
@@ -856,8 +849,8 @@ public synchronized boolean isWebAppStartedSuccessfully() {
 
     /**
      * When {@link #isWebAppStartedSuccessfully()} is {@code false}, holds the last startup failure
-     * message for test diagnostics (also printed to {@code System.err} because module test log4j
-     * configs often set {@code Root level="OFF"}).
+     * message for test diagnostics (surfaced by {@link org.exist.test.ExistWebServer} in thrown
+     * {@link IllegalStateException}s).
      */
     public synchronized Optional<String> getWebAppStartupFailureDetail() {
         return Optional.ofNullable(webAppStartupFailureDetail);

exist-core/src/main/java/org/exist/jetty/WindowsPathResource.java

@@ -25,8 +25,8 @@
 import org.eclipse.jetty.util.resource.PathResource;
 import org.eclipse.jetty.util.resource.Resource;
 import org.eclipse.jetty.util.resource.ResourceFactory;
+import org.exist.util.OSUtil;
 
-import java.io.File;
 import java.net.URI;
 import java.nio.file.Path;
 import java.nio.file.Paths;
@@ -40,6 +40,10 @@
  * {@code path.resolve(uri.getPath())}, which throws {@link java.nio.file.InvalidPathException}
  * when the URI path is {@code /D:/...}. Exploded test webapps on Windows CI hit this in
  * {@code WebAppContext.getWebInf()}. Remove when upstream Jetty restores safe Windows resolve.
+ * <p>
+ * This class extends {@link Resource}, not {@link PathResource}. Jetty internals that use
+ * {@code instanceof PathResource} will not treat wrapped resources as path resources; CI and
+ * integration tests validate that the exploded-webapp startup path does not depend on that.
  */
 public final class WindowsPathResource extends Resource {
 
@@ -52,12 +56,15 @@ private WindowsPathResource(final Resource delegate, final ResourceFactory resou
     }
 
     public static Resource wrapIfNeeded(final Resource resource, final ResourceFactory resourceFactory) {
-        if (resource == null || File.separatorChar != '\\' || !(resource instanceof PathResource)) {
+        if (resource == null || !OSUtil.isWindows()) {
             return resource;
         }
         if (resource instanceof WindowsPathResource) {
             return resource;
         }
+        if (!(resource instanceof PathResource)) {
+            return resource;
+        }
         return new WindowsPathResource(resource, resourceFactory);
     }
 
@@ -114,10 +121,13 @@ public boolean equals(final Object obj) {
         if (this == obj) {
             return true;
         }
-        if (!(obj instanceof WindowsPathResource other)) {
+        if (!(obj instanceof Resource other)) {
             return false;
         }
-        return delegate.equals(other.delegate);
+        if (other instanceof WindowsPathResource wrapped) {
+            other = wrapped.delegate;
+        }
+        return delegate.equals(other);
     }
 
     @Override

exist-core/src/main/java/org/exist/test/ExistWebServer.java

@@ -67,7 +67,7 @@
  *   <li>{@code jetty.home} — Jetty configuration directory ({@code exist-jetty-config/target/classes/...})</li>
  * </ul>
  * Startup failures throw {@link IllegalStateException} with detail from {@link org.exist.jetty.JettyStart}
- * (also printed to {@code System.err} when test log4j root is OFF).
+ * ({@code webAppStartupFailureDetail} is included in the exception message).
  */
 public class ExistWebServer extends ExternalResource {
 

extensions/webdav/src/test/java/org/exist/jetty/WindowsPathResourceIT.java

@@ -24,9 +24,9 @@
 import org.eclipse.jetty.util.resource.PathResource;
 import org.eclipse.jetty.util.resource.Resource;
 import org.eclipse.jetty.util.resource.ResourceFactory;
+import org.exist.util.OSUtil;
 import org.junit.Test;
 
-import java.io.File;
 import java.nio.file.Files;
 import java.nio.file.InvalidPathException;
 import java.nio.file.Path;
@@ -44,7 +44,7 @@ public class WindowsPathResourceIT {
 
     @Test
     public void resolveWebInfOnWindowsDriveUri() throws Exception {
-        assumeTrue("Windows-only PathResource URI regression", File.separatorChar == '\\');
+        assumeTrue("Windows-only PathResource URI regression", OSUtil.isWindows());
 
         final ResourceFactory resourceFactory = ResourceFactory.root();
         final Path webapp = Files.createTempDirectory("webapp");