summaryrefslogtreecommitdiffstats
path: root/org/madore/damlengine
diff options
context:
space:
mode:
authorDavid A. Madore <david+git@madore.org>2026-11-18 20:10:02 +0100
committerDavid A. Madore <david+git@madore.org>2026-11-18 20:10:02 +0100
commitb670e591ccb5caf56afb5dd1b27dfdafccfbf082 (patch)
treee0354813c7b12f2ea16d48fa2a6db6afdaa8c2eb /org/madore/damlengine
parent81e1c864c1deba9d408461ee33a6b9307c536671 (diff)
downloaddamlengine-b670e591ccb5caf56afb5dd1b27dfdafccfbf082.tar.gz
damlengine-b670e591ccb5caf56afb5dd1b27dfdafccfbf082.tar.bz2
damlengine-b670e591ccb5caf56afb5dd1b27dfdafccfbf082.zip
Upgrade to Tomcat 10.HEADmaster
Diffstat (limited to 'org/madore/damlengine')
-rw-r--r--org/madore/damlengine/WeblogServlet.java12
-rw-r--r--org/madore/damlengine/cmdlines2
2 files changed, 7 insertions, 7 deletions
diff --git a/org/madore/damlengine/WeblogServlet.java b/org/madore/damlengine/WeblogServlet.java
index 86f231a..63f1d4f 100644
--- a/org/madore/damlengine/WeblogServlet.java
+++ b/org/madore/damlengine/WeblogServlet.java
@@ -12,17 +12,17 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-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;
/* Thinkos about the mess that is tomcat:
* - Make sure that /usr/share/java/postgresql-jdbc4.jar (or whatever
* contains the class org.postgresql.Driver) is symlinked from
- * /var/lib/tomcat7/common (or some path listed in the common.loader
+ * /var/lib/tomcat10/lib (or some path listed in the common.loader
* property of the catalina.properties file). Similarly,
* xercesImpl.jar and probably xml-resolver.jar need to be linked.
diff --git a/org/madore/damlengine/cmdlines b/org/madore/damlengine/cmdlines
index 25fcd8c..65811b8 100644
--- a/org/madore/damlengine/cmdlines
+++ b/org/madore/damlengine/cmdlines
@@ -1,2 +1,2 @@
-export CLASSPATH=$HOME/java/damlengine:/usr/share/java/xercesImpl.jar:/usr/share/java/xml-resolver-1.2.jar:/usr/share/java/xml-commons-resolver-1.1.jar:/usr/share/java/postgresql-jdbc4.jar:/usr/share/java/servlet-api-3.1.jar:/usr/share/java/servlet-api-3.0.jar
+export CLASSPATH=$HOME/java/damlengine:/usr/share/java/xercesImpl.jar:/usr/share/java/xml-resolver-1.2.jar:/usr/share/java/xml-commons-resolver-1.1.jar:/usr/share/java/postgresql-jdbc4.jar:/usr/share/java/tomcat10-servlet-api.jar
java org.madore.damlengine.DamlEngine some/file.daml