File javax2jakarta.patch of Package sitemesh
Index: sitemesh/src/java/com/opensymphony/module/sitemesh/Config.java
===================================================================
--- sitemesh.orig/src/java/com/opensymphony/module/sitemesh/Config.java
+++ sitemesh/src/java/com/opensymphony/module/sitemesh/Config.java
@@ -9,9 +9,9 @@
package com.opensymphony.module.sitemesh;
-import javax.servlet.FilterConfig;
-import javax.servlet.ServletConfig;
-import javax.servlet.ServletContext;
+import jakarta.servlet.FilterConfig;
+import jakarta.servlet.ServletConfig;
+import jakarta.servlet.ServletContext;
/**
* Common interface to ServletConfig and FilterConfig
Index: sitemesh/src/java/com/opensymphony/module/sitemesh/DecoratorMapper.java
===================================================================
--- sitemesh.orig/src/java/com/opensymphony/module/sitemesh/DecoratorMapper.java
+++ sitemesh/src/java/com/opensymphony/module/sitemesh/DecoratorMapper.java
@@ -9,7 +9,7 @@
package com.opensymphony.module.sitemesh;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.Properties;
/**
Index: sitemesh/src/java/com/opensymphony/module/sitemesh/Page.java
===================================================================
--- sitemesh.orig/src/java/com/opensymphony/module/sitemesh/Page.java
+++ sitemesh/src/java/com/opensymphony/module/sitemesh/Page.java
@@ -9,7 +9,7 @@
package com.opensymphony.module.sitemesh;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.io.IOException;
import java.io.Writer;
import java.util.Map;
Index: sitemesh/src/java/com/opensymphony/module/sitemesh/filter/DebugResponseWrapper.java
===================================================================
--- sitemesh.orig/src/java/com/opensymphony/module/sitemesh/filter/DebugResponseWrapper.java
+++ sitemesh/src/java/com/opensymphony/module/sitemesh/filter/DebugResponseWrapper.java
@@ -9,10 +9,10 @@
package com.opensymphony.module.sitemesh.filter;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
import java.io.IOException;
import java.io.PrintWriter;
import java.util.Locale;
@@ -58,10 +58,6 @@ public class DebugResponseWrapper extend
return super.containsHeader(name);
}
- public String encodeRedirectUrl(String url) {
- return super.encodeRedirectUrl(url);
- }
-
public String encodeRedirectURL(String url) {
return super.encodeRedirectURL(url);
}
@@ -101,11 +97,6 @@ public class DebugResponseWrapper extend
super.setStatus(sc);
}
- public void setStatus(int sc, String msg) {
- if (enabled()) debug("setStatus", String.valueOf(sc), msg);
- super.setStatus(sc, msg);
- }
-
public void flushBuffer() throws IOException {
if (enabled()) debug("flushBuffer", null, null);
super.flushBuffer();
Index: sitemesh/src/java/com/opensymphony/module/sitemesh/filter/PageFilter.java
===================================================================
--- sitemesh.orig/src/java/com/opensymphony/module/sitemesh/filter/PageFilter.java
+++ sitemesh/src/java/com/opensymphony/module/sitemesh/filter/PageFilter.java
@@ -12,9 +12,9 @@ package com.opensymphony.module.sitemesh
import com.opensymphony.module.sitemesh.*;
import com.opensymphony.module.sitemesh.util.Container;
-import javax.servlet.*;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.*;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.io.PrintWriter;
Index: sitemesh/src/java/com/opensymphony/module/sitemesh/filter/PageOutputStream.java
===================================================================
--- sitemesh.orig/src/java/com/opensymphony/module/sitemesh/filter/PageOutputStream.java
+++ sitemesh/src/java/com/opensymphony/module/sitemesh/filter/PageOutputStream.java
@@ -11,8 +11,10 @@ package com.opensymphony.module.sitemesh
import com.opensymphony.module.sitemesh.util.FastByteArrayOutputStream;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.ServletResponse;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.ServletResponse;
+import jakarta.servlet.WriteListener;
+
import java.io.*;
import java.nio.charset.*;
import java.nio.CharBuffer;
@@ -137,4 +139,31 @@ public class PageOutputStream extends Se
}
}
+ @Override
+ public boolean isReady() {
+ try {
+ ServletOutputStream outputStream = response.getOutputStream();
+ if (outputStream != null) {
+ return outputStream.isReady();
+ }
+ return true;
+ }
+ catch (IOException e) {
+ return false;
+ }
+ }
+
+ @Override
+ public void setWriteListener(WriteListener writeListenerIn) {
+ try {
+ ServletOutputStream outputStream = response.getOutputStream();
+ if (outputStream != null) {
+ outputStream.setWriteListener(writeListenerIn);
+ }
+ }
+ catch (IOException e) {
+ throw new RuntimeException("Failed to setWriteListener", e);
+ }
+ }
+
}
\ No newline at end of file
Index: sitemesh/src/java/com/opensymphony/module/sitemesh/filter/PageRequestWrapper.java
===================================================================
--- sitemesh.orig/src/java/com/opensymphony/module/sitemesh/filter/PageRequestWrapper.java
+++ sitemesh/src/java/com/opensymphony/module/sitemesh/filter/PageRequestWrapper.java
@@ -1,8 +1,8 @@
package com.opensymphony.module.sitemesh.filter;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
/**
* Will wrap a request for the {@link RequestDispatcherWrapper}.
Index: sitemesh/src/java/com/opensymphony/module/sitemesh/filter/PageResponseWrapper.java
===================================================================
--- sitemesh.orig/src/java/com/opensymphony/module/sitemesh/filter/PageResponseWrapper.java
+++ sitemesh/src/java/com/opensymphony/module/sitemesh/filter/PageResponseWrapper.java
@@ -14,9 +14,9 @@ import com.opensymphony.module.sitemesh.
import com.opensymphony.module.sitemesh.Page;
import com.opensymphony.module.sitemesh.PageParser;
-import javax.servlet.ServletOutputStream;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.ServletOutputStream;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.http.HttpServletResponseWrapper;
import java.io.IOException;
import java.io.PrintWriter;
Index: sitemesh/src/java/com/opensymphony/module/sitemesh/filter/RequestDispatcherWrapper.java
===================================================================
--- sitemesh.orig/src/java/com/opensymphony/module/sitemesh/filter/RequestDispatcherWrapper.java
+++ sitemesh/src/java/com/opensymphony/module/sitemesh/filter/RequestDispatcherWrapper.java
@@ -1,9 +1,9 @@
package com.opensymphony.module.sitemesh.filter;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.ServletRequest;
-import javax.servlet.ServletResponse;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.ServletRequest;
+import jakarta.servlet.ServletResponse;
import java.io.IOException;
/**
Index: sitemesh/src/java/com/opensymphony/module/sitemesh/mapper/AbstractDecoratorMapper.java
===================================================================
--- sitemesh.orig/src/java/com/opensymphony/module/sitemesh/mapper/AbstractDecoratorMapper.java
+++ sitemesh/src/java/com/opensymphony/module/sitemesh/mapper/AbstractDecoratorMapper.java
@@ -14,7 +14,7 @@ import com.opensymphony.module.sitemesh.
import com.opensymphony.module.sitemesh.DecoratorMapper;
import com.opensymphony.module.sitemesh.Page;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.Properties;
/**
Index: sitemesh/src/java/com/opensymphony/module/sitemesh/mapper/AgentDecoratorMapper.java
===================================================================
--- sitemesh.orig/src/java/com/opensymphony/module/sitemesh/mapper/AgentDecoratorMapper.java
+++ sitemesh/src/java/com/opensymphony/module/sitemesh/mapper/AgentDecoratorMapper.java
@@ -14,7 +14,7 @@ import com.opensymphony.module.sitemesh.
import com.opensymphony.module.sitemesh.DecoratorMapper;
import com.opensymphony.module.sitemesh.Page;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.io.File;
import java.util.HashMap;
import java.util.Iterator;
Index: sitemesh/src/java/com/opensymphony/module/sitemesh/mapper/ConfigDecoratorMapper.java
===================================================================
--- sitemesh.orig/src/java/com/opensymphony/module/sitemesh/mapper/ConfigDecoratorMapper.java
+++ sitemesh/src/java/com/opensymphony/module/sitemesh/mapper/ConfigDecoratorMapper.java
@@ -14,8 +14,8 @@ import com.opensymphony.module.sitemesh.
import com.opensymphony.module.sitemesh.DecoratorMapper;
import com.opensymphony.module.sitemesh.Page;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.Properties;
/**
Index: sitemesh/src/java/com/opensymphony/module/sitemesh/mapper/ConfigLoader.java
===================================================================
--- sitemesh.orig/src/java/com/opensymphony/module/sitemesh/mapper/ConfigLoader.java
+++ sitemesh/src/java/com/opensymphony/module/sitemesh/mapper/ConfigLoader.java
@@ -14,7 +14,7 @@ import com.opensymphony.module.sitemesh.
import org.w3c.dom.*;
import org.xml.sax.SAXException;
-import javax.servlet.ServletException;
+import jakarta.servlet.ServletException;
import javax.xml.parsers.DocumentBuilder;
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
Index: sitemesh/src/java/com/opensymphony/module/sitemesh/mapper/CookieDecoratorMapper.java
===================================================================
--- sitemesh.orig/src/java/com/opensymphony/module/sitemesh/mapper/CookieDecoratorMapper.java
+++ sitemesh/src/java/com/opensymphony/module/sitemesh/mapper/CookieDecoratorMapper.java
@@ -14,8 +14,8 @@ import com.opensymphony.module.sitemesh.
import com.opensymphony.module.sitemesh.DecoratorMapper;
import com.opensymphony.module.sitemesh.Page;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.Cookie;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.Cookie;
import java.util.Properties;
/**
Index: sitemesh/src/java/com/opensymphony/module/sitemesh/mapper/EnvEntryDecoratorMapper.java
===================================================================
--- sitemesh.orig/src/java/com/opensymphony/module/sitemesh/mapper/EnvEntryDecoratorMapper.java
+++ sitemesh/src/java/com/opensymphony/module/sitemesh/mapper/EnvEntryDecoratorMapper.java
@@ -14,7 +14,7 @@ import com.opensymphony.module.sitemesh.
import javax.naming.Context;
import javax.naming.InitialContext;
import javax.naming.NamingException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* The EnvEntryDecoratorMapper allows the reference to a web-app environment entry for the
Index: sitemesh/src/java/com/opensymphony/module/sitemesh/mapper/FileDecoratorMapper.java
===================================================================
--- sitemesh.orig/src/java/com/opensymphony/module/sitemesh/mapper/FileDecoratorMapper.java
+++ sitemesh/src/java/com/opensymphony/module/sitemesh/mapper/FileDecoratorMapper.java
@@ -14,7 +14,7 @@ import com.opensymphony.module.sitemesh.
import java.io.File;
import java.net.MalformedURLException;
import java.net.URL;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* The FileDecoratorMapper will treat the name of the decorator as a file-name to use
Index: sitemesh/src/java/com/opensymphony/module/sitemesh/mapper/FrameSetDecoratorMapper.java
===================================================================
--- sitemesh.orig/src/java/com/opensymphony/module/sitemesh/mapper/FrameSetDecoratorMapper.java
+++ sitemesh/src/java/com/opensymphony/module/sitemesh/mapper/FrameSetDecoratorMapper.java
@@ -15,7 +15,7 @@ import com.opensymphony.module.sitemesh.
import com.opensymphony.module.sitemesh.HTMLPage;
import com.opensymphony.module.sitemesh.Page;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.Properties;
/**
Index: sitemesh/src/java/com/opensymphony/module/sitemesh/mapper/InlineDecoratorMapper.java
===================================================================
--- sitemesh.orig/src/java/com/opensymphony/module/sitemesh/mapper/InlineDecoratorMapper.java
+++ sitemesh/src/java/com/opensymphony/module/sitemesh/mapper/InlineDecoratorMapper.java
@@ -14,7 +14,7 @@ import com.opensymphony.module.sitemesh.
import com.opensymphony.module.sitemesh.RequestConstants;
import com.opensymphony.module.sitemesh.factory.FactoryException;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
/**
* The InlineDecoratorMapper is used to determine the correct Decorator when
Index: sitemesh/src/java/com/opensymphony/module/sitemesh/mapper/LanguageDecoratorMapper.java
===================================================================
--- sitemesh.orig/src/java/com/opensymphony/module/sitemesh/mapper/LanguageDecoratorMapper.java
+++ sitemesh/src/java/com/opensymphony/module/sitemesh/mapper/LanguageDecoratorMapper.java
@@ -14,7 +14,7 @@ import com.opensymphony.module.sitemesh.
import com.opensymphony.module.sitemesh.DecoratorMapper;
import com.opensymphony.module.sitemesh.Page;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.io.File;
import java.util.HashMap;
import java.util.Iterator;
Index: sitemesh/src/java/com/opensymphony/module/sitemesh/mapper/NullDecoratorMapper.java
===================================================================
--- sitemesh.orig/src/java/com/opensymphony/module/sitemesh/mapper/NullDecoratorMapper.java
+++ sitemesh/src/java/com/opensymphony/module/sitemesh/mapper/NullDecoratorMapper.java
@@ -14,7 +14,7 @@ import com.opensymphony.module.sitemesh.
import com.opensymphony.module.sitemesh.DecoratorMapper;
import com.opensymphony.module.sitemesh.Page;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.Properties;
/**
Index: sitemesh/src/java/com/opensymphony/module/sitemesh/mapper/OSDecoratorMapper.java
===================================================================
--- sitemesh.orig/src/java/com/opensymphony/module/sitemesh/mapper/OSDecoratorMapper.java
+++ sitemesh/src/java/com/opensymphony/module/sitemesh/mapper/OSDecoratorMapper.java
@@ -15,7 +15,7 @@ import com.opensymphony.module.sitemesh.
import com.opensymphony.module.sitemesh.DecoratorMapper;
import com.opensymphony.module.sitemesh.Config;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.Properties;
import java.util.Enumeration;
import java.lang.String;
Index: sitemesh/src/java/com/opensymphony/module/sitemesh/mapper/PageDecoratorMapper.java
===================================================================
--- sitemesh.orig/src/java/com/opensymphony/module/sitemesh/mapper/PageDecoratorMapper.java
+++ sitemesh/src/java/com/opensymphony/module/sitemesh/mapper/PageDecoratorMapper.java
@@ -14,7 +14,7 @@ import com.opensymphony.module.sitemesh.
import com.opensymphony.module.sitemesh.DecoratorMapper;
import com.opensymphony.module.sitemesh.Page;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.*;
/**
Index: sitemesh/src/java/com/opensymphony/module/sitemesh/mapper/ParameterDecoratorMapper.java
===================================================================
--- sitemesh.orig/src/java/com/opensymphony/module/sitemesh/mapper/ParameterDecoratorMapper.java
+++ sitemesh/src/java/com/opensymphony/module/sitemesh/mapper/ParameterDecoratorMapper.java
@@ -14,7 +14,7 @@ import com.opensymphony.module.sitemesh.
import com.opensymphony.module.sitemesh.DecoratorMapper;
import com.opensymphony.module.sitemesh.Page;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.Properties;
/**
Index: sitemesh/src/java/com/opensymphony/module/sitemesh/mapper/PrintableDecoratorMapper.java
===================================================================
--- sitemesh.orig/src/java/com/opensymphony/module/sitemesh/mapper/PrintableDecoratorMapper.java
+++ sitemesh/src/java/com/opensymphony/module/sitemesh/mapper/PrintableDecoratorMapper.java
@@ -14,7 +14,7 @@ import com.opensymphony.module.sitemesh.
import com.opensymphony.module.sitemesh.DecoratorMapper;
import com.opensymphony.module.sitemesh.Page;
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
import java.util.Properties;
/**
Index: sitemesh/src/java/com/opensymphony/module/sitemesh/mapper/RobotDecoratorMapper.java
===================================================================
--- sitemesh.orig/src/java/com/opensymphony/module/sitemesh/mapper/RobotDecoratorMapper.java
+++ sitemesh/src/java/com/opensymphony/module/sitemesh/mapper/RobotDecoratorMapper.java
@@ -15,8 +15,8 @@ import com.opensymphony.module.sitemesh.
import com.opensymphony.module.sitemesh.Page;
import com.opensymphony.module.sitemesh.RequestConstants;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
import java.util.Properties;
/**
Index: sitemesh/src/java/com/opensymphony/module/sitemesh/parser/AbstractPage.java
===================================================================
--- sitemesh.orig/src/java/com/opensymphony/module/sitemesh/parser/AbstractPage.java
+++ sitemesh/src/java/com/opensymphony/module/sitemesh/parser/AbstractPage.java
@@ -11,8 +11,8 @@ package com.opensymphony.module.sitemesh
import com.opensymphony.module.sitemesh.Page;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletRequestWrapper;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequestWrapper;
import java.io.*;
import java.util.HashMap;
import java.util.Map;
Index: sitemesh/src/java/com/opensymphony/module/sitemesh/taglib/AbstractTag.java
===================================================================
--- sitemesh.orig/src/java/com/opensymphony/module/sitemesh/taglib/AbstractTag.java
+++ sitemesh/src/java/com/opensymphony/module/sitemesh/taglib/AbstractTag.java
@@ -13,10 +13,10 @@ import com.opensymphony.module.sitemesh.
import com.opensymphony.module.sitemesh.RequestConstants;
import com.opensymphony.module.sitemesh.util.OutputConverter;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
-import javax.servlet.jsp.tagext.Tag;
-import javax.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.tagext.Tag;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
import java.io.Writer;
/**
Index: sitemesh/src/java/com/opensymphony/module/sitemesh/taglib/decorator/UsePageTEI.java
===================================================================
--- sitemesh.orig/src/java/com/opensymphony/module/sitemesh/taglib/decorator/UsePageTEI.java
+++ sitemesh/src/java/com/opensymphony/module/sitemesh/taglib/decorator/UsePageTEI.java
@@ -9,9 +9,9 @@
package com.opensymphony.module.sitemesh.taglib.decorator;
-import javax.servlet.jsp.tagext.TagData;
-import javax.servlet.jsp.tagext.TagExtraInfo;
-import javax.servlet.jsp.tagext.VariableInfo;
+import jakarta.servlet.jsp.tagext.TagData;
+import jakarta.servlet.jsp.tagext.TagExtraInfo;
+import jakarta.servlet.jsp.tagext.VariableInfo;
/**
* TagExtraInfo implementation to expose Page object as variable.
Index: sitemesh/src/java/com/opensymphony/module/sitemesh/taglib/decorator/UsePageTag.java
===================================================================
--- sitemesh.orig/src/java/com/opensymphony/module/sitemesh/taglib/decorator/UsePageTag.java
+++ sitemesh/src/java/com/opensymphony/module/sitemesh/taglib/decorator/UsePageTag.java
@@ -11,8 +11,8 @@ package com.opensymphony.module.sitemesh
import com.opensymphony.module.sitemesh.taglib.AbstractTag;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.PageContext;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.PageContext;
/**
* Expose the Page as a bean to the page which can then be accessed
Index: sitemesh/src/java/com/opensymphony/module/sitemesh/taglib/page/ApplyDecoratorTag.java
===================================================================
--- sitemesh.orig/src/java/com/opensymphony/module/sitemesh/taglib/page/ApplyDecoratorTag.java
+++ sitemesh/src/java/com/opensymphony/module/sitemesh/taglib/page/ApplyDecoratorTag.java
@@ -13,12 +13,12 @@ import com.opensymphony.module.sitemesh.
import com.opensymphony.module.sitemesh.filter.PageRequestWrapper;
import com.opensymphony.module.sitemesh.filter.PageResponseWrapper;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import javax.servlet.jsp.JspException;
-import javax.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.RequestDispatcher;
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+import jakarta.servlet.jsp.JspException;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
import java.io.IOException;
import java.io.BufferedReader;
import java.io.InputStreamReader;
Index: sitemesh/src/java/com/opensymphony/module/sitemesh/taglib/page/ParamTag.java
===================================================================
--- sitemesh.orig/src/java/com/opensymphony/module/sitemesh/taglib/page/ParamTag.java
+++ sitemesh/src/java/com/opensymphony/module/sitemesh/taglib/page/ParamTag.java
@@ -9,8 +9,8 @@
package com.opensymphony.module.sitemesh.taglib.page;
-import javax.servlet.jsp.tagext.BodyTagSupport;
-import javax.servlet.jsp.tagext.Tag;
+import jakarta.servlet.jsp.tagext.BodyTagSupport;
+import jakarta.servlet.jsp.tagext.Tag;
/**
* Add a parameter to the inline Decorator, as if specified in the Page.
Index: sitemesh/testsuite/src/java/testsuite/i18n/EncodingFilter.java
===================================================================
--- sitemesh.orig/testsuite/src/java/testsuite/i18n/EncodingFilter.java
+++ sitemesh/testsuite/src/java/testsuite/i18n/EncodingFilter.java
@@ -10,9 +10,9 @@
package testsuite.i18n;
-import javax.servlet.*;
-import javax.servlet.http.HttpServletResponseWrapper;
-import javax.servlet.http.HttpServletResponse;
+import jakarta.servlet.*;
+import jakarta.servlet.http.HttpServletResponseWrapper;
+import jakarta.servlet.http.HttpServletResponse;
import java.io.IOException;
/**
Index: sitemesh/testsuite/src/webapp/WEB-INF/src/testsuite/servlets/OutputServlet.java
===================================================================
--- sitemesh.orig/testsuite/src/webapp/WEB-INF/src/testsuite/servlets/OutputServlet.java
+++ sitemesh/testsuite/src/webapp/WEB-INF/src/testsuite/servlets/OutputServlet.java
@@ -1,9 +1,9 @@
package testsuite.servlets;
-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 java.io.IOException;
import java.io.OutputStreamWriter;
import java.io.PrintWriter;
