Rolling back dispatch and sync code.

This resets the dispatcher and sync code to the point before we began upgrading Tomcat etc., so that we can deploy fixes to production while continuing workk on development. From this point the development and master branches are incompatible.
papyri · Feb 3, 2025 · 04ff310 · 04ff310
1 parent dfd2a5a
commit 04ff310
Show file tree

Hide file tree

Showing 35 changed files with 297 additions and 258 deletions.
diff --git a/pn-dispatcher/pom.xml b/pn-dispatcher/pom.xml
@@ -5,7 +5,7 @@
   <groupId>info.papyri</groupId>
   <artifactId>pn-dispatcher</artifactId>
   <packaging>war</packaging>
-  <version>1.1.24</version>
+  <version>1.1.21</version>
   <name>pn-dispatcher</name>
   <url>https://maven.apache.org</url>
   <pluginRepositories>
@@ -42,16 +42,16 @@
   </repositories>
   <distributionManagement>
     <repository>
-     <id>gitlab-maven</id>
-     <name>GitLab Apache Maven Packages</name>
-     <url>${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/packages/maven</url>
+     <id>github</id>
+     <name>GitHub papyri Apache Maven Packages</name>
+     <url>https://maven.pkg.github.com/papyri/navigator</url>
     </repository>
   </distributionManagement>
   <dependencies>
     <dependency>
       <groupId>org.apache.tomcat</groupId>
       <artifactId>tomcat-servlet-api</artifactId>
-      <version>10.1.6</version>
+      <version>9.0.52</version>
       <scope>provided</scope>
     </dependency>
     <dependency>
@@ -62,23 +62,28 @@
     <dependency>
       <groupId>com.github.jsonld-java</groupId>
       <artifactId>jsonld-java</artifactId>
-      <version>0.13.6</version>
+      <version>0.10.0</version>
       <type>jar</type>
     </dependency>
+    <dependency>
+      <groupId>commons-httpclient</groupId>  
+      <artifactId>commons-httpclient</artifactId>
+      <version>3.1</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.solr</groupId>
       <artifactId>solr-solrj</artifactId>
-      <version>9.6.1</version>
+      <version>8.11.0</version>
     </dependency>
     <dependency>
       <groupId>org.apache.solr</groupId>
       <artifactId>solr-core</artifactId>
-      <version>9.6.1</version>
+      <version>8.11.1</version>
     </dependency>
     <dependency>
       <groupId>edu.unc.epidoc</groupId>
       <artifactId>transcoder</artifactId>
-      <version>1.2-SNAPSHOT</version>
+      <version>1.2</version>
     </dependency>
     <dependency>
       <groupId>org.antlr</groupId>
@@ -98,7 +103,7 @@
     <dependency>
       <groupId>org.eclipse.jgit</groupId>
       <artifactId>org.eclipse.jgit</artifactId>
-      <version>6.9.0.202403050737-r</version>
+      <version>4.6.0.201612231935-r</version>
     </dependency>
     <!-- Test Dependencies -->
     <dependency>
@@ -113,9 +118,10 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
-        <version>3.11.0</version>
+        <version>3.8.1</version>
         <configuration>
-          <release>17</release>
+          <source>11</source>
+          <target>11</target>
           <encoding>${project.build.sourceEncoding}</encoding>
           <compilerArgs>
             <arg>-Xlint:unchecked</arg>
@@ -133,7 +139,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
-        <version>3.3.1</version>
+        <version>3.1.0</version>
         <configuration>
           <encoding>${project.build.sourceEncoding}</encoding>
         </configuration>
@@ -176,19 +182,19 @@
             <artifactId>maven-compiler-plugin</artifactId>
             <version>3.8.1</version>
           </plugin>
-          <plugin>
-            <groupId>org.apache.maven.plugins</groupId>
-            <artifactId>maven-failsafe-plugin</artifactId>
-            <version>3.5.2</version>
-            <executions>
-              <execution>
-                <goals>
-                  <goal>integration-test</goal>
-                  <goal>verify</goal>
-                </goals>
-              </execution>
-            </executions>
-          </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-failsafe-plugin</artifactId>
+        <version>3.0.0-M5</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>integration-test</goal>
+              <goal>verify</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
         </plugins>
       </build>
     </profile>

diff --git a/pn-dispatcher/src/main/java/info/papyri/dispatch/AuthorBrowse.java b/pn-dispatcher/src/main/java/info/papyri/dispatch/AuthorBrowse.java
@@ -9,16 +9,16 @@
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.SolrRequest;
 import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.impl.Http2SolrClient;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
 import org.apache.solr.client.solrj.response.FacetField.Count;
 import org.apache.solr.client.solrj.response.QueryResponse;
 
-import jakarta.servlet.ServletConfig;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.annotation.WebServlet;
-import jakarta.servlet.http.HttpServlet;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.*;
 import java.net.URLEncoder;
 import java.util.ArrayList;
@@ -27,7 +27,6 @@
 import java.util.List;
 import java.util.logging.Logger;
 import java.util.logging.Level;
-import java.util.concurrent.TimeUnit;
 
 
 /**
@@ -68,7 +67,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
       //selecting one is a search on author_str:"<selected author>" gets back author_work facets
       //filter those for the current author and display, selecting one gives you
     response.setContentType("text/html;charset=UTF-8");
-    SolrClient solr = new Http2SolrClient.Builder(solrUrl).withConnectionTimeout(5, TimeUnit.SECONDS).build();
+    SolrClient solr = new HttpSolrClient.Builder(solrUrl).withConnectionTimeout(5000).build();
     SolrQuery sq = new SolrQuery();
     sq.add("q", "*:*");
     sq.addFacetField("author_work");
@@ -95,7 +94,13 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
           boolean closeInitial = false;
           boolean closeAuthor = false;
           boolean worksOpen = false;
-          Collections.sort(authors, (Comparator<Count>) (o1, o2) -> ((Count)o1).getName().trim().compareTo(((Count)o2).getName().trim()));
+          Collections.sort(authors, new Comparator() {
+              @Override
+              public int compare(Object o1, Object o2) {
+                  return ((Count)o1).getName().trim().compareTo(((Count)o2).getName().trim());
+              }
+
+          });
           for (Count author : authors) {
               String name = author.getName();
 

diff --git a/pn-dispatcher/src/main/java/info/papyri/dispatch/BiblioSearch.java b/pn-dispatcher/src/main/java/info/papyri/dispatch/BiblioSearch.java
@@ -6,22 +6,21 @@
 
 import java.io.IOException;
 import java.io.PrintWriter;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServlet;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 import java.io.BufferedReader;
 import java.io.InputStreamReader;
 import java.net.URL;
 import java.net.URLEncoder;
 import java.net.MalformedURLException;
-import java.util.concurrent.TimeUnit;
-import jakarta.servlet.ServletConfig;
+import javax.servlet.ServletConfig;
 
 import org.apache.solr.client.solrj.SolrClient;
 import org.apache.solr.client.solrj.SolrServerException;
-import org.apache.solr.client.solrj.impl.Http2SolrClient;
+import org.apache.solr.client.solrj.impl.HttpSolrClient;
 import org.apache.solr.client.solrj.SolrQuery;
 import org.apache.solr.client.solrj.response.QueryResponse;
 import org.apache.solr.client.solrj.request.QueryRequest;
@@ -79,8 +78,8 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
       String line = "";
       while ((line = reader.readLine()) != null) {
         if (line.contains("<!-- Results -->") && !("".equals(q) || q == null)) {
-          SolrClient solr = new Http2SolrClient.Builder(solrUrl + BiblioSearch)
-                  .withConnectionTimeout(5, TimeUnit.SECONDS)
+          SolrClient solr = new HttpSolrClient.Builder(solrUrl + BiblioSearch)
+                  .withConnectionTimeout(5000)
                   .build();
           int rows = 30;
           try {

diff --git a/pn-dispatcher/src/main/java/info/papyri/dispatch/CTSServlet.java b/pn-dispatcher/src/main/java/info/papyri/dispatch/CTSServlet.java
@@ -13,18 +13,18 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
-import jakarta.servlet.ServletConfig;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServlet;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import javax.xml.parsers.SAXParserFactory;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import org.xml.sax.Attributes;
 import org.xml.sax.ContentHandler;
 import org.xml.sax.InputSource;
 import org.xml.sax.Locator;
 import org.xml.sax.SAXException;
 import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.XMLReaderFactory;
 
 /**
  *
@@ -75,7 +75,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
         writeStart(out, req, inv, cts);
         CTSReffContentHandler handler = new CTSReffContentHandler();
         handler.setup(out, cts);
-        XMLReader reader = SAXParserFactory.newInstance().newSAXParser().getXMLReader();
+        XMLReader reader = XMLReaderFactory.createXMLReader();
         reader.setContentHandler(handler);
         reader.setFeature("http://xml.org/sax/features/namespace-prefixes", true);
         reader.setFeature("http://xml.org/sax/features/validation", false);
@@ -102,7 +102,7 @@ protected void processRequest(HttpServletRequest request, HttpServletResponse re
         handler.parseReference(location);
         try {
           writeStart(out, req, inv, new CTSUrn(cts));
-          XMLReader reader = SAXParserFactory.newInstance().newSAXParser().getXMLReader();
+          XMLReader reader = XMLReaderFactory.createXMLReader();
           reader.setContentHandler(handler);
           reader.setFeature("http://xml.org/sax/features/namespace-prefixes", true);
           reader.setFeature("http://xml.org/sax/features/validation", false);

diff --git a/pn-dispatcher/src/main/java/info/papyri/dispatch/DispatcherServlet.java b/pn-dispatcher/src/main/java/info/papyri/dispatch/DispatcherServlet.java
@@ -10,12 +10,12 @@
 import java.net.SocketTimeoutException;
 import java.util.HashMap;
 import java.util.Map;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.annotation.WebServlet;
-import jakarta.servlet.ServletConfig;
-import jakarta.servlet.http.HttpServlet;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.ServletConfig;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 

diff --git a/pn-dispatcher/src/main/java/info/papyri/dispatch/FileUtils.java b/pn-dispatcher/src/main/java/info/papyri/dispatch/FileUtils.java
@@ -471,6 +471,7 @@ public int[] mapText(String text) {
           next = 10;
         }
         String foo = text.substring(i+1, i + next);
+        boolean bar = foo.matches("^\\d(\\w|,|/)*\\.\\s{2}.*");
         if (i < text.length() - 1 && text.substring(i+1, i + next).matches("^\\d(\\w|,|/)*\\.\\s{2}.*")) {
           while (text.charAt(i) != '.') {
             i++;
@@ -641,13 +642,13 @@ private List<String> getNMatches(String text, int n) {
           hitline = line + " | " + lines[i + 1];
         }
       }
-      if (hitline.length() > 150) {
-        start = hitline.indexOf(hlStart) - 30;
+      if (hitline.length() > 60) {
+        start = hitline.indexOf(hlStart) - 10;
         if (start >= 0) {
           hitline = hitline.substring(start);
           hitline = '…' + hitline.substring(hitline.indexOf(" ") + 1);
         }
-        int end = hitline.lastIndexOf(' ', hitline.lastIndexOf(hlEnd) + 30);
+        int end = hitline.lastIndexOf(' ', hitline.lastIndexOf(hlEnd) + 12);
         if (end < hitline.length()) {
           hitline = hitline.substring(0, end);
         }

diff --git a/pn-dispatcher/src/main/java/info/papyri/dispatch/GitAPI.java b/pn-dispatcher/src/main/java/info/papyri/dispatch/GitAPI.java
@@ -5,13 +5,14 @@
 package info.papyri.dispatch;
 
 import java.io.PrintWriter;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.annotation.WebServlet;
-import jakarta.servlet.http.HttpServlet;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import jakarta.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
 import java.io.IOException;
+import javax.servlet.ServletConfig;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 import org.eclipse.jgit.internal.storage.file.FileRepository;

diff --git a/pn-dispatcher/src/main/java/info/papyri/dispatch/ImageMetadata.java b/pn-dispatcher/src/main/java/info/papyri/dispatch/ImageMetadata.java
@@ -4,10 +4,10 @@
 import java.io.InputStream;
 import java.io.OutputStream;
 import java.net.URL;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServlet;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  *

diff --git a/pn-dispatcher/src/main/java/info/papyri/dispatch/MDReader.java b/pn-dispatcher/src/main/java/info/papyri/dispatch/MDReader.java
@@ -16,12 +16,13 @@
 import java.io.FileReader;
 import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
-import jakarta.servlet.ServletConfig;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.annotation.WebServlet;
-import jakarta.servlet.http.HttpServlet;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import java.nio.charset.Charset;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.nio.charset.StandardCharsets;
 import java.util.Collections;
 import java.util.logging.Level;

diff --git a/pn-dispatcher/src/main/java/info/papyri/dispatch/Reader.java b/pn-dispatcher/src/main/java/info/papyri/dispatch/Reader.java
@@ -3,12 +3,12 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
-import jakarta.servlet.ServletConfig;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.annotation.WebServlet;
-import jakarta.servlet.http.HttpServlet;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 import java.io.File;
 import java.io.IOException;
 import java.io.PrintWriter;

diff --git a/pn-dispatcher/src/main/java/info/papyri/dispatch/ServletUtils.java b/pn-dispatcher/src/main/java/info/papyri/dispatch/ServletUtils.java
@@ -8,9 +8,9 @@
 import java.io.FileInputStream;
 import java.io.IOException;
 import java.io.OutputStream;
-import jakarta.servlet.ServletContext;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServletResponse;
+import javax.servlet.ServletContext;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletResponse;
 
 /**
  *