From da551d3cd6944f8b1aca78edd33d10612c1030e7 Mon Sep 17 00:00:00 2001
From: Tom Bishop <thomasbishop@wenlin.com>
Date: Wed, 4 Sep 2024 12:55:29 -0400
Subject: [PATCH] CLDR-14913 Add Download XML button to Survey Tool (#4010)

---
 tools/cldr-apps/js/src/esm/cldrAnnounce.mjs   |  19 +-
 .../cldr-apps/js/src/esm/cldrGenerateVxml.mjs |  88 +++++
 tools/cldr-apps/js/src/esm/cldrText.mjs       |   1 +
 tools/cldr-apps/js/src/esm/cldrVueMap.mjs     |   4 +-
 tools/cldr-apps/js/src/views/GenerateVxml.vue |  75 +++++
 tools/cldr-apps/js/src/views/MainMenu.vue     |   1 +
 .../java/org/unicode/cldr/web/DBUtils.java    |   7 +-
 .../unicode/cldr/web/OutputFileManager.java   | 245 +++++---------
 .../java/org/unicode/cldr/web/STFactory.java  |  11 +-
 .../unicode/cldr/web/VettingViewerQueue.java  |   3 +-
 .../org/unicode/cldr/web/VxmlGenerator.java   |  70 ++++
 .../java/org/unicode/cldr/web/VxmlQueue.java  | 305 ++++++++++++++++++
 .../java/org/unicode/cldr/web/XPathTable.java |   5 +-
 .../unicode/cldr/web/api/GenerateVxml.java    | 111 +++++++
 14 files changed, 765 insertions(+), 180 deletions(-)
 create mode 100644 tools/cldr-apps/js/src/esm/cldrGenerateVxml.mjs
 create mode 100644 tools/cldr-apps/js/src/views/GenerateVxml.vue
 create mode 100644 tools/cldr-apps/src/main/java/org/unicode/cldr/web/VxmlGenerator.java
 create mode 100644 tools/cldr-apps/src/main/java/org/unicode/cldr/web/VxmlQueue.java
 create mode 100644 tools/cldr-apps/src/main/java/org/unicode/cldr/web/api/GenerateVxml.java

diff --git a/tools/cldr-apps/js/src/esm/cldrAnnounce.mjs b/tools/cldr-apps/js/src/esm/cldrAnnounce.mjs
index 056611e93aa..52bc0fda4cc 100644
--- a/tools/cldr-apps/js/src/esm/cldrAnnounce.mjs
+++ b/tools/cldr-apps/js/src/esm/cldrAnnounce.mjs
@@ -6,12 +6,6 @@ import * as cldrAjax from "./cldrAjax.mjs";
 import * as cldrSchedule from "./cldrSchedule.mjs";
 import * as cldrStatus from "./cldrStatus.mjs";
 
-/**
- * This should be false for production. It can be made true during debugging, which
- * may be useful for performance testing.
- */
-const DISABLE_ANNOUNCEMENTS = false;
-
 const CLDR_ANNOUNCE_DEBUG = false;
 
 const ANNOUNCE_REFRESH_SECONDS = 60; // one minute
@@ -38,6 +32,16 @@ const MOST_RECENT_ID_UNKNOWN = -1; // must be less than zero
  */
 let alreadyGotId = MOST_RECENT_ID_UNKNOWN;
 
+/**
+ * Ordinarily announcements are enabled. They may be temporarily disabled during
+ * critical operations such as VXML generation, or for debugging.
+ */
+let announcementsEnabled = true;
+
+function enableAnnouncements(enable) {
+  announcementsEnabled = Boolean(enable);
+}
+
 /**
  * Get the number of unread announcements, to display in the main menu
  *
@@ -60,7 +64,7 @@ async function getUnreadCount(setUnreadCount) {
  * we're only getting the number of unread announcements to display in the main header
  */
 async function refresh(viewCallbackSetData, viewCallbackSetCounts) {
-  if (DISABLE_ANNOUNCEMENTS) {
+  if (!announcementsEnabled) {
     return;
   }
   if (viewCallbackSetData) {
@@ -185,6 +189,7 @@ export {
   canAnnounce,
   canChooseAllOrgs,
   compose,
+  enableAnnouncements,
   getUnreadCount,
   refresh,
   resetSchedule,
diff --git a/tools/cldr-apps/js/src/esm/cldrGenerateVxml.mjs b/tools/cldr-apps/js/src/esm/cldrGenerateVxml.mjs
new file mode 100644
index 00000000000..24f20c3b37a
--- /dev/null
+++ b/tools/cldr-apps/js/src/esm/cldrGenerateVxml.mjs
@@ -0,0 +1,88 @@
+/*
+ * cldrGenerateVxml: for Survey Tool feature "Generate VXML". The display logic is in GenerateVxml.vue.
+ */
+import * as cldrAjax from "./cldrAjax.mjs";
+import * as cldrAnnounce from "./cldrAnnounce.mjs";
+import * as cldrNotify from "./cldrNotify.mjs";
+import * as cldrStatus from "./cldrStatus.mjs";
+
+const SECONDS_IN_MS = 1000;
+
+const NORMAL_RETRY = 10 * SECONDS_IN_MS; // "Normal" retry: starting or about to start
+
+const VXML_URL = "api/vxml";
+
+// These must match the back end; used in requests
+class LoadingPolicy {
+  static START = "START"; // start generating vxml
+  static CONTINUE = "CONTINUE"; // continue generating vxml
+  static STOP = "STOP"; // stop (cancel) generating vxml
+}
+
+// These must match the back end; used in responses
+class Status {
+  static INIT = "INIT"; // before making a request (back end does not have INIT)
+  static WAITING = "WAITING"; // waiting on other users/tasks
+  static PROCESSING = "PROCESSING"; // in progress
+  static READY = "READY"; // finished successfully
+  static STOPPED = "STOPPED"; // due to error or cancellation (LoadingPolicy.STOP)
+}
+
+let canGenerate = false;
+
+let callbackToSetData = null;
+
+function canGenerateVxml() {
+  return canGenerate;
+}
+
+function viewMounted(setData) {
+  callbackToSetData = setData;
+  const perm = cldrStatus.getPermissions();
+  canGenerate = Boolean(perm?.userIsAdmin);
+}
+
+function start() {
+  // Disable announcements during VXML generation to reduce risk of interference
+  cldrAnnounce.enableAnnouncements(false);
+  requestVxml(LoadingPolicy.START);
+}
+
+function fetchStatus() {
+  if (!canGenerate || "generate_vxml" !== cldrStatus.getCurrentSpecial()) {
+    canGenerate = false;
+  } else if (canGenerate) {
+    requestVxml(LoadingPolicy.CONTINUE);
+  }
+}
+
+function stop() {
+  requestVxml(LoadingPolicy.STOP);
+}
+
+function requestVxml(loadingPolicy) {
+  const args = { loadingPolicy: loadingPolicy };
+  const init = cldrAjax.makePostData(args);
+  cldrAjax
+    .doFetch(VXML_URL, init)
+    .then(cldrAjax.handleFetchErrors)
+    .then((r) => r.json())
+    .then(setVxmlData)
+    .catch((e) => {
+      cldrNotify.exception(e, "generating VXML");
+    });
+}
+
+function setVxmlData(data) {
+  if (!callbackToSetData) {
+    return;
+  }
+  callbackToSetData(data);
+  if (data.status === Status.WAITING || data.status === Status.PROCESSING) {
+    window.setTimeout(fetchStatus.bind(this), NORMAL_RETRY);
+  } else if (data.status === Status.READY || data.status === Status.STOPPED) {
+    cldrAnnounce.enableAnnouncements(true); // restore
+  }
+}
+
+export { Status, canGenerateVxml, start, stop, viewMounted };
diff --git a/tools/cldr-apps/js/src/esm/cldrText.mjs b/tools/cldr-apps/js/src/esm/cldrText.mjs
index 08fdf0535ef..d3991685e86 100644
--- a/tools/cldr-apps/js/src/esm/cldrText.mjs
+++ b/tools/cldr-apps/js/src/esm/cldrText.mjs
@@ -497,6 +497,7 @@ const strings = {
   special_forum: "Forum Posts",
   special_forum_participation: "Forum Participation",
   special_general: "General Info",
+  special_generate_vxml: "Generate VXML",
   special_list_emails: "List Email Addresses",
   special_list_users: "List Users",
   special_locales: "Locale List",
diff --git a/tools/cldr-apps/js/src/esm/cldrVueMap.mjs b/tools/cldr-apps/js/src/esm/cldrVueMap.mjs
index 875d7e8c051..7f396abdc74 100644
--- a/tools/cldr-apps/js/src/esm/cldrVueMap.mjs
+++ b/tools/cldr-apps/js/src/esm/cldrVueMap.mjs
@@ -1,11 +1,10 @@
-import * as cldrLoad from "./cldrLoad.mjs";
-
 import AboutPanel from "../views/AboutPanel.vue";
 import AnnouncePanel from "../views/AnnouncePanel.vue";
 import AddUser from "../views/AddUser.vue";
 import AutoImport from "../views/AutoImport.vue";
 import DowngradedVotes from "../views/DowngradedVotes.vue";
 import GeneralInfo from "../views/GeneralInfo.vue";
+import GenerateVxml from "../views/GenerateVxml.vue";
 import LockAccount from "../views/LockAccount.vue";
 import LookUp from "../views/LookUp.vue";
 import MainMenu from "../views/MainMenu.vue";
@@ -27,6 +26,7 @@ const specialToComponentMap = {
   auto_import: AutoImport,
   downgraded: DowngradedVotes,
   general: GeneralInfo, // see cldrLoad.GENERAL_SPECIAL
+  generate_vxml: GenerateVxml,
   lock_account: LockAccount,
   lookup: LookUp,
   menu: MainMenu,
diff --git a/tools/cldr-apps/js/src/views/GenerateVxml.vue b/tools/cldr-apps/js/src/views/GenerateVxml.vue
new file mode 100644
index 00000000000..9f0c060e4e0
--- /dev/null
+++ b/tools/cldr-apps/js/src/views/GenerateVxml.vue
@@ -0,0 +1,75 @@
+<script setup>
+import { onMounted, ref } from "vue";
+
+import * as cldrGenerateVxml from "../esm/cldrGenerateVxml.mjs";
+
+const STATUS = cldrGenerateVxml.Status;
+
+let hasPermission = ref(false);
+let message = ref("");
+let output = ref("");
+let percent = ref(0);
+let status = ref(STATUS.INIT);
+
+function mounted() {
+  cldrGenerateVxml.viewMounted(setData);
+  hasPermission.value = Boolean(cldrGenerateVxml.canGenerateVxml());
+}
+
+onMounted(mounted);
+
+function start() {
+  if (hasPermission) {
+    cldrGenerateVxml.start();
+    status.value = STATUS.WAITING;
+  }
+}
+
+function stop() {
+  cldrGenerateVxml.stop();
+  status.value = STATUS.STOPPED;
+}
+
+function canStop() {
+  return status.value === STATUS.WAITING || status.value === STATUS.PROCESSING;
+}
+
+function setData(data) {
+  message.value = data.message;
+  percent.value = data.percent;
+  status.value = data.status;
+  output.value = data.output;
+}
+
+defineExpose({
+  setData,
+});
+</script>
+
+<template>
+  <div v-if="!hasPermission">Please log in as Admin to use this feature.</div>
+  <div v-else>
+    <p v-if="status != STATUS.INIT">Current Status: {{ status }}</p>
+    <p v-if="message">
+      <span v-html="message"></span>
+    </p>
+    <p class="buttons">
+      <button v-if="canStop()" @click="stop()">Stop</button>
+      <button v-else @click="start()">Generate VXML Now</button>
+    </p>
+    <p class="progressBar">
+      <a-progress :percent="percent" />
+    </p>
+    <p v-html="output"></p>
+  </div>
+</template>
+
+<style scoped>
+.buttons {
+  margin: 1em;
+}
+
+.progressBar {
+  width: 50%;
+}
+</style>
diff --git a/tools/cldr-apps/js/src/views/MainMenu.vue b/tools/cldr-apps/js/src/views/MainMenu.vue
index dc51b6d3b51..1acbb88629a 100644
--- a/tools/cldr-apps/js/src/views/MainMenu.vue
+++ b/tools/cldr-apps/js/src/views/MainMenu.vue
@@ -2,6 +2,7 @@
   <ul>
     <template v-if="loggedIn">
       <li v-if="isAdmin"><a href="#admin///">Admin Panel</a></li>
+      <li v-if="isAdmin"><a href="#generate_vxml///">Generate VXML</a></li>
       <!-- My Account only has border-top (section-header) if Admin Panel is shown -->
       <li v-if="isAdmin" class="section-header">My Account</li>
       <li v-else>My Account</li>
diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/DBUtils.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/DBUtils.java
index a62b47a2ba3..44da39e3699 100644
--- a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/DBUtils.java
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/DBUtils.java
@@ -93,6 +93,9 @@ public String getDBInfo() {
     public static final String DB_SQL_BINCOLLATE = " COLLATE latin1_bin ";
     public static final String DB_SQL_ENGINE_INNO = "ENGINE=InnoDB";
     public static final String DB_SQL_MB4 = " CHARACTER SET utf8mb4 COLLATE utf8mb4_bin";
+
+    // This could be useful for debugging but is not accurate, since it is not decremented
+    // when a connection is auto-closed as with "try (Connection conn = ...)"
     public static int db_number_open = 0;
     public static int db_number_used = 0;
     private static final int db_UnicodeType = java.sql.Types.BLOB;
@@ -635,10 +638,11 @@ public final Connection getAConnection() {
                 c.setAutoCommit(true);
                 return c;
             }
+            db_number_open++;
             return datasource.getConnection();
         } catch (SQLException se) {
             se.printStackTrace();
-            SurveyMain.busted("Fatal in getConnection()", se);
+            SurveyMain.busted("Fatal in getAConnection()", se);
             return null;
         }
     }
@@ -651,6 +655,7 @@ public final Connection getAConnection() {
      */
     private static Connection getDBConnectionFor(final String connectionUrl) {
         try {
+            db_number_open++;
             return DriverManager.getConnection(connectionUrl);
         } catch (SQLException e) {
             throw new RuntimeException("getConnection() failed for url", e);
diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/OutputFileManager.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/OutputFileManager.java
index f970964c7e4..42d862e8def 100644
--- a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/OutputFileManager.java
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/OutputFileManager.java
@@ -22,16 +22,9 @@
 import java.io.Writer;
 import java.nio.file.Files;
 import java.time.Instant;
-import java.util.ArrayList;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.Map.Entry;
-import java.util.Set;
-import java.util.TreeSet;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.function.Predicate;
-import javax.servlet.ServletException;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import org.unicode.cldr.util.*;
@@ -39,9 +32,8 @@
 
 public class OutputFileManager {
 
-    private static boolean DEBUG = false;
     private static final String XML_SUFFIX = ".xml";
-    private SurveyMain sm;
+    private final SurveyMain sm;
 
     public OutputFileManager(SurveyMain surveyMain) {
         this.sm = surveyMain;
@@ -64,12 +56,9 @@ private enum Kind {
     private static final String RXML_PREFIX = "/rxml/main";
 
     private static final FileFilter xmlFileFilter =
-            new FileFilter() {
-                @Override
-                public boolean accept(File file) {
-                    String s = file.getName().toLowerCase();
-                    return s.endsWith(XML_SUFFIX) && !"en.xml".equals(s) && !"root.xml".equals(s);
-                }
+            file -> {
+                String s = file.getName().toLowerCase();
+                return s.endsWith(XML_SUFFIX) && !"en.xml".equals(s) && !"root.xml".equals(s);
             };
 
     /**
@@ -97,10 +86,10 @@ private static class DirNames {
      * @param request the HttpServletRequest, used for "vap"
      * @param out the Writer, to receive HTML output
      *     <p>Invoked by pasting a url like this into a browser:
-     *     http://localhost:8080/cldr-apps/admin-OutputAllFiles.jsp?vap=...
-     *     <p>This function was started using code moved here from admin-OutputAllFiles.jsp.
-     *     Reference: CLDR-12016 and CLDR-11877
-     *     <p>TODO: link to gear menu and use JavaScript for a front-end.
+     *     .../cldr-apps/admin-OutputAllFiles.jsp?vap=...
+     *     <p>TODO: remove this method, and admin-OutputAllFiles.jsp, and other obsolete code once
+     *     the new implementation with GenerateVxml.java is well tested
+     *     <p>Reference: https://unicode-org.atlassian.net/browse/CLDR-14913
      */
     public static void outputAndVerifyAllFiles(HttpServletRequest request, Writer out) {
         String vap = request.getParameter("vap");
@@ -120,10 +109,33 @@ public static void outputAndVerifyAllFiles(HttpServletRequest request, Writer ou
                 out.write("verify=true/false<br>\n");
                 return;
             }
+            generateVxml(null, out, outputFiles, removeEmpty, verifyConsistent);
+        } catch (Exception e) {
+            System.err.println("Exception in outputAndVerifyAllFiles: " + e);
+            e.printStackTrace();
+        }
+    }
+
+    /**
+     * Generate VXML
+     *
+     * <p>Called indirectly by modern api/GenerateVxml, as well as by legacy outputAndVerifyAllFiles
+     *
+     * @param vxmlGenerator the VxmlGenerator, or null if called by outputAndVerifyAllFiles
+     * @param out
+     * @param outputFiles
+     * @param removeEmpty
+     * @param verifyConsistent
+     */
+    public static void generateVxml(
+            VxmlGenerator vxmlGenerator,
+            Writer out,
+            boolean outputFiles,
+            boolean removeEmpty,
+            boolean verifyConsistent) {
+        try {
             /*
              * Sync on OutputFileManager.class here prevents re-entrance if invoked repeatedly before completion.
-             * Performance problem if run while Survey Tool has multiple users/requests?
-             * Completion of http request/response may take over ten minutes! TODO: use ajax.
              */
             synchronized (OutputFileManager.class) {
                 SurveyMain sm = CookieSession.sm;
@@ -136,9 +148,9 @@ public static void outputAndVerifyAllFiles(HttpServletRequest request, Writer ou
                     out.write("Directory creation for vetting data failed.");
                     return;
                 }
-                out.write("<p>Created new directory: " + vetdataDir.toString() + "</p>");
+                out.write("<p>Created new directory: " + vetdataDir + "</p>");
 
-                if (outputFiles && !ofm.outputAllFiles(out, vetdataDir)) {
+                if (outputFiles && !ofm.outputAllFiles(vxmlGenerator, out, vetdataDir)) {
                     out.write("File output failed.");
                     return;
                 }
@@ -148,18 +160,18 @@ public static void outputAndVerifyAllFiles(HttpServletRequest request, Writer ou
                 }
                 File vxmlDir = null;
                 if (removeEmpty || verifyConsistent) {
-                    vxmlDir = new File(vetdataDir.toString() + "/" + Kind.vxml.name());
+                    vxmlDir = new File(vetdataDir + "/" + Kind.vxml.name());
                 }
                 if (removeEmpty) {
-                    ofm.removeEmptyFiles(out, vxmlDir);
+                    ofm.removeEmptyFiles(vxmlDir);
                 }
                 if (verifyConsistent) {
-                    ofm.verifyAllFiles(out, vxmlDir);
+                    ofm.verifyAllFiles(vxmlGenerator, out, vxmlDir);
                 }
             }
-            System.out.println("outputAndVerifyAllFiles finished");
+            System.out.println("reallyOutputAndVerifyAllFiles finished");
         } catch (Exception e) {
-            System.err.println("Exception in outputAndVerifyAllFiles: " + e);
+            System.err.println("Exception in reallyOutputAndVerifyAllFiles: " + e);
             e.printStackTrace();
         }
     }
@@ -193,7 +205,6 @@ private static File createNewManualVetdataDir(File vetdataDir) {
      * Copy the DTD file from trunk into subfolders of the given vetdata folder ("auto" or "manual")
      *
      * @param vetdataDir the File for the vetdata directory
-     * @param common the name of the "common" folder
      * @return true for success, or false for failure
      *     <p>The dtd is required for removeEmptyFiles when it calls XMLFileReader.loadPathValues.
      *     The xml files all have something like: <!DOCTYPE ldml SYSTEM
@@ -214,7 +225,7 @@ private boolean copyDtd(File vetdataDir) {
         if (!dtdSource.exists()) {
             return false;
         }
-        String vp[] = {Kind.vxml.toString(), Kind.pxml.toString()};
+        String[] vp = {Kind.vxml.toString(), Kind.pxml.toString()};
         for (String s : vp) {
             File destDir =
                     new File(vetdataDir + "/" + s + "/" + DirNames.justCommon + "/" + dtdDirName);
@@ -236,13 +247,12 @@ private boolean copyDtd(File vetdataDir) {
     /**
      * Output all files (VXML, etc.)
      *
+     * @param vxmlGenerator the VxmlGenerator, or null if using jsp
      * @param out the Writer, to receive HTML output
      * @param vetDataDir the folder in which to write
      * @return true for success, false for failure
-     *     <p>This function was first created using code moved here from admin-OutputAllFiles.jsp.
-     *     Reference: CLDR-12016 and CLDR-11877 and CLDR-11850
      */
-    private boolean outputAllFiles(Writer out, File vetDataDir) {
+    private boolean outputAllFiles(VxmlGenerator vxmlGenerator, Writer out, File vetDataDir) {
         try {
             long start = System.currentTimeMillis();
             ElapsedTimer overallTimer =
@@ -251,14 +261,8 @@ private boolean outputAllFiles(Writer out, File vetDataDir) {
 
             out.write("<ol>\n");
 
-            Set<CLDRLocale> sortSet = new TreeSet<>();
-            sortSet.addAll(SurveyMain.getLocalesSet());
-            /*
-             * skip "en" and "root", since they should never be changed by the Survey Tool
-             */
-            sortSet.remove(CLDRLocale.getInstance("en"));
-            sortSet.remove(CLDRLocale.getInstance(LocaleNames.ROOT));
-
+            Set<CLDRLocale> sortSet =
+                    (vxmlGenerator != null) ? vxmlGenerator.getSortSet() : createVxmlLocaleSet();
             for (CLDRLocale loc : sortSet) {
                 out.write("<li>" + loc.getDisplayName() + "<br/>\n");
                 for (OutputFileManager.Kind kind : OutputFileManager.Kind.values()) {
@@ -281,17 +285,16 @@ private boolean outputAllFiles(Writer out, File vetDataDir) {
                             || kind == OutputFileManager.Kind.pxml) {
                         System.err.println("Writing " + loc.getDisplayName() + ":" + kind);
                         ElapsedTimer et = new ElapsedTimer("to write " + loc + ":" + kind);
-                        File f = writeManualOutputFile(vetDataDir, loc, kind);
-                        if (f == null) {
-                            out.write("FILE CREATION FAILED: " + loc.toString() + kind.name());
-                            return false;
-                        }
+                        writeManualOutputFile(vetDataDir, loc, kind);
                         numupd++;
                         System.err.println(et + " - upd " + numupd + "/" + (sortSet.size() + 2));
                     }
                     out.write("</span>  &nbsp;");
                 }
                 out.write("</li>\n");
+                if (vxmlGenerator != null) {
+                    vxmlGenerator.update(loc);
+                }
             }
             out.write("</ol>\n");
             out.write("<hr>\n");
@@ -320,20 +323,26 @@ private boolean outputAllFiles(Writer out, File vetDataDir) {
         }
     }
 
+    public static Set<CLDRLocale> createVxmlLocaleSet() {
+        Set<CLDRLocale> set = new TreeSet<>(SurveyMain.getLocalesSet());
+        // skip "en" and "root", since they should never be changed by the Survey Tool
+        set.remove(CLDRLocale.getInstance("en"));
+        set.remove(CLDRLocale.getInstance(LocaleNames.ROOT));
+        // Remove "mul", "mul_ZZ", etc.
+        set.removeIf(loc -> loc.getBaseName().startsWith(LocaleNames.MUL));
+        return set;
+    }
+
     /**
      * Write out the specified file(s).
      *
      * <p>If kind is vxml (for example), we may write to both common/main and common/annotations, or
      * to both seed/main and seed/annotations.
      *
-     * <p>Note: this is only used for "manually" generated files. Compare writeOutputFile which is
-     * for "automatic" scheduled generation of files.
-     *
      * @param loc the CLDRLocale
      * @param kind the Kind, currently Kind.vxml and Kind.pxml are supported
-     * @return the File, or null for failure
      */
-    private File writeManualOutputFile(File vetDataDir, CLDRLocale loc, Kind kind) {
+    private void writeManualOutputFile(File vetDataDir, CLDRLocale loc, Kind kind) {
         long st = System.currentTimeMillis();
         CLDRFile cldrFile;
         if (kind == Kind.vxml) {
@@ -353,15 +362,7 @@ private File writeManualOutputFile(File vetDataDir, CLDRLocale loc, Kind kind) {
             File baseDir = CLDRConfig.getInstance().getCldrBaseDirectory();
             String commonOrSeed = DirNames.justCommon;
             for (String c : DirNames.commonAndSeed) {
-                String path =
-                        baseDir
-                                + "/"
-                                + c
-                                + "/"
-                                + DirNames.justMain
-                                + "/"
-                                + loc.toString()
-                                + XML_SUFFIX;
+                String path = baseDir + "/" + c + "/" + DirNames.justMain + "/" + loc + XML_SUFFIX;
                 if (new File(path).exists()) {
                     commonOrSeed = c;
                     break;
@@ -371,20 +372,14 @@ private File writeManualOutputFile(File vetDataDir, CLDRLocale loc, Kind kind) {
              * Only create the file in "main" here; doWriteFile will then create the file in "annotations"
              */
             String outDirName =
-                    vetDataDir
-                            + "/"
-                            + kind.toString()
-                            + "/"
-                            + commonOrSeed
-                            + "/"
-                            + DirNames.justMain;
+                    vetDataDir + "/" + kind + "/" + commonOrSeed + "/" + DirNames.justMain;
             File outDir = new File(outDirName);
             if (!outDir.exists() && !outDir.mkdirs()) {
                 throw new InternalError("Unable to create directory: " + outDirName);
             }
-            String outFileName = outDirName + "/" + loc.toString() + XML_SUFFIX;
+            String outFileName = outDirName + "/" + loc + XML_SUFFIX;
             File outFile = new File(outFileName);
-            doWriteFile(loc, cldrFile, kind, outFile);
+            doWriteFile(cldrFile, kind, outFile);
             SurveyLog.debug(
                     "Updater: MANUALLY wrote: "
                             + kind
@@ -392,28 +387,21 @@ private File writeManualOutputFile(File vetDataDir, CLDRLocale loc, Kind kind) {
                             + loc
                             + " - "
                             + ElapsedTimer.elapsedTime(st));
-            return outFile;
         } catch (IOException e) {
             e.printStackTrace();
-            throw new RuntimeException("IO Exception " + e.toString(), e);
+            throw new RuntimeException("IO Exception " + e, e);
         }
     }
 
-    /**
-     * Remove "empty" VXML files in a set of directories
-     *
-     * @param out the Writer, to receive HTML output
-     *     <p>Compare RemoveEmptyCLDR.main
-     *     <p>Reference: https://unicode-org.atlassian.net/browse/CLDR-12016
-     */
-    private void removeEmptyFiles(Writer out, File vxmlDir) throws IOException {
+    /** Remove "empty" VXML files in a set of directories */
+    private void removeEmptyFiles(File vxmlDir) throws IOException {
         for (String c : DirNames.commonAndSeed) {
             /*
              * Skip main. Only do common/annotations and seed/annotations.
              */
             File dirFile = new File(vxmlDir + "/" + c + "/" + DirNames.justAnnotations);
             if (dirFile.exists()) {
-                removeEmptyFilesOneDir(out, dirFile);
+                removeEmptyFilesOneDir(dirFile);
             }
         }
     }
@@ -421,11 +409,10 @@ private void removeEmptyFiles(Writer out, File vxmlDir) throws IOException {
     /**
      * Remove "empty" VXML files in the given directory
      *
-     * @param out the Writer, to receive HTML output
      * @param dirFile the given directory
      * @throws IOException
      */
-    private void removeEmptyFilesOneDir(Writer out, File dirFile) throws IOException {
+    private void removeEmptyFilesOneDir(File dirFile) throws IOException {
         Set<String> treatAsNonEmpty = new HashSet<>();
         BiMap<String, File> onlyHasIdentity = HashBiMap.create();
         int counter = 0;
@@ -486,6 +473,7 @@ private static void addNameAndParents(Set<String> treatAsNonEmpty, String name)
     /**
      * Verify all VXML files
      *
+     * @param vxmlGenerator the VxmlGenerator, or null if using jsp
      * @param out the Writer, to receive HTML output
      *     <p>The following need to be verified on the server when generating vxml: • The same file
      *     must not occur in both the common/X and seed/X directories, for any X=main|annotations •
@@ -497,7 +485,8 @@ private static void addNameAndParents(Set<String> treatAsNonEmpty, String name)
      *     <p>vetdata └── vxml    ├── common    │   ├── annotations    │   └── main    └── seed ├──
      *     annotations    └── main
      */
-    private void verifyAllFiles(Writer out, File vxmlDir) throws IOException {
+    private void verifyAllFiles(VxmlGenerator vxmlGenerator, Writer out, File vxmlDir)
+            throws IOException {
         int failureCount = 0;
 
         /*
@@ -522,13 +511,21 @@ private void verifyAllFiles(Writer out, File vxmlDir) throws IOException {
 
         if (failureCount == 0) {
             out.write("<h1>✅ VXML verification succeeded</h1>\nOK<br>");
-            System.out.println("VXML verification succeeded");
+            if (vxmlGenerator != null) {
+                vxmlGenerator.setVerificationStatus(VxmlGenerator.VerificationStatus.SUCCESSFUL);
+            } else {
+                System.out.println("VXML verification succeeded");
+            }
         } else {
             out.write(
                     "<h1>❌ VXML verification failed!</h1>\nFailure count = "
                             + failureCount
                             + "<br>");
-            System.out.println("VXML verification failed! Failure count = " + failureCount);
+            if (vxmlGenerator != null) {
+                vxmlGenerator.setVerificationStatus(VxmlGenerator.VerificationStatus.FAILED);
+            } else {
+                System.out.println("VXML verification failed! Failure count = " + failureCount);
+            }
         }
     }
 
@@ -606,7 +603,7 @@ private boolean verifyParentChildSameDirectory(Writer out, File vxmlDir) throws
                     }
                     CLDRLocale parLoc = childLoc.getParent();
                     if (parLoc != null) {
-                        String parentName = parLoc.toString() + XML_SUFFIX;
+                        String parentName = parLoc + XML_SUFFIX;
                         if (!childName.equals(parentName)
                                 && !"en.xml".equals(parentName)
                                 && !"root.xml".equals(parentName)) {
@@ -760,13 +757,12 @@ private static Set<String> symmetricDifference(
     /**
      * Write one or more files. For vxml (at least), write one in "main" and one in "annotations".
      *
-     * @param loc the CLDRLocale
      * @param file the CLDRFile for reading
      * @param outFile the File for "main"; another file will be created in "annotations"
      * @throws UnsupportedEncodingException
      * @throws FileNotFoundException
      */
-    private void doWriteFile(CLDRLocale loc, CLDRFile file, Kind kind, File outFile)
+    private void doWriteFile(CLDRFile file, Kind kind, File outFile)
             throws UnsupportedEncodingException, FileNotFoundException {
         try (PrintWriter u8out =
                 new PrintWriter(new OutputStreamWriter(new FileOutputStream(outFile), "UTF8"))) {
@@ -799,11 +795,9 @@ private void doWriteFile(CLDRLocale loc, CLDRFile file, Kind kind, File outFile)
      * @param response
      * @return true if request is for a kind of xml we can provide, else false.
      * @throws IOException
-     * @throws ServletException
-     *     <p>Called by SurveyMain.doGet when get a request.
      */
     public boolean doRawXml(HttpServletRequest request, HttpServletResponse response)
-            throws IOException, ServletException {
+            throws IOException {
         /*
          * request.getPathInfo returns what follows "survey" in the url.
          * If the url is ".../cldr-apps/survey/vxml/main/aa.xml", it returns "vxml/main/aa.xml".
@@ -885,7 +879,7 @@ public boolean doRawXml(HttpServletRequest request, HttpServletResponse response
                 ctx.println("<a href='" + ctx.base() + "'>Return to SurveyTool</a><p>");
                 ctx.println("<h4>Locales</h4>");
                 ctx.println("<ul>");
-                CLDRLocale locales[] = SurveyMain.getLocales();
+                CLDRLocale[] locales = SurveyMain.getLocales();
                 int nrInFiles = locales.length;
                 for (int i = 0; i < nrInFiles; i++) {
                     CLDRLocale locale = locales[i];
@@ -909,7 +903,7 @@ public boolean doRawXml(HttpServletRequest request, HttpServletResponse response
                 response.sendRedirect(ctx.schemeHostPort() + ctx.base() + XML_PREFIX + "/");
             } else {
                 boolean found = false;
-                CLDRLocale locales[] = SurveyMain.getLocales();
+                CLDRLocale[] locales = SurveyMain.getLocales();
                 CLDRLocale foundLocale = null;
                 int nrInFiles = locales.length;
                 for (int i = 0; (!found) && (i < nrInFiles); i++) {
@@ -951,67 +945,4 @@ public boolean doRawXml(HttpServletRequest request, HttpServletResponse response
             }
         }
     }
-
-    // statistics helpers
-    private static Map<CLDRLocale, Pair<String, String>> localeNameCache =
-            new ConcurrentHashMap<>();
-
-    // for the statistics page - wrap locale ids in an <old data> span to show they were from the
-    // previous revision
-    private static final String OLD_DATA_BEGIN = "<span class='olddata'>";
-    private static final String OLD_DATA_END = "</span>";
-
-    private static Pair<String, String> statGetLocaleDisplayName(CLDRLocale loc) {
-        Pair<String, String> ret = localeNameCache.get(loc), toAdd = null;
-        if (ret == null) {
-            toAdd = ret = new Pair<>();
-        }
-        // note, may concurrently modify this object- that's OK.
-        if (ret.getFirst() == null) {
-            // use baseline data
-            ret.setFirst(loc.getDisplayName(false, null));
-        }
-        if (ret.getSecond() == null) {
-            // uses 'on disk' (old) data.
-            ret.setSecond(
-                    OLD_DATA_BEGIN
-                            + CookieSession.sm
-                                    .getDiskFactory()
-                                    .make(loc.getBaseName(), true)
-                                    .getName(loc.toLanguageTag())
-                            + OLD_DATA_END);
-        }
-        // needed to add it
-        if (toAdd != null) {
-            localeNameCache.put(loc, toAdd);
-        }
-        return ret;
-    }
-
-    // update the cache
-    public static void updateLocaleDisplayName(CLDRFile f, CLDRLocale l) {
-        try {
-            Pair<String, String> ret = statGetLocaleDisplayName(l);
-            String newValue = (f.getName(l.getBaseName()));
-            if (DEBUG) {
-                if (!newValue.equals(ret.getSecond())) {
-                    System.out.println(
-                            "Setting: "
-                                    + newValue
-                                    + " insteadof "
-                                    + ret.getSecond()
-                                    + " for "
-                                    + ret.getFirst());
-                }
-            }
-            ret.setSecond(newValue);
-        } catch (Throwable t) {
-            SurveyLog.logException(
-                    t,
-                    "Updating the Locale Display Name for "
-                            + l.getBaseName()
-                            + " with language tag "
-                            + l.toLanguageTag());
-        }
-    }
 }
diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/STFactory.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/STFactory.java
index f74214299b5..f6f02208036 100644
--- a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/STFactory.java
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/STFactory.java
@@ -1199,7 +1199,7 @@ public static void unimp() {
         throw new InternalError("NOT YET IMPLEMENTED - TODO!.");
     }
 
-    boolean dbIsSetup = false;
+    private boolean dbIsSetup = false;
 
     /** The infamous back-pointer. */
     public SurveyMain sm;
@@ -1455,7 +1455,7 @@ public synchronized void setupDB() {
         dbIsSetup = true; // don't thrash.
         String sql = "(none)"; // this points to
         Statement s = null;
-        try (Connection conn = DBUtils.getInstance().getDBConnection()) {
+        try (Connection conn = DBUtils.getInstance().getAConnection()) {
             if (!DBUtils.hasTable(DBUtils.Table.VOTE_VALUE.toString())) {
                 s = conn.createStatement();
                 sql =
@@ -1488,7 +1488,6 @@ public synchronized void setupDB() {
                 s.execute(sql);
                 s.close();
                 s = null; // don't close twice.
-                conn.commit();
                 System.err.println("Created table " + DBUtils.Table.VOTE_VALUE);
             } else if (!DBUtils.tableHasColumn(
                     conn, DBUtils.Table.VOTE_VALUE.toString(), VOTE_TYPE)) {
@@ -1502,7 +1501,6 @@ public synchronized void setupDB() {
                 s.execute(sql);
                 s.close();
                 s = null;
-                conn.commit();
                 System.err.println(
                         "Added column " + VOTE_TYPE + " to table " + DBUtils.Table.VOTE_VALUE);
             }
@@ -1538,7 +1536,6 @@ public synchronized void setupDB() {
                 s.execute(sql);
                 s.close();
                 s = null; // don't close twice.
-                conn.commit();
                 System.err.println("Created table " + DBUtils.Table.VOTE_VALUE_ALT);
             }
             if (!DBUtils.hasTable(DBUtils.Table.VOTE_FLAGGED.toString())) {
@@ -1567,7 +1564,6 @@ public synchronized void setupDB() {
                 s.execute(sql);
                 s.close();
                 s = null; // don't close twice.
-                conn.commit();
                 System.err.println("Created table " + DBUtils.Table.VOTE_FLAGGED);
             }
             if (!DBUtils.hasTable(DBUtils.Table.IMPORT.toString())) {
@@ -1605,7 +1601,6 @@ public synchronized void setupDB() {
                 s.execute(sql);
                 s.close();
                 s = null; // don't close twice.
-                conn.commit();
                 System.err.println("Created table " + DBUtils.Table.IMPORT);
             }
             if (!DBUtils.hasTable(DBUtils.Table.IMPORT_AUTO.toString())) {
@@ -1631,7 +1626,6 @@ public synchronized void setupDB() {
                 s.execute(sql);
                 s.close();
                 s = null; // don't close twice.
-                conn.commit();
                 System.err.println("Created table " + DBUtils.Table.IMPORT_AUTO);
             }
             String tableName = DBUtils.Table.LOCKED_XPATHS.toString();
@@ -1656,7 +1650,6 @@ public synchronized void setupDB() {
                 s.execute(sql);
                 s.close();
                 s = null; // don't close twice.
-                conn.commit();
                 System.err.println("Created table " + tableName);
             }
         } catch (SQLException se) {
diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/VettingViewerQueue.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/VettingViewerQueue.java
index eeffc4e3244..2df6927b463 100644
--- a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/VettingViewerQueue.java
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/VettingViewerQueue.java
@@ -245,7 +245,8 @@ public void run() {
                 }
                 try {
                     if (stop) {
-                        // this NEVER happens?
+                        // this NEVER happens?! Possibly should check stop AFTER calling
+                        // processCriticalWork
                         if (DEBUG) {
                             System.out.println(
                                     "VettingViewerQueue.Task.run -- stopping, "
diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/VxmlGenerator.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/VxmlGenerator.java
new file mode 100644
index 00000000000..fb92838ad16
--- /dev/null
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/VxmlGenerator.java
@@ -0,0 +1,70 @@
+package org.unicode.cldr.web;
+
+import java.io.Writer;
+import java.util.Set;
+import java.util.concurrent.ExecutionException;
+import org.unicode.cldr.util.CLDRLocale;
+
+public class VxmlGenerator {
+    public void generate(Set<CLDRLocale> sortSet, Writer out) throws ExecutionException {
+        this.sortSet = sortSet;
+        try {
+            // TODO: get the booleans somewhere, or remove the parameters
+            // -- in practice, we want them all true
+            // Reference: https://unicode-org.atlassian.net/browse/CLDR-14913
+            OutputFileManager.generateVxml(
+                    this, out, true, // outputFiles
+                    true, // removeEmpty
+                    true); // verifyConsistent
+        } catch (Exception e) {
+            throw new ExecutionException(e);
+        }
+    }
+
+    private Set<CLDRLocale> sortSet = null;
+
+    public Set<CLDRLocale> getSortSet() {
+        return sortSet;
+    }
+
+    public enum VerificationStatus {
+        SUCCESSFUL,
+        FAILED,
+        INCOMPLETE
+    }
+
+    private VerificationStatus verificationStatus = VerificationStatus.INCOMPLETE;
+
+    public VerificationStatus getVerificationStatus() {
+        return verificationStatus;
+    }
+
+    public void setVerificationStatus(VerificationStatus status) {
+        verificationStatus = status;
+    }
+
+    /**
+     * Class that allows the relaying of progress information. Extended by
+     * VxmlQueue.Task.VxmlProgressCallback
+     */
+    public static class ProgressCallback {
+        public void nudge(CLDRLocale loc) {}
+
+        public boolean isStopped() {
+            return false;
+        }
+    }
+
+    private ProgressCallback progressCallback;
+
+    public void setProgressCallback(ProgressCallback newCallback) {
+        progressCallback = newCallback;
+    }
+
+    public void update(CLDRLocale loc) {
+        if (progressCallback.isStopped()) {
+            throw new RuntimeException("Requested to stop");
+        }
+        progressCallback.nudge(loc);
+    }
+}
diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/VxmlQueue.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/VxmlQueue.java
new file mode 100644
index 00000000000..d0bf7f56715
--- /dev/null
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/VxmlQueue.java
@@ -0,0 +1,305 @@
+package org.unicode.cldr.web;
+
+import java.io.IOException;
+import java.io.StringWriter;
+import java.time.LocalTime;
+import java.util.*;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.Semaphore;
+import java.util.logging.Logger;
+import org.unicode.cldr.util.*;
+
+public class VxmlQueue {
+    private static final Logger logger = SurveyLog.forClass(VxmlQueue.class);
+
+    private static final String WAITING_IN_LINE_MESSAGE = "Waiting in line";
+
+    private static final class VxmlQueueHelper {
+        static VxmlQueue instance = new VxmlQueue();
+    }
+
+    /**
+     * Get the singleton instance of the queue
+     *
+     * @return the singleton instance
+     */
+    public static VxmlQueue getInstance() {
+        return VxmlQueueHelper.instance;
+    }
+
+    /** A unique key for storing QueueEntry objects in QueueMemberId objects */
+    private static final String KEY = VxmlQueue.class.getName();
+
+    /** Status of a Task */
+    public enum Status {
+        /** Waiting on other users/tasks */
+        WAITING,
+        /** Processing in progress */
+        PROCESSING,
+        /** Contents are available */
+        READY,
+        /** Stopped, due to error or cancellation (LoadingPolicy.STOP) */
+        STOPPED,
+    }
+
+    /** What policy should be used when querying the queue? */
+    public enum LoadingPolicy {
+        /** Start a new VXML generation task */
+        START,
+        /** Continue the task already in progress and get its status */
+        CONTINUE,
+        /** Stop (cancel) the task in progress. */
+        STOP
+    }
+
+    private static class QueueEntry {
+        public VxmlGenerator.VerificationStatus verificationStatus =
+                VxmlGenerator.VerificationStatus.INCOMPLETE;
+        private Task currentTask = null;
+        private Boolean done = false;
+    }
+
+    /** Semaphore to ensure that only one vetter generates VXML at a time. */
+    private static final Semaphore OnlyOneVetter = new Semaphore(1);
+
+    public static class Task implements Runnable {
+
+        /**
+         * Construct a Runnable object specifically for VXML
+         *
+         * @param entry the QueueEntry
+         */
+        private Task(QueueEntry entry) {
+            this.entry = entry;
+        }
+
+        public final class VxmlProgressCallback extends VxmlGenerator.ProgressCallback {
+            private final Thread thread;
+
+            private VxmlProgressCallback(Thread thread) {
+                this.thread = thread;
+            }
+
+            public void nudge(CLDRLocale loc) {
+                if (!myThread.isAlive()) {
+                    throw new RuntimeException("The thread is not running. Stop now.");
+                }
+                setStatus(loc.getDisplayName());
+                n++;
+            }
+
+            public boolean isStopped() {
+                // if the calling thread is gone, stop processing
+                return stop || !(thread.isAlive());
+            }
+        }
+
+        private Thread myThread = null;
+        private boolean stop = false;
+        private final QueueEntry entry;
+        private int maxn;
+        private int n = 0;
+        private String status = WAITING_IN_LINE_MESSAGE;
+        private Status statusCode = Status.WAITING;
+
+        private void setStatus(String status) {
+            this.status = status;
+        }
+
+        private final StringWriter output = new StringWriter();
+
+        @Override
+        public void run() {
+            statusCode = Status.WAITING;
+            try {
+                status = "Waiting...";
+                OnlyOneVetter.acquire();
+                try {
+                    if (stop) {
+                        doStop();
+                        return;
+                    }
+                    processCriticalWork();
+                    if (stop) {
+                        doStop();
+                        return;
+                    }
+                } finally {
+                    OnlyOneVetter.release();
+                }
+                status = "Finished.";
+                statusCode = Status.READY;
+            } catch (RuntimeException | InterruptedException | ExecutionException re) {
+                SurveyLog.logException(logger, re, "While generating VXML, " + taskDescription());
+                status = "Exception! " + re + ", " + taskDescription();
+                statusCode = Status.STOPPED;
+            }
+        }
+
+        private void doStop() {
+            status = "Stopped on request.";
+            statusCode = Status.STOPPED;
+        }
+
+        private String taskDescription() {
+            return "thread " + myThread.getId() + ", " + LocalTime.now();
+        }
+
+        private void processCriticalWork() throws ExecutionException {
+            status = "Beginning";
+            Set<CLDRLocale> sortSet = OutputFileManager.createVxmlLocaleSet();
+            maxn = sortSet.size();
+            statusCode = Status.PROCESSING;
+            n = 0;
+            VxmlGenerator vg = new VxmlGenerator();
+            vg.setProgressCallback(new VxmlProgressCallback(Thread.currentThread()));
+            vg.generate(sortSet, output);
+            entry.verificationStatus = vg.getVerificationStatus();
+            entry.done = true;
+        }
+
+        private int getPercent() {
+            if (n <= 0 || maxn <= 0) {
+                return 0;
+            } else if (n >= maxn) {
+                return 100;
+            } else {
+                int p = (n * 100) / maxn;
+                return (p > 0) ? p : 1;
+            }
+        }
+    }
+
+    /** Arguments for getOutput */
+    public static class Args {
+        private final QueueMemberId qmi;
+        private final LoadingPolicy loadingPolicy;
+
+        public Args(QueueMemberId qmi, LoadingPolicy loadingPolicy) {
+            this.qmi = qmi;
+            this.loadingPolicy = loadingPolicy;
+        }
+    }
+
+    /**
+     * Results for getOutput
+     *
+     * <p>These fields get filled in by getOutput, and referenced by the caller after getOutput
+     * returns
+     */
+    public static class Results {
+        public Status status = Status.WAITING;
+        public Appendable output = new StringBuilder();
+    }
+
+    /*
+     * Messages returned by getOutput
+     */
+    private static final String VXML_MESSAGE_STOPPED_ON_REQUEST = "Stopped on request";
+    private static final String VXML_MESSAGE_PROGRESS = "In Progress";
+    private static final String VXML_MESSAGE_STOPPED_STUCK = "Stopped (refresh if stuck)";
+    private static final String VXML_MESSAGE_NOT_LOADING = "Not loading. Click the button to load.";
+    private static final String VXML_MESSAGE_STARTED = "Started new task";
+
+    /**
+     * Start running, or continue running, the long-running task that generates VXML. This is called
+     * once for each request, including the initial request that starts VXML generation, and
+     * subsequent requests that query the status or trigger early termination of the task.
+     *
+     * @param args the VxmlQueue.Args
+     * @param results the VxmlQueue.Results
+     * @return the status message
+     * @throws IOException if thrown by results.output.append
+     */
+    public synchronized String getOutput(Args args, Results results) throws IOException {
+        QueueEntry entry = getEntry(args.qmi);
+        Task t = entry.currentTask;
+        if (t == null) {
+            logger.info("Got null Task in getOutput");
+        } else {
+            results.output.append(t.output.toString());
+        }
+        if (args.loadingPolicy == LoadingPolicy.STOP) {
+            stop(entry);
+            results.status = Status.STOPPED;
+            return VXML_MESSAGE_STOPPED_ON_REQUEST;
+        } else if (entry.done) {
+            setPercent(100);
+            results.status = Status.READY;
+            stop(entry);
+            return entry.verificationStatus.toString();
+        }
+        if (t != null) {
+            String waiting = waitingString();
+            results.status = Status.PROCESSING;
+            if (t.myThread.isAlive()) {
+                results.status = t.statusCode;
+                if (results.status != Status.WAITING) {
+                    waiting = "";
+                }
+                setPercent(t.getPercent());
+                return VXML_MESSAGE_PROGRESS + ": " + waiting + t.status;
+            } else {
+                setPercent(0);
+                return VXML_MESSAGE_STOPPED_STUCK + " " + t.status;
+            }
+        }
+        if (args.loadingPolicy == LoadingPolicy.CONTINUE) {
+            results.status = Status.STOPPED;
+            setPercent(0);
+            return VXML_MESSAGE_NOT_LOADING;
+        }
+
+        // Note: similar code in VettingViewerQueue.getPriorityItemsSummaryOutput includes
+        // a comment suggesting an alternative: SurveyThreadManager.getExecutorService().invoke()
+        t = entry.currentTask = new Task(entry);
+        t.myThread = SurveyThreadManager.getThreadFactory().newThread(t);
+        t.myThread.start();
+
+        results.status = Status.PROCESSING;
+        setPercent(0);
+        final String waitStr = waitingString();
+        if (WAITING_IN_LINE_MESSAGE.equals(t.status) && waitStr.isEmpty()) {
+            // Simplify “Started new task: Waiting in line” to "Waiting in line"
+            return WAITING_IN_LINE_MESSAGE;
+        }
+        return VXML_MESSAGE_STARTED + ": " + waitStr + t.status;
+    }
+
+    private String waitingString() {
+        int aheadOfMe = OnlyOneVetter.getQueueLength();
+        return (aheadOfMe > 0) ? (aheadOfMe + " users waiting - ") : "";
+    }
+
+    private void stop(QueueEntry entry) {
+        Task t = entry.currentTask;
+        if (t != null) {
+            if (t.myThread.isAlive() && !t.stop) {
+                t.stop = true;
+                t.myThread.interrupt();
+            }
+            entry.currentTask = null;
+            entry.done = true;
+        }
+    }
+
+    private QueueEntry getEntry(QueueMemberId qmi) {
+        QueueEntry entry = (QueueEntry) qmi.get(KEY);
+        if (entry == null) {
+            entry = new QueueEntry();
+            qmi.put(KEY, entry);
+        }
+        return entry;
+    }
+
+    /** Estimated percentage complete for VXML generation */
+    private int percent = 0;
+
+    private void setPercent(int p) {
+        percent = p;
+    }
+
+    public int getPercent() {
+        return percent;
+    }
+}
diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/XPathTable.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/XPathTable.java
index 5bf26a477d4..b32f6ee842f 100644
--- a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/XPathTable.java
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/XPathTable.java
@@ -200,7 +200,7 @@ public synchronized void loadXPaths(XMLSource source) {
         Connection conn = null;
         PreparedStatement queryStmt = null;
         try {
-            conn = DBUtils.getInstance().getDBConnection();
+            conn = DBUtils.getInstance().getAConnection();
             if (!DEBUG) {
                 addXpaths(unloadedXpaths, conn);
             } else {
@@ -226,7 +226,7 @@ public synchronized void loadXPaths(XMLSource source) {
      * Add a set of xpaths to the database.
      *
      * @param xpaths
-     * @param conn
+     * @param conn the connection (auto-commit)
      * @throws SQLException
      */
     private synchronized void addXpaths(Set<String> xpaths, Connection conn) throws SQLException {
@@ -244,7 +244,6 @@ private synchronized void addXpaths(Set<String> xpaths, Connection conn) throws
             stat_dbAdd++;
         }
         insertStmt.executeBatch();
-        conn.commit();
         insertStmt.close();
 
         // PreparedStatement.getGeneratedKeys() only returns the ID of the
diff --git a/tools/cldr-apps/src/main/java/org/unicode/cldr/web/api/GenerateVxml.java b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/api/GenerateVxml.java
new file mode 100644
index 00000000000..72a48ce6c29
--- /dev/null
+++ b/tools/cldr-apps/src/main/java/org/unicode/cldr/web/api/GenerateVxml.java
@@ -0,0 +1,111 @@
+package org.unicode.cldr.web.api;
+
+import java.io.IOException;
+import javax.enterprise.context.ApplicationScoped;
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+import org.eclipse.microprofile.openapi.annotations.Operation;
+import org.eclipse.microprofile.openapi.annotations.media.Content;
+import org.eclipse.microprofile.openapi.annotations.media.Schema;
+import org.eclipse.microprofile.openapi.annotations.responses.APIResponse;
+import org.eclipse.microprofile.openapi.annotations.responses.APIResponses;
+import org.eclipse.microprofile.openapi.annotations.tags.Tag;
+import org.unicode.cldr.web.*;
+
+@ApplicationScoped
+@Path("/vxml")
+@Tag(name = "Generate VXML", description = "APIs for Survey Tool VXML (Vetted XML) generation")
+public class GenerateVxml {
+    @POST
+    @Produces(MediaType.APPLICATION_JSON)
+    @Operation(summary = "Generate VXML", description = "Generate VXML")
+    @APIResponses(
+            value = {
+                @APIResponse(
+                        responseCode = "200",
+                        description = "Generate VXML",
+                        content =
+                                @Content(
+                                        mediaType = "application/json",
+                                        schema = @Schema(implementation = VxmlResponse.class))),
+                @APIResponse(responseCode = "403", description = "Forbidden"),
+                @APIResponse(
+                        responseCode = "500",
+                        description = "Internal Server Error",
+                        content =
+                                @Content(
+                                        mediaType = "application/json",
+                                        schema = @Schema(implementation = STError.class))),
+                @APIResponse(responseCode = "503", description = "Not ready yet"),
+            })
+    public Response generateVxml(
+            VxmlRequest request, @HeaderParam(Auth.SESSION_HEADER) String sessionString) {
+        try {
+            CookieSession cs = Auth.getSession(sessionString);
+            if (cs == null) {
+                return Auth.noSessionResponse();
+            }
+            if (!UserRegistry.userIsAdmin(cs.user)) {
+                return Response.status(Response.Status.FORBIDDEN).build();
+            }
+            if (SurveyMain.isBusted()
+                    || !SurveyMain.wasInitCalled()
+                    || !SurveyMain.triedToStartUp()) {
+                return STError.surveyNotQuiteReady();
+            }
+            // Make sure setupDB has run before we start to generate VXML, to avoid the risk of
+            // concurrency problems, since otherwise if the server just started, setupDB may run
+            // concurrently with the vxml worker thread.
+            CookieSession.sm.getSTFactory().setupDB();
+            cs.userDidAction();
+            VxmlResponse vr = getVxmlResponse(request.loadingPolicy, cs);
+            return Response.ok(vr).build();
+        } catch (Exception e) {
+            return Response.status(Response.Status.INTERNAL_SERVER_ERROR).build();
+        }
+    }
+
+    /**
+     * Get the response for VXML
+     *
+     * @param loadingPolicy the LoadingPolicy
+     * @param cs the CookieSession
+     * @return the VxmlResponse
+     * @throws IOException if thrown by VxmlQueue.getOutput
+     */
+    private VxmlResponse getVxmlResponse(VxmlQueue.LoadingPolicy loadingPolicy, CookieSession cs)
+            throws IOException {
+        VxmlQueue queue = VxmlQueue.getInstance();
+        QueueMemberId qmi = new QueueMemberId(cs);
+        VxmlResponse response = new VxmlResponse();
+        VxmlQueue.Args args = new VxmlQueue.Args(qmi, loadingPolicy);
+        VxmlQueue.Results results = new VxmlQueue.Results();
+        response.message = queue.getOutput(args, results);
+        response.percent = queue.getPercent();
+        response.status = results.status;
+        response.output = results.output.toString();
+        return response;
+    }
+
+    @Schema(description = "VXML Request")
+    public static final class VxmlRequest {
+        @Schema(implementation = VxmlQueue.LoadingPolicy.class)
+        public VxmlQueue.LoadingPolicy loadingPolicy;
+    }
+
+    @Schema(description = "VXML Response")
+    public static final class VxmlResponse {
+        @Schema(description = "VXML Response status enum")
+        public VxmlQueue.Status status;
+
+        @Schema(description = "Current status message")
+        public String message = "";
+
+        @Schema(description = "Estimated percentage complete")
+        public Number percent;
+
+        @Schema(description = "Output on success")
+        public String output;
+    }
+}