[test] Add distribution portal coverage and PR review follow-ups

Add PortalRedirectTest for GET / in distribution layout. Deploy the
portal with org.exist.jetty.WebAppContext so Windows PathResource
wrapping applies, and skip BrokerPool.stopAll when that static-only
context stops. Document CHAIN_PRIORITY spacing, WindowsPathResource
instanceof audit, and LEGACY_TOKEN_SEPARATOR removal tied to HC4
Phase 5 in PR eXist-db#6393.

Author: duncdrum

exist-core/src/main/java/org/exist/indexing/IndexWorker.java

@@ -55,6 +55,9 @@ public interface IndexWorker {
 
     /**
      * Lower values run earlier in {@link IndexController} listener chains and {@link #flush()}.
+     * Gaps reserve room for future workers: {@code 0} structural, {@code 1–99} pre-statistics,
+     * {@code 100–999} pre-Lucene, {@code 1000+} Lucene and later; unranked workers use
+     * {@link Integer#MAX_VALUE}.
      */
     int CHAIN_PRIORITY_STRUCTURAL = 0;
     int CHAIN_PRIORITY_STATISTICS = 100;

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

@@ -27,7 +27,8 @@
 
 /**
  * eXist {@link org.eclipse.jetty.ee10.webapp.WebAppContext} with Windows path handling for
- * Jetty 12.1 ({@link WindowsPathResource}).
+ * Jetty 12.1 ({@link WindowsPathResource}). Used for the main webapp ({@code /exist} or
+ * standalone {@code /}) and the distribution portal at {@code /}.
  *
  * @author <a href="mailto:shabanovd@gmail.com">Dmitriy Shabanov</a>
  */
@@ -52,6 +53,26 @@ public Resource newResource(final String urlOrPath) {
     protected void doStop() throws Exception {
         super.doStop();
 
-        BrokerPool.stopAll(true);
+        if (ownsBrokerPoolLifecycle()) {
+            BrokerPool.stopAll(true);
+        }
+    }
+
+    /**
+     * Main eXist webapps stop the embedded database; the distribution portal at {@code /} is
+     * static-only and must not tear down {@link BrokerPool} when Jetty stops it alongside {@code /exist}.
+     */
+    private boolean ownsBrokerPoolLifecycle() {
+        if ("/exist".equals(getContextPath())) {
+            return true;
+        }
+        if (!"/".equals(getContextPath())) {
+            return false;
+        }
+        final Resource baseResource = getBaseResource();
+        if (baseResource == null) {
+            return true;
+        }
+        return !baseResource.toString().replace('\\', '/').contains("/webapps/portal");
     }
 }

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

@@ -42,8 +42,10 @@
  * {@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.
+ * {@code instanceof PathResource} will not treat wrapped resources as path resources. eXist
+ * production code has no {@code instanceof PathResource} checks on resources that may be wrapped;
+ * CI and integration tests validate that the exploded-webapp startup path does not depend on
+ * Jetty-internal type checks either.
  * <p>
  * Only {@link #resolve(String)} differs from Jetty 12.1 {@link PathResource} behaviour. Other
  * {@link Resource} methods delegate to the wrapped resource or rely on inherited defaults that

exist-core/src/test/java/org/exist/http/PortalRedirectTest.java

@@ -0,0 +1,63 @@
+/*
+ * eXist-db Open Source Native XML Database
+ * Copyright (C) 2001 The eXist-db Authors
+ *
+ * info@exist-db.org
+ * http://www.exist-db.org
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+package org.exist.http;
+
+import org.apache.http.HttpResponse;
+import org.apache.http.HttpStatus;
+import org.apache.http.client.fluent.Request;
+import org.apache.http.util.EntityUtils;
+import org.exist.test.ExistWebServer;
+import org.junit.ClassRule;
+import org.junit.Test;
+
+import java.io.IOException;
+import java.nio.charset.StandardCharsets;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertTrue;
+
+/**
+ * Distribution-mode portal at {@code /} — landing page and redirect target to {@code /exist}.
+ */
+public class PortalRedirectTest extends AbstractHttpTest {
+
+    @ClassRule
+    public static final ExistWebServer existWebServer = new ExistWebServer(true, false, true, true, false);
+
+    @Test
+    public void portalRootServesLandingPageWithExistRedirect() throws IOException {
+        final Request request = Request.Get(portalUri(existWebServer));
+        final HttpResponse response = withHttpExecutor(existWebServer,
+                executor -> executor.execute(request).returnResponse());
+
+        assertEquals(HttpStatus.SC_OK, response.getStatusLine().getStatusCode());
+
+        final String body = EntityUtils.toString(response.getEntity(), StandardCharsets.UTF_8);
+        assertTrue("Expected portal title", body.contains("Open Source Native XML Database"));
+        assertTrue("Expected JS redirect to /exist", body.contains("window.location.replace(\"/exist\")"));
+        assertTrue("Expected noscript fallback link to /exist", body.contains("href=\"/exist\""));
+    }
+
+    private static String portalUri(final ExistWebServer existWebServer) {
+        return "http://localhost:" + existWebServer.getPort() + "/";
+    }
+}

exist-jetty-config/src/main/resources/org/exist/jetty/etc/jetty-deploy.xml

@@ -38,7 +38,7 @@
     <!-- Portal webapp at / — serves the redirect page to /exist -->
     <Call name="addHandler">
       <Arg>
-        <New id="portal" class="org.eclipse.jetty.ee10.webapp.WebAppContext">
+        <New id="portal" class="org.exist.jetty.WebAppContext">
           <Set name="contextPath">/</Set>
           <Set name="war"><SystemProperty name="exist.jetty.portal.dir"><Default><Property name="jetty.home" default="."/>/../../../exist-jetty-config/src/main/resources/org/exist/jetty/etc/webapps/portal/</Default></SystemProperty></Set>
           <Set name="defaultsDescriptor"><Property name="jetty.home" default="."/>/etc/webdefault.xml</Set>

exist-jetty-config/src/main/resources/org/exist/jetty/etc/webapps/portal/WEB-INF/jetty-web.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE Configure PUBLIC "-//Jetty//Configure//EN" "https://www.eclipse.org/jetty/configure_10_0.dtd">
-<Configure id="exist-portal-context" class="org.eclipse.jetty.ee10.webapp.WebAppContext">
+<Configure id="exist-portal-context" class="org.exist.jetty.WebAppContext">
   <Set name="contextPath">/</Set>
   <Set name="defaultsDescriptor"><Property name="jetty.home" default="."/>/etc/webdefault.xml</Set>
 </Configure>

extensions/modules/persistentlogin/src/main/java/org/exist/xquery/modules/persistentlogin/PersistentLogin.java

@@ -66,7 +66,14 @@ public class PersistentLogin {
      */
     private static final String TOKEN_SEPARATOR = "|";
 
-    /** Historical separator; still accepted when parsing incoming cookies. */
+    /**
+     * Historical separator; still accepted when parsing incoming cookies issued before the
+     * {@link #TOKEN_SEPARATOR} switch ({@code :} breaks HC4 Set-Cookie parsing — see
+     * <a href="https://github.com/eXist-db/exist/pull/6393">PR #6393</a>). Remove
+     * {@link #splitTokenValue} dual parsing once HC4 is fully removed from the codebase
+     * (Phase 5 in #6393, after expath Gate B). In-flight browser cookies are not a concern:
+     * a new eXist release install expects users to reauthenticate anyway.
+     */
     private static final String LEGACY_TOKEN_SEPARATOR = ":";
 
     private Map<String, LoginDetails> seriesMap = Collections.synchronizedMap(new HashMap<>());