Update to Jakarta EE

9 files changed, 25 insertions, 36 deletions

diff --git a/projects/net.wotonomy.web/pom.xml b/projects/net.wotonomy.web/pom.xml
index d85e081..20c498b 100644
--- a/projects/net.wotonomy.web/pom.xml
+++ b/projects/net.wotonomy.web/pom.xml
@@ -16,14 +16,10 @@
 			<version>${project.version}</version>
 		</dependency>
 		<dependency>
-			<groupId>jetty</groupId>
-			<artifactId>org.mortbay.jetty</artifactId>
-			<version>5.1.9</version>
-		</dependency>
-		<dependency>
-			<groupId>org.mortbay.jetty</groupId>
-			<artifactId>servlet-api-2.5</artifactId>
-			<version>0PR</version>
+			<groupId>jakarta.platform</groupId>
+			<artifactId>jakarta.jakartaee-api</artifactId>
+			<version>10.0.0</version>
+			<scope>provided</scope>
 		</dependency>
 		<dependency>
 			<groupId>dom4j</groupId>
diff --git a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOApplication.java b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOApplication.java
index 46b598c..692e6b5 100644
--- a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOApplication.java
+++ b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOApplication.java
@@ -21,21 +21,15 @@ package net.wotonomy.web;
 import java.lang.reflect.Constructor;
 import java.util.List;
 
-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 net.wotonomy.foundation.NSArray;
 import net.wotonomy.foundation.NSDictionary;
 import net.wotonomy.foundation.NSMutableDictionary;
 import net.wotonomy.web.util.BrowserLauncher;
 
-import org.mortbay.http.HttpListener;
-import org.mortbay.http.HttpServer;
-import org.mortbay.jetty.servlet.ServletHandler;
-import org.mortbay.util.InetAddrPort;
-
 /**
  * A pure java implementation of WOApplication. <br>
  * <br>
@@ -893,7 +887,8 @@ public class WOApplication extends HttpServlet {
 	 * themselves directly (for testing).
 	 */
 	public static void main(String[] argv, Class subclass) {
-		try {
+		// TODO fix this later
+		/*try {
 			int port = 0;
 			boolean open = false;
 			try {
@@ -919,7 +914,7 @@ public class WOApplication extends HttpServlet {
 			}
 		} catch (Throwable t) {
 			t.printStackTrace();
-		}
+		}*/
 	}
 }
 
diff --git a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOCookie.java b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOCookie.java
index 4c5f498..b342559 100644
--- a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOCookie.java
+++ b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOCookie.java
@@ -18,6 +18,7 @@ License along with this library; if not, see http://www.gnu.org
 
 package net.wotonomy.web;
 
+import jakarta.servlet.http.Cookie;
 import net.wotonomy.foundation.NSDate;
 
 /**
@@ -28,7 +29,7 @@ import net.wotonomy.foundation.NSDate;
  * @author $Author: cgruber $
  * @version $Revision: 905 $
  */
-public class WOCookie extends javax.servlet.http.Cookie {
+public class WOCookie extends Cookie {
 	/**
 	 * Default constructor.
 	 */
diff --git a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WODirectAction.java b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WODirectAction.java
index 08b591f..0ad4181 100644
--- a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WODirectAction.java
+++ b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WODirectAction.java
@@ -21,8 +21,7 @@ package net.wotonomy.web;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 
-import javax.servlet.http.HttpSession;
-
+import jakarta.servlet.http.HttpSession;
 import net.wotonomy.foundation.NSArray;
 import net.wotonomy.foundation.NSSelector;
 import net.wotonomy.foundation.internal.Introspector;
diff --git a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WORequest.java b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WORequest.java
index 34f7414..5664e59 100644
--- a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WORequest.java
+++ b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WORequest.java
@@ -21,10 +21,9 @@ package net.wotonomy.web;
 import java.io.InputStream;
 import java.util.Enumeration;
 
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
 import net.wotonomy.foundation.NSArray;
 import net.wotonomy.foundation.NSData;
 import net.wotonomy.foundation.NSDictionary;
diff --git a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOResponse.java b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOResponse.java
index 6362a03..6e729cb 100644
--- a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOResponse.java
+++ b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOResponse.java
@@ -22,6 +22,7 @@ import java.text.SimpleDateFormat;
 import java.util.Date;
 import java.util.TimeZone;
 
+import jakarta.servlet.http.HttpServletResponse;
 import net.wotonomy.foundation.NSArray;
 
 /**
@@ -93,7 +94,7 @@ public class WOResponse extends WOMessage implements WOActionResults {
 	 * to "text/html". As far as I can tell, WORequests have no way to set the
 	 * content type and therefore must always be of type "text/html".
 	 */
-	void generateServletResponse(javax.servlet.http.HttpServletResponse response) {
+	void generateServletResponse(HttpServletResponse response) {
 		if (WOApplication.application().isPageRefreshOnBacktrackEnabled()) {
 			disableClientCaching();
 		}
diff --git a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOServletSessionStore.java b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOServletSessionStore.java
index 647346c..fde7f18 100644
--- a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOServletSessionStore.java
+++ b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOServletSessionStore.java
@@ -26,7 +26,7 @@ import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
 import java.io.ObjectStreamClass;
 
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSession;
 
 /**
  * An implementation of WOSessionStore that stores WOSessions inside of
diff --git a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOSession.java b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOSession.java
index 82df58b..58a45f0 100644
--- a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOSession.java
+++ b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/WOSession.java
@@ -23,8 +23,7 @@ import java.util.LinkedList;
 import java.util.List;
 import java.util.Map;
 
-import javax.servlet.http.HttpSession;
-
+import jakarta.servlet.http.HttpSession;
 import net.wotonomy.control.EOEditingContext;
 import net.wotonomy.control.KeyValueCodingUtilities;
 import net.wotonomy.foundation.NSArray;
diff --git a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/xml/XMLRPCServlet.java b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/xml/XMLRPCServlet.java
index 94b5680..28b0345 100644
--- a/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/xml/XMLRPCServlet.java
+++ b/projects/net.wotonomy.web/src/main/java/net/wotonomy/web/xml/XMLRPCServlet.java
@@ -25,11 +25,10 @@ import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.Hashtable;
 
-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 net.wotonomy.foundation.NSSelector;
 import net.wotonomy.foundation.internal.WotonomyException;