antville/helma
antville/helma
1
1
Fork 0
Code Issues 5 Pull requests 9 Projects Releases 5 Activity Actions

Migrate to Jakarte servlet API 5

Browse source
This commit is contained in:
Tobi Schäfer 2024-05-25 15:44:59 +02:00
parent 973b3493cb
commit 3dbcd792a6
Signed by: tobi
GPG key ID: 91FAE6FE2EBAC4C8
9 changed files with 20 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/main/java/helma/framework/CookieTrans.java
View file

@ -17,7 +17,7 @@
package helma.framework;
import java.io.Serializable;
import javax.servlet.http.Cookie;
import jakarta.servlet.http.Cookie;
/**
* Cookie Transmitter. A simple, serializable representation

6
src/main/java/helma/framework/RequestBean.java
View file

@ -16,12 +16,12 @@
package helma.framework;
import javax.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletRequest;
import java.io.Serializable;
import java.util.Map;
/**
*
*
*/
public class RequestBean implements Serializable {
private static final long serialVersionUID = -6826881712426326687L;
@ -89,7 +89,7 @@ public class RequestBean implements Serializable {
* @return the header value, or null
*/
public String getHeader(String name) {
return req.getHeader(name);
return req.getHeader(name);
}
/**

6
src/main/java/helma/framework/RequestTrans.java
View file

@ -19,9 +19,9 @@ package helma.framework;
import helma.util.SystemMap;
import helma.util.StringUtils;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import javax.servlet.http.Cookie;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
import jakarta.servlet.http.Cookie;
import org.apache.commons.codec.binary.Base64;

2
src/main/java/helma/framework/ResponseBean.java
View file

@ -19,7 +19,7 @@ package helma.framework;
import helma.objectmodel.db.Transactor;
import helma.scripting.ScriptingException;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.io.Serializable;
import java.io.StringWriter;
import java.io.PrintWriter;

2
src/main/java/helma/framework/ResponseTrans.java
View file

@ -21,7 +21,7 @@ import helma.framework.core.Application;
import helma.util.*;
import helma.scripting.ScriptingException;
import javax.servlet.http.HttpServletResponse;
import jakarta.servlet.http.HttpServletResponse;
import java.io.*;
import java.security.*;
import java.util.*;

10
src/main/java/helma/servlet/AbstractServletClient.java
View file

@ -22,12 +22,14 @@ package helma.servlet;
import helma.framework.*;
import helma.framework.core.Application;
import helma.util.*;
import java.io.*;
import java.util.*;
import java.security.SecureRandom;
import java.security.NoSuchAlgorithmException;
import javax.servlet.*;
import javax.servlet.http.*;
import jakarta.servlet.*;
import jakarta.servlet.http.*;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
@ -218,7 +220,7 @@ public abstract class AbstractServletClient extends HttpServlet {
// read file uploads
List uploads = null;
ServletRequestContext reqcx = new ServletRequestContext(request);
JakartaServletRequestContext reqcx = new JakartaServletRequestContext(request);
if (ServletFileUpload.isMultipartContent(reqcx)) {
// get session for upload progress monitoring
@ -653,7 +655,7 @@ public abstract class AbstractServletClient extends HttpServlet {
map.put(name, newValues);
}
protected List parseUploads(ServletRequestContext reqcx, RequestTrans reqtrans,
protected List parseUploads(JakartaServletRequestContext reqcx, RequestTrans reqtrans,
final UploadStatus uploadStatus, String encoding)
throws FileUploadException, UnsupportedEncodingException {
// handle file upload

2
src/main/java/helma/servlet/EmbeddedServletClient.java
View file

@ -19,7 +19,7 @@ package helma.servlet;
import helma.framework.*;
import helma.framework.core.Application;
import helma.main.*;
import javax.servlet.*;
import jakarta.servlet.*;
/**
* Servlet client that runs a Helma application for the embedded

6
src/main/java/helma/servlet/StandaloneServletClient.java
View file

@ -23,7 +23,7 @@ import helma.main.ServerConfig;
import helma.main.Server;
import java.io.*;
import javax.servlet.*;
import jakarta.servlet.*;
import java.util.*;
/**
@ -98,7 +98,7 @@ public final class StandaloneServletClient extends AbstractServletClient {
repositoryImpl = "helma.framework.repository.FileRepository";
}
}
try {
Repository newRepository = (Repository) Class.forName(repositoryImpl)
.getConstructor(parameters)
@ -116,7 +116,7 @@ public final class StandaloneServletClient extends AbstractServletClient {
}
}
}
// add app dir
FileRepository appRep = new FileRepository(appDir);
log("adding repository: " + appDir);