Update to tomcat10

Signed-off-by: Marko Lindqvist <[email protected]>

Author: cazfi

README.md

@@ -38,7 +38,7 @@ Freeciv-Web consists of these components:
   This application is a Java web application which make up the application
   viewed in each user's web browser. The Metaserver is also a part of this module.
   Implemented in Javascript, Java, JSP, HTML and CSS. Built with maven and runs 
-  on Tomcat 9 and nginx.
+  on Tomcat 10 and nginx.
 
 * [Freeciv](freeciv) - the Freeciv C server, which is checked out from the official
   Git repository, and patched to work with a WebSocket/JSON protocol. Implemented in C.
@@ -126,7 +126,7 @@ and 3 Gb of harddisk space.
 
 Install this software if you are not running Freeciv-web with Vagrant:
 
-- Tomcat 9 - https://tomcat.apache.org/
+- Tomcat 10 - https://tomcat.apache.org/
 
 - Java 11 JDK - https://adoptopenjdk.net/ 
 

config/pbem.tmpl

@@ -10,7 +10,7 @@ mysql_user = #DB_USER#
 mysql_database = #DB_NAME#
 mysql_password = #DB_PASSWORD#
 
-savegame_directory = /var/lib/tomcat9/webapps/data/savegames/pbem/
-ranklog_directory = /var/lib/tomcat9/webapps/data/ranklogs/
+savegame_directory = /var/lib/tomcat10/webapps/data/savegames/pbem/
+ranklog_directory = /var/lib/tomcat10/webapps/data/ranklogs/
 
 host = #FCW_HOST#

config/web.properties.tmpl

@@ -1,7 +1,7 @@
 # LOCATION:freeciv-web/src/main/webapp/WEB-INF/config.properties
 captcha_secret=#CAPTCHA_SECRET#
 captcha_public=#CAPTCHA_PUBLIC#
-savegame_dir=/var/lib/tomcat9/webapps/data/savegames/
+savegame_dir=/var/lib/tomcat10/webapps/data/savegames/
 email_username=#SMTP_LOGIN#
 email_password=#SMTP_PASSWORD#
 email_host=#SMTP_HOST#

docker-compose.yml

@@ -7,7 +7,7 @@ services:
     container_name: freeciv-web
     command: ["sleep", "infinity"]
     volumes:
-      - "data:/var/lib/tomcat9/webapps/data"
+      - "data:/var/lib/tomcat10/webapps/data"
     ports:
       - "8080:80"
       - "4002:4002"

freeciv-web/build-js.sh

@@ -1,7 +1,7 @@
 #!/bin/bash
 # builds javascript files Freeciv-web and copies the resulting file to tomcat.
 
-FCW_DEST=/var/lib/tomcat9/webapps/freeciv-web
+FCW_DEST=/var/lib/tomcat10/webapps/freeciv-web
 
 mvn compile && \
 echo "Copying target/freeciv-web/javascript/webclient.* to ${FCW_DEST}/javascript" && \

freeciv-web/build.sh

@@ -12,7 +12,7 @@ done
 
 DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" >/dev/null && pwd)"
 
-TOMCATDIR="/var/lib/tomcat9"
+TOMCATDIR="/var/lib/tomcat10"
 WEBAPP_DIR="${DIR}/target/freeciv-web"
 
 # Creating build.txt info file

freeciv-web/pom.xml

@@ -84,7 +84,7 @@
 		<dependency>
 			<groupId>org.glassfish.web</groupId>
 			<artifactId>jakarta.servlet.jsp.jstl</artifactId>
-			<version>1.2.6</version>
+			<version>2.0.0</version>
 		</dependency>
 
 		<!-- verify oauth tokens -->

freeciv-web/src/main/java/org/freeciv/servlet/CivclientLauncher.java

@@ -18,8 +18,8 @@
 package org.freeciv.servlet;
 
 import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
 
 import java.sql.*;
 

freeciv-web/src/main/java/org/freeciv/servlet/DeactivateUser.java

@@ -20,8 +20,8 @@
 import org.apache.commons.codec.digest.Crypt;
 
 import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
 
 import java.sql.*;
 

freeciv-web/src/main/java/org/freeciv/servlet/DeleteSaveGame.java

@@ -28,8 +28,8 @@
 import java.util.Properties;
 import javax.naming.Context;
 import javax.naming.InitialContext;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
 import javax.sql.DataSource;
 
 import org.freeciv.services.Validation;

freeciv-web/src/main/java/org/freeciv/servlet/FreecivStatsServlet.java

@@ -26,10 +26,10 @@
 
 import javax.naming.Context;
 import javax.naming.InitialContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import javax.sql.DataSource;
 
 import org.freeciv.util.Constants;

freeciv-web/src/main/java/org/freeciv/servlet/GameDetails.java

@@ -27,12 +27,12 @@
 
 import javax.naming.Context;
 import javax.naming.InitialContext;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.MultipartConfig;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.MultipartConfig;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import javax.sql.DataSource;
 
 import org.freeciv.util.Constants;

freeciv-web/src/main/java/org/freeciv/servlet/GameList.java

@@ -19,12 +19,12 @@
 
 import java.io.IOException;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.MultipartConfig;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.MultipartConfig;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.freeciv.services.Games;
 import org.freeciv.services.Statistics;

freeciv-web/src/main/java/org/freeciv/servlet/GamePlayByEmailTop.java

@@ -28,10 +28,10 @@
 
 import javax.naming.Context;
 import javax.naming.InitialContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import javax.sql.DataSource;
 
 import org.freeciv.util.Constants;

freeciv-web/src/main/java/org/freeciv/servlet/GameStatistics.java

@@ -28,10 +28,10 @@
 
 import javax.naming.Context;
 import javax.naming.InitialContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import javax.sql.DataSource;
 
 import org.freeciv.util.Constants;

freeciv-web/src/main/java/org/freeciv/servlet/GameStatisticsDetails.java

@@ -21,11 +21,11 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.freeciv.services.Statistics;
 import org.json.JSONArray;

freeciv-web/src/main/java/org/freeciv/servlet/HallOfFameList.java

@@ -21,11 +21,11 @@
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.freeciv.services.Statistics;
 import org.json.JSONArray;

freeciv-web/src/main/java/org/freeciv/servlet/HallOfFamePost.java

@@ -3,10 +3,10 @@
 import org.apache.commons.io.FileUtils;
 import javax.naming.Context;
 import javax.naming.InitialContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import javax.sql.DataSource;
 import java.io.File;
 import java.io.IOException;
@@ -32,10 +32,10 @@ public class HallOfFamePost extends HttpServlet {
     private String PATTERN_VALIDATE_ALPHA_NUMERIC = "[0-9a-zA-Z \\.]*";
 
     private Pattern p = Pattern.compile(PATTERN_VALIDATE_ALPHA_NUMERIC);
-    
-    private static final String mapSrcImgPaths = "/var/lib/tomcat9/webapps/data/savegames/";
-    
-    private static final String mapDstImgPaths = "/var/lib/tomcat9/webapps/data/mapimgs/";
+
+    private static final String mapSrcImgPaths = "/var/lib/tomcat10/webapps/data/savegames/";
+
+    private static final String mapDstImgPaths = "/var/lib/tomcat10/webapps/data/mapimgs/";
 
     public void doPost(HttpServletRequest request, HttpServletResponse response)
             throws IOException, ServletException {

freeciv-web/src/main/java/org/freeciv/servlet/Index.java

@@ -19,11 +19,11 @@
 
 import java.io.IOException;
 
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 
 import org.freeciv.services.Games;
 

freeciv-web/src/main/java/org/freeciv/servlet/ListSaveGames.java

@@ -21,8 +21,8 @@
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Properties;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
 
 import org.freeciv.services.Validation;
 

freeciv-web/src/main/java/org/freeciv/servlet/LoginUser.java

@@ -18,8 +18,8 @@
 package org.freeciv.servlet;
 
 import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
 
 import java.sql.*;
 import javax.sql.*;

freeciv-web/src/main/java/org/freeciv/servlet/Metaserver.java

@@ -30,11 +30,11 @@
 
 import javax.naming.Context;
 import javax.naming.InitialContext;
-import javax.servlet.ServletException;
-import javax.servlet.annotation.MultipartConfig;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.annotation.MultipartConfig;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import javax.sql.DataSource;
 
 import org.freeciv.util.Constants;

freeciv-web/src/main/java/org/freeciv/servlet/NewPBEMUser.java

@@ -21,8 +21,8 @@
 import java.util.List;
 
 import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
 
 import java.sql.*;
 import java.util.Properties;

freeciv-web/src/main/java/org/freeciv/servlet/RandomUser.java

@@ -18,8 +18,8 @@
 package org.freeciv.servlet;
 
 import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
 
 import java.sql.*;
 

freeciv-web/src/main/java/org/freeciv/servlet/RecentServerStatistics.java

@@ -25,10 +25,10 @@
 
 import javax.naming.Context;
 import javax.naming.InitialContext;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServlet;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
 import javax.sql.DataSource;
 
 import org.freeciv.util.Constants;

freeciv-web/src/main/java/org/freeciv/servlet/ResetPassword.java

@@ -19,11 +19,11 @@
 
 import javax.naming.Context;
 import javax.naming.InitialContext;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+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.sql.DataSource;
 import java.io.IOException;
 import java.io.InputStream;

freeciv-web/src/main/java/org/freeciv/servlet/TokenSignin.java

@@ -19,8 +19,8 @@
 
 import java.io.IOException;
 import java.util.Collections;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
 
 import com.google.api.client.googleapis.auth.oauth2.GoogleIdToken;
 import com.google.api.client.googleapis.auth.oauth2.GoogleIdToken.Payload;

freeciv-web/src/main/java/org/freeciv/servlet/UserCount.java

@@ -18,8 +18,8 @@
 package org.freeciv.servlet;
 
 import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
 
 import java.sql.*;
 

freeciv-web/src/main/java/org/freeciv/servlet/ValidateUser.java

@@ -18,8 +18,8 @@
 package org.freeciv.servlet;
 
 import java.io.*;
-import javax.servlet.*;
-import javax.servlet.http.*;
+import jakarta.servlet.*;
+import jakarta.servlet.http.*;
 
 import java.sql.*;