diff --git a/build/org.eclipse.birt.releng/BIRT.setup b/build/org.eclipse.birt.releng/BIRT.setup index d609ed482b9..8c37cdafd82 100644 --- a/build/org.eclipse.birt.releng/BIRT.setup +++ b/build/org.eclipse.birt.releng/BIRT.setup @@ -557,6 +557,8 @@ url="https://download.eclipse.org/justj/epp/milestone/latest"/> + diff --git a/build/org.eclipse.birt.target/BIRT Chart Test.launch b/build/org.eclipse.birt.target/BIRT Chart Test.launch index 51751644229..9ef0ecbcb70 100644 --- a/build/org.eclipse.birt.target/BIRT Chart Test.launch +++ b/build/org.eclipse.birt.target/BIRT Chart Test.launch @@ -56,13 +56,13 @@ - - - - - - - + + + + + + + diff --git a/build/org.eclipse.birt.target/BIRT Report Engine Test.launch b/build/org.eclipse.birt.target/BIRT Report Engine Test.launch index a794f0646d7..a9b4542874a 100644 --- a/build/org.eclipse.birt.target/BIRT Report Engine Test.launch +++ b/build/org.eclipse.birt.target/BIRT Report Engine Test.launch @@ -56,12 +56,12 @@ - - - - - - + + + + + + diff --git a/build/org.eclipse.birt.target/BIRT Report Model Test.launch b/build/org.eclipse.birt.target/BIRT Report Model Test.launch index 7ac8b9859bd..0f9ac45e867 100644 --- a/build/org.eclipse.birt.target/BIRT Report Model Test.launch +++ b/build/org.eclipse.birt.target/BIRT Report Model Test.launch @@ -56,12 +56,12 @@ - - - - - - + + + + + + diff --git a/build/org.eclipse.birt.target/BIRT Report Tests Engine Test.launch b/build/org.eclipse.birt.target/BIRT Report Tests Engine Test.launch index d6c9a7aabea..0215d09519e 100644 --- a/build/org.eclipse.birt.target/BIRT Report Tests Engine Test.launch +++ b/build/org.eclipse.birt.target/BIRT Report Tests Engine Test.launch @@ -56,12 +56,12 @@ - - - - - - + + + + + + diff --git a/build/org.eclipse.birt.target/BIRT all-in-one-MAC.launch b/build/org.eclipse.birt.target/BIRT all-in-one-MAC.launch index 04c55aa4f32..474aedf65b6 100644 --- a/build/org.eclipse.birt.target/BIRT all-in-one-MAC.launch +++ b/build/org.eclipse.birt.target/BIRT all-in-one-MAC.launch @@ -32,29 +32,14 @@ - - - - - - - - - - - - - - - + + + - - - @@ -73,9 +58,6 @@ - - - @@ -85,19 +67,11 @@ - - - - - - - - - + + - @@ -379,27 +353,17 @@ - - - - - - - - - - @@ -407,69 +371,30 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -526,11 +451,6 @@ - - - - - @@ -547,38 +467,16 @@ - - - - - - - - - - - - - - - - - - - - - - @@ -588,24 +486,8 @@ - - - - - - - - - - - - - - - - @@ -619,7 +501,6 @@ - @@ -627,17 +508,8 @@ - - - - - - - - - @@ -819,8 +691,6 @@ - - diff --git a/build/org.eclipse.birt.target/BIRT all-in-one.launch b/build/org.eclipse.birt.target/BIRT all-in-one.launch index 3c8322823f8..64c43d17eb3 100644 --- a/build/org.eclipse.birt.target/BIRT all-in-one.launch +++ b/build/org.eclipse.birt.target/BIRT all-in-one.launch @@ -37,36 +37,16 @@ - - - - - - - + - - - - - - - - - - - - - - - + + + - - @@ -80,7 +60,6 @@ - @@ -99,11 +78,7 @@ - - - - @@ -116,21 +91,15 @@ - - - - - - - - + + + - @@ -156,10 +125,7 @@ - - - @@ -403,7 +369,6 @@ - @@ -412,8 +377,6 @@ - - @@ -432,27 +395,17 @@ - - - - - - - - - - @@ -460,71 +413,32 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -592,11 +506,6 @@ - - - - - @@ -613,39 +522,16 @@ - - - - - - - - - - - - - - - - - - - - - - - @@ -655,24 +541,8 @@ - - - - - - - - - - - - - - - - @@ -686,7 +556,6 @@ - @@ -710,23 +579,12 @@ - - - - - - - - - - - @@ -913,8 +771,6 @@ - - diff --git a/build/org.eclipse.birt.target/org.eclipse.birt.target.target b/build/org.eclipse.birt.target/org.eclipse.birt.target.target index 3ad983a01b7..991c244eace 100644 --- a/build/org.eclipse.birt.target/org.eclipse.birt.target.target +++ b/build/org.eclipse.birt.target/org.eclipse.birt.target.target @@ -1,6 +1,6 @@ - + @@ -18,14 +18,17 @@ + + + + - @@ -98,12 +101,13 @@ - - + + + + - @@ -127,7 +131,9 @@ + + diff --git a/chart/org.eclipse.birt.chart.examples/META-INF/MANIFEST.MF b/chart/org.eclipse.birt.chart.examples/META-INF/MANIFEST.MF index e8abe94eb70..6acddc1715a 100644 --- a/chart/org.eclipse.birt.chart.examples/META-INF/MANIFEST.MF +++ b/chart/org.eclipse.birt.chart.examples/META-INF/MANIFEST.MF @@ -27,5 +27,5 @@ Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.birt.chart.examples.radar.ui.series, org.eclipse.birt.chart.examples.radar.ui.type Automatic-Module-Name: org.eclipse.birt.chart.examples -Import-Package: javax.servlet;version="3.1.0", - javax.servlet.http;version="3.1.0" +Import-Package: jakarta.servlet;version="6.0.0", + jakarta.servlet.http;version="6.0.0" diff --git a/chart/org.eclipse.birt.chart.examples/src/org/eclipse/birt/chart/examples/api/preference/PreferenceServlet.java b/chart/org.eclipse.birt.chart.examples/src/org/eclipse/birt/chart/examples/api/preference/PreferenceServlet.java index 0cdc4115218..3b04de207b8 100644 --- a/chart/org.eclipse.birt.chart.examples/src/org/eclipse/birt/chart/examples/api/preference/PreferenceServlet.java +++ b/chart/org.eclipse.birt.chart.examples/src/org/eclipse/birt/chart/examples/api/preference/PreferenceServlet.java @@ -20,11 +20,11 @@ import java.util.Enumeration; import javax.imageio.ImageIO; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import org.eclipse.birt.chart.device.IDeviceRenderer; import org.eclipse.birt.chart.exception.ChartException; diff --git a/chart/org.eclipse.birt.chart.viewer/META-INF/MANIFEST.MF b/chart/org.eclipse.birt.chart.viewer/META-INF/MANIFEST.MF index 5393e21e585..875edb8ae99 100644 --- a/chart/org.eclipse.birt.chart.viewer/META-INF/MANIFEST.MF +++ b/chart/org.eclipse.birt.chart.viewer/META-INF/MANIFEST.MF @@ -10,8 +10,8 @@ Bundle-ActivationPolicy: lazy Require-Bundle: org.eclipse.birt.chart.engine;bundle-version="4.13.0", org.eclipse.birt.chart.engine.extension;bundle-version="4.13.0" Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: javax.servlet;version="3.1.0", - javax.servlet.http;version="3.1.0", - javax.servlet.jsp;version="2.1.0", - javax.servlet.jsp.tagext;version="2.1.0" +Import-Package: jakarta.servlet;version="6.0.0", + jakarta.servlet.http;version="6.0.0", + jakarta.servlet.jsp;version="3.0.0", + jakarta.servlet.jsp.tagext;version="3.0.0" Automatic-Module-Name: org.eclipse.birt.chart.viewer diff --git a/chart/org.eclipse.birt.chart.viewer/src/org/eclipse/birt/chart/viewer/internal/ChartRendererTag.java b/chart/org.eclipse.birt.chart.viewer/src/org/eclipse/birt/chart/viewer/internal/ChartRendererTag.java index 75d186f8992..ee40a480c1d 100644 --- a/chart/org.eclipse.birt.chart.viewer/src/org/eclipse/birt/chart/viewer/internal/ChartRendererTag.java +++ b/chart/org.eclipse.birt.chart.viewer/src/org/eclipse/birt/chart/viewer/internal/ChartRendererTag.java @@ -17,10 +17,10 @@ import java.io.File; import java.io.IOException; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.tagext.TagSupport; import org.eclipse.birt.chart.factory.IDataRowExpressionEvaluator; import org.eclipse.birt.chart.factory.RunTimeContext; diff --git a/chart/org.eclipse.birt.chart.viewer/src/org/eclipse/birt/chart/viewer/internal/listener/ChartHttpSessionListener.java b/chart/org.eclipse.birt.chart.viewer/src/org/eclipse/birt/chart/viewer/internal/listener/ChartHttpSessionListener.java index adad946608a..32804ca5f5d 100644 --- a/chart/org.eclipse.birt.chart.viewer/src/org/eclipse/birt/chart/viewer/internal/listener/ChartHttpSessionListener.java +++ b/chart/org.eclipse.birt.chart.viewer/src/org/eclipse/birt/chart/viewer/internal/listener/ChartHttpSessionListener.java @@ -14,8 +14,8 @@ package org.eclipse.birt.chart.viewer.internal.listener; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; +import jakarta.servlet.http.HttpSessionEvent; +import jakarta.servlet.http.HttpSessionListener; import org.eclipse.birt.chart.viewer.internal.util.ChartImageManager; @@ -29,7 +29,7 @@ public class ChartHttpSessionListener implements HttpSessionListener /** * After session created * - * @see javax.servlet.http.HttpSessionListener#sessionCreated(javax.servlet.http.HttpSessionEvent) + * @see jakarta.servlet.http.HttpSessionListener#sessionCreated(jakarta.servlet.http.HttpSessionEvent) */ public void sessionCreated( HttpSessionEvent event ) { @@ -38,7 +38,7 @@ public void sessionCreated( HttpSessionEvent event ) /** * When session destroyed * - * @see javax.servlet.http.HttpSessionListener#sessionDestroyed(javax.servlet.http.HttpSessionEvent) + * @see jakarta.servlet.http.HttpSessionListener#sessionDestroyed(jakarta.servlet.http.HttpSessionEvent) */ public void sessionDestroyed( HttpSessionEvent event ) { diff --git a/chart/org.eclipse.birt.chart.viewer/src/org/eclipse/birt/chart/viewer/internal/listener/ChartServletContextListener.java b/chart/org.eclipse.birt.chart.viewer/src/org/eclipse/birt/chart/viewer/internal/listener/ChartServletContextListener.java index 4949255b36e..dd03f70e7cd 100644 --- a/chart/org.eclipse.birt.chart.viewer/src/org/eclipse/birt/chart/viewer/internal/listener/ChartServletContextListener.java +++ b/chart/org.eclipse.birt.chart.viewer/src/org/eclipse/birt/chart/viewer/internal/listener/ChartServletContextListener.java @@ -14,8 +14,8 @@ package org.eclipse.birt.chart.viewer.internal.listener; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; import org.eclipse.birt.chart.viewer.internal.util.ChartImageManager; diff --git a/chart/org.eclipse.birt.chart.viewer/src/org/eclipse/birt/chart/viewer/internal/util/ChartImageManager.java b/chart/org.eclipse.birt.chart.viewer/src/org/eclipse/birt/chart/viewer/internal/util/ChartImageManager.java index 6d70f45efb5..7e5e4fb10b0 100644 --- a/chart/org.eclipse.birt.chart.viewer/src/org/eclipse/birt/chart/viewer/internal/util/ChartImageManager.java +++ b/chart/org.eclipse.birt.chart.viewer/src/org/eclipse/birt/chart/viewer/internal/util/ChartImageManager.java @@ -26,8 +26,8 @@ import java.util.List; import java.util.Locale; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; import org.eclipse.birt.chart.api.ChartEngine; import org.eclipse.birt.chart.device.EmptyUpdateNotifier; diff --git a/chart/org.eclipse.birt.chart.viewer/src/org/eclipse/birt/chart/viewer/internal/util/ChartWebHelper.java b/chart/org.eclipse.birt.chart.viewer/src/org/eclipse/birt/chart/viewer/internal/util/ChartWebHelper.java index fac92c596e8..88222bb439d 100644 --- a/chart/org.eclipse.birt.chart.viewer/src/org/eclipse/birt/chart/viewer/internal/util/ChartWebHelper.java +++ b/chart/org.eclipse.birt.chart.viewer/src/org/eclipse/birt/chart/viewer/internal/util/ChartWebHelper.java @@ -20,7 +20,7 @@ import java.io.InputStream; import java.net.MalformedURLException; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; import org.eclipse.birt.chart.exception.ChartException; import org.eclipse.birt.chart.model.Chart; diff --git a/core/org.eclipse.birt.core/META-INF/MANIFEST.MF b/core/org.eclipse.birt.core/META-INF/MANIFEST.MF index ca58b483a88..d3e568fff34 100644 --- a/core/org.eclipse.birt.core/META-INF/MANIFEST.MF +++ b/core/org.eclipse.birt.core/META-INF/MANIFEST.MF @@ -42,4 +42,4 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)";visibili Bundle-ActivationPolicy: lazy Eclipse-ExtensibleAPI: true Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: javax.servlet +Import-Package: jakarta.servlet diff --git a/core/org.eclipse.birt.core/src/org/eclipse/birt/core/framework/PlatformServletContext.java b/core/org.eclipse.birt.core/src/org/eclipse/birt/core/framework/PlatformServletContext.java index e12aac919b0..772b661fc27 100644 --- a/core/org.eclipse.birt.core/src/org/eclipse/birt/core/framework/PlatformServletContext.java +++ b/core/org.eclipse.birt.core/src/org/eclipse/birt/core/framework/PlatformServletContext.java @@ -21,7 +21,7 @@ import java.util.logging.Level; import java.util.logging.Logger; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; /** * An platform context that is based on resource operations instead of file @@ -76,7 +76,7 @@ private void deploy() { } platform = context.getRealPath(RESOURCE_BASE); if (platform == null || !new File(platform).exists()) { - File contextTemp = (File) context.getAttribute("javax.servlet.context.tempdir"); //$NON-NLS-1$ + File contextTemp = (File) context.getAttribute("jakarta.servlet.context.tempdir"); //$NON-NLS-1$ File platformFolder = new File(contextTemp, "platform"); // Weblogic try to remove the platform but it fails, // so try to copy the platform each time. diff --git a/data/org.eclipse.birt.data.oda.mongodb/src/org/eclipse/birt/data/oda/mongodb/impl/MDbResultSet.java b/data/org.eclipse.birt.data.oda.mongodb/src/org/eclipse/birt/data/oda/mongodb/impl/MDbResultSet.java index 73f075239e9..95524692880 100644 --- a/data/org.eclipse.birt.data.oda.mongodb/src/org/eclipse/birt/data/oda/mongodb/impl/MDbResultSet.java +++ b/data/org.eclipse.birt.data.oda.mongodb/src/org/eclipse/birt/data/oda/mongodb/impl/MDbResultSet.java @@ -44,6 +44,8 @@ import com.mongodb.BasicDBList; import com.mongodb.DBCursor; +import jakarta.xml.bind.DatatypeConverter; + /** * Implementation class of IResultSet for the MongoDB ODA runtime driver. */ diff --git a/viewer/org.eclipse.birt.report.viewer.tests/META-INF/MANIFEST.MF b/viewer/org.eclipse.birt.report.viewer.tests/META-INF/MANIFEST.MF index e300577ebc7..dbb59d27dfc 100644 --- a/viewer/org.eclipse.birt.report.viewer.tests/META-INF/MANIFEST.MF +++ b/viewer/org.eclipse.birt.report.viewer.tests/META-INF/MANIFEST.MF @@ -7,6 +7,6 @@ Fragment-Host: org.eclipse.birt.report.viewer;bundle-version="2.3.1" Bundle-RequiredExecutionEnvironment: JavaSE-11 Export-Package: org.eclipse.birt.report.viewer Require-Bundle: org.junit, - javax.servlet-api;bundle-version="3.1.0" + jakarta.servlet-api;bundle-version="6.0.0" Bundle-Vendor: %Bundle-Vendor Automatic-Module-Name: org.eclipse.birt.report.viewer.tests diff --git a/viewer/org.eclipse.birt.report.viewer.tests/test/org/eclipse/birt/report/viewer/mock/HttpServletRequestSimulator.java b/viewer/org.eclipse.birt.report.viewer.tests/test/org/eclipse/birt/report/viewer/mock/HttpServletRequestSimulator.java index 0095ab4a152..5b99099fb25 100644 --- a/viewer/org.eclipse.birt.report.viewer.tests/test/org/eclipse/birt/report/viewer/mock/HttpServletRequestSimulator.java +++ b/viewer/org.eclipse.birt.report.viewer.tests/test/org/eclipse/birt/report/viewer/mock/HttpServletRequestSimulator.java @@ -24,20 +24,21 @@ import java.util.Locale; import java.util.Map; -import javax.servlet.AsyncContext; -import javax.servlet.DispatcherType; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletInputStream; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpUpgradeHandler; -import javax.servlet.http.Part; +import jakarta.servlet.AsyncContext; +import jakarta.servlet.DispatcherType; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletConnection; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.http.HttpUpgradeHandler; +import jakarta.servlet.http.Part; /** * Mock a HttpServletRequest class for Viewer UnitTest @@ -106,7 +107,7 @@ public HttpServletRequestSimulator(ServletContext context) { /* * (non-Javadoc) * - * @see javax.servlet.ServletRequest#getParameter(java.lang.String) + * @see jakarta.servlet.ServletRequest#getParameter(java.lang.String) */ @Override public String getParameter(String name) { @@ -129,7 +130,7 @@ public String getParameter(String name) { /* * (non-Javadoc) * - * @see javax.servlet.ServletRequest#getParameterMap() + * @see jakarta.servlet.ServletRequest#getParameterMap() */ @Override public Map getParameterMap() { @@ -139,7 +140,7 @@ public Map getParameterMap() { /* * (non-Javadoc) * - * @see javax.servlet.ServletRequest#getParameterNames() + * @see jakarta.servlet.ServletRequest#getParameterNames() */ @Override public Enumeration getParameterNames() { @@ -149,7 +150,7 @@ public Enumeration getParameterNames() { /* * (non-Javadoc) * - * @see javax.servlet.ServletRequest#getParameterValues( java.lang.String ) + * @see jakarta.servlet.ServletRequest#getParameterValues( java.lang.String ) */ @Override public String[] getParameterValues(String name) { @@ -172,7 +173,7 @@ public String[] getParameterValues(String name) { /* * (non-Javadoc) * - * @see javax.servlet.ServletRequest#setAttribute(java.lang.String, + * @see jakarta.servlet.ServletRequest#setAttribute(java.lang.String, * java.lang.Object) */ @Override @@ -185,7 +186,7 @@ public void setAttribute(String key, Object value) { /* * (non-Javadoc) * - * @see javax.servlet.ServletRequest#getAttribute(java.lang.String) + * @see jakarta.servlet.ServletRequest#getAttribute(java.lang.String) */ @Override public Object getAttribute(String name) { @@ -195,7 +196,7 @@ public Object getAttribute(String name) { /* * (non-Javadoc) * - * @see javax.servlet.ServletRequest#getAttributeNames() + * @see jakarta.servlet.ServletRequest#getAttributeNames() */ @Override public Enumeration getAttributeNames() { @@ -205,7 +206,7 @@ public Enumeration getAttributeNames() { /* * (non-Javadoc) * - * @see javax.servlet.ServletRequest#removeAttribute(java.lang.String) + * @see jakarta.servlet.ServletRequest#removeAttribute(java.lang.String) */ @Override public void removeAttribute(String name) { @@ -215,7 +216,7 @@ public void removeAttribute(String name) { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#getHeader(java.lang.String) + * @see jakarta.servlet.http.HttpServletRequest#getHeader(java.lang.String) */ @Override public String getHeader(String name) { @@ -225,7 +226,7 @@ public String getHeader(String name) { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#getHeaderNames() + * @see jakarta.servlet.http.HttpServletRequest#getHeaderNames() */ @Override public Enumeration getHeaderNames() { @@ -235,7 +236,7 @@ public Enumeration getHeaderNames() { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#getHeaders(java.lang.String) + * @see jakarta.servlet.http.HttpServletRequest#getHeaders(java.lang.String) */ @Override public Enumeration getHeaders(String name) { @@ -245,7 +246,7 @@ public Enumeration getHeaders(String name) { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#getIntHeader(java.lang.String) + * @see jakarta.servlet.http.HttpServletRequest#getIntHeader(java.lang.String) */ @Override public int getIntHeader(String name) { @@ -255,7 +256,7 @@ public int getIntHeader(String name) { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#getDateHeader(java.lang.String) + * @see jakarta.servlet.http.HttpServletRequest#getDateHeader(java.lang.String) */ @Override public long getDateHeader(String name) { @@ -265,7 +266,7 @@ public long getDateHeader(String name) { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#getCookies() + * @see jakarta.servlet.http.HttpServletRequest#getCookies() */ @Override public Cookie[] getCookies() { @@ -280,7 +281,7 @@ public Cookie[] getCookies() { /* * (non-Javadoc) * - * @see javax.servlet.ServletRequest#getScheme() + * @see jakarta.servlet.ServletRequest#getScheme() */ @Override public String getScheme() { @@ -290,7 +291,7 @@ public String getScheme() { /* * (non-Javadoc) * - * @see javax.servlet.ServletRequest#getProtocol() + * @see jakarta.servlet.ServletRequest#getProtocol() */ @Override public String getProtocol() { @@ -300,7 +301,7 @@ public String getProtocol() { /* * (non-Javadoc) * - * @see javax.servlet.ServletRequest#setCharacterEncoding(java.lang.String) + * @see jakarta.servlet.ServletRequest#setCharacterEncoding(java.lang.String) */ @Override public void setCharacterEncoding(String encoding) { @@ -310,7 +311,7 @@ public void setCharacterEncoding(String encoding) { /* * (non-Javadoc) * - * @see javax.servlet.ServletRequest#getCharacterEncoding() + * @see jakarta.servlet.ServletRequest#getCharacterEncoding() */ @Override public String getCharacterEncoding() { @@ -320,7 +321,7 @@ public String getCharacterEncoding() { /* * (non-Javadoc) * - * @see javax.servlet.ServletRequest#getContentType() + * @see jakarta.servlet.ServletRequest#getContentType() */ @Override public String getContentType() { @@ -330,7 +331,7 @@ public String getContentType() { /* * (non-Javadoc) * - * @see javax.servlet.ServletRequest#getContentLength() + * @see jakarta.servlet.ServletRequest#getContentLength() */ @Override public int getContentLength() { @@ -340,7 +341,7 @@ public int getContentLength() { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#getAuthType() + * @see jakarta.servlet.http.HttpServletRequest#getAuthType() */ @Override public String getAuthType() { @@ -350,7 +351,7 @@ public String getAuthType() { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#getContextPath() + * @see jakarta.servlet.http.HttpServletRequest#getContextPath() */ @Override public String getContextPath() { @@ -360,7 +361,7 @@ public String getContextPath() { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#getMethod() + * @see jakarta.servlet.http.HttpServletRequest#getMethod() */ @Override public String getMethod() { @@ -370,7 +371,7 @@ public String getMethod() { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#getPathInfo() + * @see jakarta.servlet.http.HttpServletRequest#getPathInfo() */ @Override public String getPathInfo() { @@ -380,7 +381,7 @@ public String getPathInfo() { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#getPathTranslated() + * @see jakarta.servlet.http.HttpServletRequest#getPathTranslated() */ @Override public String getPathTranslated() { @@ -390,7 +391,7 @@ public String getPathTranslated() { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#getQueryString() + * @see jakarta.servlet.http.HttpServletRequest#getQueryString() */ @Override public String getQueryString() { @@ -400,7 +401,7 @@ public String getQueryString() { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#getRemoteUser() + * @see jakarta.servlet.http.HttpServletRequest#getRemoteUser() */ @Override public String getRemoteUser() { @@ -410,7 +411,7 @@ public String getRemoteUser() { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#getRequestURI() + * @see jakarta.servlet.http.HttpServletRequest#getRequestURI() */ @Override public String getRequestURI() { @@ -420,7 +421,7 @@ public String getRequestURI() { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#getRequestURL() + * @see jakarta.servlet.http.HttpServletRequest#getRequestURL() */ @Override public StringBuffer getRequestURL() { @@ -430,7 +431,7 @@ public StringBuffer getRequestURL() { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#getRequestedSessionId() + * @see jakarta.servlet.http.HttpServletRequest#getRequestedSessionId() */ @Override public String getRequestedSessionId() { @@ -444,7 +445,7 @@ public String getRequestedSessionId() { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#getServletPath() + * @see jakarta.servlet.http.HttpServletRequest#getServletPath() */ @Override public String getServletPath() { @@ -454,7 +455,7 @@ public String getServletPath() { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#getSession() + * @see jakarta.servlet.http.HttpServletRequest#getSession() */ @Override public HttpSession getSession() { @@ -464,7 +465,7 @@ public HttpSession getSession() { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#getSession( boolean ) + * @see jakarta.servlet.http.HttpServletRequest#getSession( boolean ) */ @Override public HttpSession getSession(boolean flag) { @@ -489,7 +490,7 @@ public HttpSession getSession(boolean flag) { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#getUserPrincipal + * @see jakarta.servlet.http.HttpServletRequest#getUserPrincipal */ @Override public Principal getUserPrincipal() { @@ -499,7 +500,7 @@ public Principal getUserPrincipal() { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdFromCookie + * @see jakarta.servlet.http.HttpServletRequest#isRequestedSessionIdFromCookie */ @Override public boolean isRequestedSessionIdFromCookie() { @@ -509,7 +510,7 @@ public boolean isRequestedSessionIdFromCookie() { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdFromURL + * @see jakarta.servlet.http.HttpServletRequest#isRequestedSessionIdFromURL */ @Override public boolean isRequestedSessionIdFromURL() { @@ -519,17 +520,7 @@ public boolean isRequestedSessionIdFromURL() { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdFromUrl - */ - @Override - public boolean isRequestedSessionIdFromUrl() { - return isRequestedSessionIdFromURL(); - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpServletRequest#isRequestedSessionIdValid + * @see jakarta.servlet.http.HttpServletRequest#isRequestedSessionIdValid */ @Override public boolean isRequestedSessionIdValid() { @@ -543,7 +534,7 @@ public boolean isRequestedSessionIdValid() { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#isUserInRole( java.lang.String ) + * @see jakarta.servlet.http.HttpServletRequest#isUserInRole( java.lang.String ) */ @Override public boolean isUserInRole(String role) { @@ -557,7 +548,7 @@ public boolean isUserInRole(String role) { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#getInputStream + * @see jakarta.servlet.http.HttpServletRequest#getInputStream */ @Override public ServletInputStream getInputStream() throws IOException { @@ -567,7 +558,7 @@ public ServletInputStream getInputStream() throws IOException { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#getLocalAddr + * @see jakarta.servlet.http.HttpServletRequest#getLocalAddr */ @Override public String getLocalAddr() { @@ -577,7 +568,7 @@ public String getLocalAddr() { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#getLocalName + * @see jakarta.servlet.http.HttpServletRequest#getLocalName */ @Override public String getLocalName() { @@ -587,7 +578,7 @@ public String getLocalName() { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#getLocalPort + * @see jakarta.servlet.http.HttpServletRequest#getLocalPort */ @Override public int getLocalPort() { @@ -597,7 +588,7 @@ public int getLocalPort() { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#getLocale + * @see jakarta.servlet.http.HttpServletRequest#getLocale */ @Override public Locale getLocale() { @@ -607,7 +598,7 @@ public Locale getLocale() { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#getLocales + * @see jakarta.servlet.http.HttpServletRequest#getLocales */ @Override public Enumeration getLocales() { @@ -617,33 +608,17 @@ public Enumeration getLocales() { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#getReader + * @see jakarta.servlet.http.HttpServletRequest#getReader */ @Override public BufferedReader getReader() throws IOException { throw new UnsupportedOperationException("Do not support getReader operation!"); //$NON-NLS-1$ } - /** - * (non-Javadoc) - * - * @see javax.servlet.http.HttpServletRequest#getRealPath( java.lang.String ) - * @deprecated - */ - @Deprecated - @Override - public String getRealPath(String path) { - if (path == null) { - return null; - } - - return this.context.getRealPath(path); - } - /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#getRemoteAddr + * @see jakarta.servlet.http.HttpServletRequest#getRemoteAddr */ @Override public String getRemoteAddr() { @@ -653,7 +628,7 @@ public String getRemoteAddr() { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#getRemoteHost + * @see jakarta.servlet.http.HttpServletRequest#getRemoteHost */ @Override public String getRemoteHost() { @@ -663,7 +638,7 @@ public String getRemoteHost() { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#getRemotePort + * @see jakarta.servlet.http.HttpServletRequest#getRemotePort */ @Override public int getRemotePort() { @@ -673,7 +648,7 @@ public int getRemotePort() { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#getRequestDispatcher( + * @see jakarta.servlet.http.HttpServletRequest#getRequestDispatcher( * java.ang.String ) */ @Override @@ -684,7 +659,7 @@ public RequestDispatcher getRequestDispatcher(String url) { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#getServerName + * @see jakarta.servlet.http.HttpServletRequest#getServerName */ @Override public String getServerName() { @@ -694,7 +669,7 @@ public String getServerName() { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#getServerPort + * @see jakarta.servlet.http.HttpServletRequest#getServerPort */ @Override public int getServerPort() { @@ -704,7 +679,7 @@ public int getServerPort() { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletRequest#isSecure + * @see jakarta.servlet.http.HttpServletRequest#isSecure */ @Override public boolean isSecure() { @@ -1118,4 +1093,22 @@ public T upgrade(Class arg0) throws IOExceptio // TODO Auto-generated method stub return null; } + + @Override + public String getRequestId() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getProtocolRequestId() { + // TODO Auto-generated method stub + return null; + } + + @Override + public ServletConnection getServletConnection() { + // TODO Auto-generated method stub + return null; + } } diff --git a/viewer/org.eclipse.birt.report.viewer.tests/test/org/eclipse/birt/report/viewer/mock/HttpServletResponseSimulator.java b/viewer/org.eclipse.birt.report.viewer.tests/test/org/eclipse/birt/report/viewer/mock/HttpServletResponseSimulator.java index 62a4369f31f..59f45812f4e 100644 --- a/viewer/org.eclipse.birt.report.viewer.tests/test/org/eclipse/birt/report/viewer/mock/HttpServletResponseSimulator.java +++ b/viewer/org.eclipse.birt.report.viewer.tests/test/org/eclipse/birt/report/viewer/mock/HttpServletResponseSimulator.java @@ -21,10 +21,9 @@ import java.util.Hashtable; import java.util.Locale; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.Cookie; -import javax.servlet.http.HttpServletResponse; - +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.Cookie; +import jakarta.servlet.http.HttpServletResponse; import junit.framework.AssertionFailedError; /** @@ -102,7 +101,7 @@ public HttpServletResponseSimulator() { * (non-Javadoc) * * @see - * javax.servlet.http.HttpServletResponse#addCookie(javax.servlet.http.Cookie) + * jakarta.servlet.http.HttpServletResponse#addCookie(jakarta.servlet.http.Cookie) */ @Override public void addCookie(Cookie cookie) { @@ -131,7 +130,7 @@ public Cookie getCookie(String name) { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletResponse#addDateHeader(java.lang.String, + * @see jakarta.servlet.http.HttpServletResponse#addDateHeader(java.lang.String, * long) */ @Override @@ -142,7 +141,7 @@ public void addDateHeader(String name, long header) { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletResponse#addHeader(java.lang.String, + * @see jakarta.servlet.http.HttpServletResponse#addHeader(java.lang.String, * java.lang.String) */ @Override @@ -157,7 +156,7 @@ public void addHeader(String name, String header) { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletResponse#addIntHeader(java.lang.String, + * @see jakarta.servlet.http.HttpServletResponse#addIntHeader(java.lang.String, * int) */ @Override @@ -168,7 +167,7 @@ public void addIntHeader(String name, int header) { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletResponse#containsHeader(java.lang.String) + * @see jakarta.servlet.http.HttpServletResponse#containsHeader(java.lang.String) */ @Override public boolean containsHeader(String name) { @@ -195,7 +194,7 @@ public String getHeader(String name) { * (non-Javadoc) * * @see - * javax.servlet.http.HttpServletResponse#encodeRedirectURL(java.lang.String) + * jakarta.servlet.http.HttpServletResponse#encodeRedirectURL(java.lang.String) */ @Override public String encodeRedirectURL(String url) { @@ -205,18 +204,7 @@ public String encodeRedirectURL(String url) { /* * (non-Javadoc) * - * @see - * javax.servlet.http.HttpServletResponse#encodeRedirectUrl(java.lang.String) - */ - @Override - public String encodeRedirectUrl(String url) { - return encodeRedirectURL(url); - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpServletResponse#encodeURL(java.lang.String) + * @see jakarta.servlet.http.HttpServletResponse#encodeURL(java.lang.String) */ @Override public String encodeURL(String url) { @@ -226,32 +214,23 @@ public String encodeURL(String url) { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletResponse#encodeUrl(java.lang.String) - */ - @Override - public String encodeUrl(String url) { - return encodeURL(url); - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpServletResponse#sendError(int) + * @see jakarta.servlet.http.HttpServletResponse#sendError(int) */ @Override public void sendError(int status) throws IOException { - setStatus(status); + this.status = status; throw new AssertionFailedError(" Response error :" + status); //$NON-NLS-1$ } /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletResponse#sendError(int, java.lang.String) + * @see jakarta.servlet.http.HttpServletResponse#sendError(int, java.lang.String) */ @Override public void sendError(int status, String message) throws IOException { - setStatus(status, message); + this.status = status; + this.message = message; throw new AssertionFailedError(" Response error :" + status + " " //$NON-NLS-1$//$NON-NLS-2$ + message); } @@ -259,7 +238,7 @@ public void sendError(int status, String message) throws IOException { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletResponse#sendRedirect(java.lang.String) + * @see jakarta.servlet.http.HttpServletResponse#sendRedirect(java.lang.String) */ @Override public void sendRedirect(String url) throws IOException { @@ -269,7 +248,7 @@ public void sendRedirect(String url) throws IOException { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletResponse#setDateHeader(java.lang.String, + * @see jakarta.servlet.http.HttpServletResponse#setDateHeader(java.lang.String, * long) */ @Override @@ -280,7 +259,7 @@ public void setDateHeader(String name, long header) { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletResponse#setHeader(java.lang.String, + * @see jakarta.servlet.http.HttpServletResponse#setHeader(java.lang.String, * java.lang.String) */ @Override @@ -303,7 +282,7 @@ public void setHeader(String name, String header) { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletResponse#setIntHeader(java.lang.String, + * @see jakarta.servlet.http.HttpServletResponse#setIntHeader(java.lang.String, * int) */ @Override @@ -323,28 +302,17 @@ public void removeHeader(String name) { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpServletResponse#setStatus(int) + * @see jakarta.servlet.http.HttpServletResponse#setStatus(int) */ @Override public void setStatus(int status) { - setStatus(status, null); - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpServletResponse#setStatus(int, java.lang.String) - */ - @Override - public void setStatus(int status, String message) { this.status = status; - this.message = message; } /* * (non-Javadoc) * - * @see javax.servlet.ServletResponse#flushBuffer() + * @see jakarta.servlet.ServletResponse#flushBuffer() */ @Override public void flushBuffer() throws IOException { @@ -354,7 +322,7 @@ public void flushBuffer() throws IOException { /* * (non-Javadoc) * - * @see javax.servlet.ServletResponse#getBufferSize() + * @see jakarta.servlet.ServletResponse#getBufferSize() */ @Override public int getBufferSize() { @@ -364,7 +332,7 @@ public int getBufferSize() { /* * (non-Javadoc) * - * @see javax.servlet.ServletResponse#getCharacterEncoding() + * @see jakarta.servlet.ServletResponse#getCharacterEncoding() */ @Override public String getCharacterEncoding() { @@ -374,7 +342,7 @@ public String getCharacterEncoding() { /* * (non-Javadoc) * - * @see javax.servlet.ServletResponse#getContentType() + * @see jakarta.servlet.ServletResponse#getContentType() */ @Override public String getContentType() { @@ -384,7 +352,7 @@ public String getContentType() { /* * (non-Javadoc) * - * @see javax.servlet.ServletResponse#getLocale() + * @see jakarta.servlet.ServletResponse#getLocale() */ @Override public Locale getLocale() { @@ -394,7 +362,7 @@ public Locale getLocale() { /* * (non-Javadoc) * - * @see javax.servlet.ServletResponse#getOutputStream() + * @see jakarta.servlet.ServletResponse#getOutputStream() */ @Override public ServletOutputStream getOutputStream() throws IOException { @@ -417,7 +385,7 @@ public ServletOutputStream getOutputStream() throws IOException { /* * (non-Javadoc) * - * @see javax.servlet.ServletResponse#getWriter() + * @see jakarta.servlet.ServletResponse#getWriter() */ @Override public PrintWriter getWriter() throws IOException { @@ -448,7 +416,7 @@ public StringBuffer getStringBuffer() { /* * (non-Javadoc) * - * @see javax.servlet.ServletResponse#isCommitted() + * @see jakarta.servlet.ServletResponse#isCommitted() */ @Override public boolean isCommitted() { @@ -467,7 +435,7 @@ public void setIsCommitted(boolean isCommitted) { /* * (non-Javadoc) * - * @see javax.servlet.ServletResponse#reset() + * @see jakarta.servlet.ServletResponse#reset() */ @Override public void reset() { @@ -486,7 +454,7 @@ public void reset() { /* * (non-Javadoc) * - * @see javax.servlet.ServletResponse#resetBuffer() + * @see jakarta.servlet.ServletResponse#resetBuffer() */ @Override public void resetBuffer() { @@ -496,7 +464,7 @@ public void resetBuffer() { /* * (non-Javadoc) * - * @see javax.servlet.ServletResponse#setBufferSize(int) + * @see jakarta.servlet.ServletResponse#setBufferSize(int) */ @Override public void setBufferSize(int size) { @@ -506,7 +474,7 @@ public void setBufferSize(int size) { /* * (non-Javadoc) * - * @see javax.servlet.ServletResponse#setCharacterEncoding(java.lang.String) + * @see jakarta.servlet.ServletResponse#setCharacterEncoding(java.lang.String) */ @Override public void setCharacterEncoding(String encoding) { @@ -516,7 +484,7 @@ public void setCharacterEncoding(String encoding) { /* * (non-Javadoc) * - * @see javax.servlet.ServletResponse#setContentLength(int) + * @see jakarta.servlet.ServletResponse#setContentLength(int) */ @Override public void setContentLength(int contentLength) { @@ -526,7 +494,7 @@ public void setContentLength(int contentLength) { /* * (non-Javadoc) * - * @see javax.servlet.ServletResponse#setContentType(java.lang.String) + * @see jakarta.servlet.ServletResponse#setContentType(java.lang.String) */ @Override public void setContentType(String contentType) { @@ -536,7 +504,7 @@ public void setContentType(String contentType) { /* * (non-Javadoc) * - * @see javax.servlet.ServletResponse#setLocale(java.util.Locale) + * @see jakarta.servlet.ServletResponse#setLocale(java.util.Locale) */ @Override public void setLocale(Locale locale) { @@ -592,4 +560,9 @@ public void setContentLengthLong(long arg0) { } + @Override + public void sendRedirect(String location, int sc, boolean clearBuffer) throws IOException { + // TODO Auto-generated method stub + } + } diff --git a/viewer/org.eclipse.birt.report.viewer.tests/test/org/eclipse/birt/report/viewer/mock/HttpSessionSimulator.java b/viewer/org.eclipse.birt.report.viewer.tests/test/org/eclipse/birt/report/viewer/mock/HttpSessionSimulator.java index 9ff5735c433..3c6a1837f22 100644 --- a/viewer/org.eclipse.birt.report.viewer.tests/test/org/eclipse/birt/report/viewer/mock/HttpSessionSimulator.java +++ b/viewer/org.eclipse.birt.report.viewer.tests/test/org/eclipse/birt/report/viewer/mock/HttpSessionSimulator.java @@ -16,12 +16,11 @@ import java.util.Enumeration; import java.util.Hashtable; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionContext; - import org.eclipse.birt.report.viewer.util.RandomUtil; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpSession; + /** * Mock a HttpSession class for Viewer UnitTest * @@ -45,7 +44,7 @@ public HttpSessionSimulator(ServletContext context) { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpSession#getAttribute(java.lang.String) + * @see jakarta.servlet.http.HttpSession#getAttribute(java.lang.String) */ @Override public Object getAttribute(String name) { @@ -56,7 +55,7 @@ public Object getAttribute(String name) { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpSession#getAttributeNames() + * @see jakarta.servlet.http.HttpSession#getAttributeNames() */ @Override public Enumeration getAttributeNames() { @@ -67,7 +66,7 @@ public Enumeration getAttributeNames() { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpSession#setAttribute(java.lang.String, + * @see jakarta.servlet.http.HttpSession#setAttribute(java.lang.String, * java.lang.Object) */ @Override @@ -79,7 +78,7 @@ public void setAttribute(String name, Object value) { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpSession#removeAttribute(java.lang.String) + * @see jakarta.servlet.http.HttpSession#removeAttribute(java.lang.String) */ @Override public void removeAttribute(String name) { @@ -90,52 +89,7 @@ public void removeAttribute(String name) { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpSession#getValue(java.lang.String) - */ - @Override - public Object getValue(String name) { - verify(); - return this.getAttribute(name); - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpSession#getValueNames() - */ - @Override - public String[] getValueNames() { - verify(); - return (String[]) this.attributes.keySet().toArray(); - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpSession#putValue(java.lang.String, - * java.lang.Object) - */ - @Override - public void putValue(String name, Object value) { - verify(); - this.setAttribute(name, value); - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpSession#removeValue(java.lang.String) - */ - @Override - public void removeValue(String name) { - verify(); - this.removeAttribute(name); - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpSession#getCreationTime() + * @see jakarta.servlet.http.HttpSession#getCreationTime() */ @Override public long getCreationTime() { @@ -146,7 +100,7 @@ public long getCreationTime() { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpSession#getId() + * @see jakarta.servlet.http.HttpSession#getId() */ @Override public String getId() { @@ -157,7 +111,7 @@ public String getId() { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpSession#getLastAccessedTime() + * @see jakarta.servlet.http.HttpSession#getLastAccessedTime() */ @Override public long getLastAccessedTime() { @@ -168,7 +122,7 @@ public long getLastAccessedTime() { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpSession#getMaxInactiveInterval() + * @see jakarta.servlet.http.HttpSession#getMaxInactiveInterval() */ @Override public int getMaxInactiveInterval() { @@ -179,7 +133,7 @@ public int getMaxInactiveInterval() { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpSession#getServletContext() + * @see jakarta.servlet.http.HttpSession#getServletContext() */ @Override public ServletContext getServletContext() { @@ -190,18 +144,7 @@ public ServletContext getServletContext() { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpSession#getSessionContext() - */ - @Override - public HttpSessionContext getSessionContext() { - verify(); - throw new UnsupportedOperationException("Do not support getSessionContext operation!"); //$NON-NLS-1$ - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.http.HttpSession#invalidate() + * @see jakarta.servlet.http.HttpSession#invalidate() */ @Override public void invalidate() { @@ -212,7 +155,7 @@ public void invalidate() { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpSession#isNew() + * @see jakarta.servlet.http.HttpSession#isNew() */ @Override public boolean isNew() { @@ -223,7 +166,7 @@ public boolean isNew() { /* * (non-Javadoc) * - * @see javax.servlet.http.HttpSession#setMaxInactiveInterval(int) + * @see jakarta.servlet.http.HttpSession#setMaxInactiveInterval(int) */ @Override public void setMaxInactiveInterval(int interval) { diff --git a/viewer/org.eclipse.birt.report.viewer.tests/test/org/eclipse/birt/report/viewer/mock/RequestDispatcherSimulator.java b/viewer/org.eclipse.birt.report.viewer.tests/test/org/eclipse/birt/report/viewer/mock/RequestDispatcherSimulator.java index d8b4ff0cd18..5d52de11db9 100644 --- a/viewer/org.eclipse.birt.report.viewer.tests/test/org/eclipse/birt/report/viewer/mock/RequestDispatcherSimulator.java +++ b/viewer/org.eclipse.birt.report.viewer.tests/test/org/eclipse/birt/report/viewer/mock/RequestDispatcherSimulator.java @@ -15,11 +15,11 @@ import java.io.IOException; -import javax.servlet.RequestDispatcher; -import javax.servlet.Servlet; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; /** * Mock a RequestDispatcher for Viewer UnitText @@ -44,8 +44,8 @@ public RequestDispatcherSimulator(Servlet target) { /* * (non-Javadoc) * - * @see javax.servlet.RequestDispatcher#forward(javax.servlet.ServletRequest, - * javax.servlet.ServletResponse) + * @see jakarta.servlet.RequestDispatcher#forward(jakarta.servlet.ServletRequest, + * jakarta.servlet.ServletResponse) */ @Override public void forward(ServletRequest request, ServletResponse response) throws ServletException, IOException { @@ -57,8 +57,8 @@ public void forward(ServletRequest request, ServletResponse response) throws Ser /* * (non-Javadoc) * - * @see javax.servlet.RequestDispatcher#include(javax.servlet.ServletRequest, - * javax.servlet.ServletResponse) + * @see jakarta.servlet.RequestDispatcher#include(jakarta.servlet.ServletRequest, + * jakarta.servlet.ServletResponse) */ @Override public void include(ServletRequest request, ServletResponse response) throws ServletException, IOException { diff --git a/viewer/org.eclipse.birt.report.viewer.tests/test/org/eclipse/birt/report/viewer/mock/ServletConfigSimulator.java b/viewer/org.eclipse.birt.report.viewer.tests/test/org/eclipse/birt/report/viewer/mock/ServletConfigSimulator.java index b92c82f77a1..ddea58503cb 100644 --- a/viewer/org.eclipse.birt.report.viewer.tests/test/org/eclipse/birt/report/viewer/mock/ServletConfigSimulator.java +++ b/viewer/org.eclipse.birt.report.viewer.tests/test/org/eclipse/birt/report/viewer/mock/ServletConfigSimulator.java @@ -16,8 +16,8 @@ import java.util.Enumeration; import java.util.Hashtable; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; /** * Mock a ServletConfig class for Viewer UnitTest @@ -40,7 +40,7 @@ public ServletConfigSimulator() { /* * (non-Javadoc) * - * @see javax.servlet.ServletConfig#getInitParameter(java.lang.String) + * @see jakarta.servlet.ServletConfig#getInitParameter(java.lang.String) */ @Override public String getInitParameter(String name) { @@ -59,7 +59,7 @@ public String getInitParameter(String name) { /* * (non-Javadoc) * - * @see javax.servlet.ServletConfig#getInitParameterNames() + * @see jakarta.servlet.ServletConfig#getInitParameterNames() */ @Override public Enumeration getInitParameterNames() { @@ -69,7 +69,7 @@ public Enumeration getInitParameterNames() { /* * (non-Javadoc) * - * @see javax.servlet.ServletConfig#getServletContext() + * @see jakarta.servlet.ServletConfig#getServletContext() */ @Override public ServletContext getServletContext() { @@ -79,7 +79,7 @@ public ServletContext getServletContext() { /* * (non-Javadoc) * - * @see javax.servlet.ServletConfig#getServletName() + * @see jakarta.servlet.ServletConfig#getServletName() */ @Override public String getServletName() { diff --git a/viewer/org.eclipse.birt.report.viewer.tests/test/org/eclipse/birt/report/viewer/mock/ServletContextSimulator.java b/viewer/org.eclipse.birt.report.viewer.tests/test/org/eclipse/birt/report/viewer/mock/ServletContextSimulator.java index 688f933645b..9acfd07fadf 100644 --- a/viewer/org.eclipse.birt.report.viewer.tests/test/org/eclipse/birt/report/viewer/mock/ServletContextSimulator.java +++ b/viewer/org.eclipse.birt.report.viewer.tests/test/org/eclipse/birt/report/viewer/mock/ServletContextSimulator.java @@ -24,17 +24,17 @@ import java.util.Map; import java.util.Set; -import javax.servlet.Filter; -import javax.servlet.FilterRegistration; -import javax.servlet.RequestDispatcher; -import javax.servlet.Servlet; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.ServletRegistration; -import javax.servlet.ServletRegistration.Dynamic; -import javax.servlet.SessionCookieConfig; -import javax.servlet.SessionTrackingMode; -import javax.servlet.descriptor.JspConfigDescriptor; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterRegistration; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.Servlet; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRegistration; +import jakarta.servlet.ServletRegistration.Dynamic; +import jakarta.servlet.SessionCookieConfig; +import jakarta.servlet.SessionTrackingMode; +import jakarta.servlet.descriptor.JspConfigDescriptor; /** * Mock a ServletContext class for Viewer UnitTest @@ -74,7 +74,7 @@ public ServletContextSimulator() { /* * (non-Javadoc) * - * @see javax.servlet.ServletContext#getAttribute(java.lang.String) + * @see jakarta.servlet.ServletContext#getAttribute(java.lang.String) */ @Override public Object getAttribute(String name) { @@ -84,7 +84,7 @@ public Object getAttribute(String name) { /* * (non-Javadoc) * - * @see javax.servlet.ServletContext#getAttributeNames() + * @see jakarta.servlet.ServletContext#getAttributeNames() */ @Override public Enumeration getAttributeNames() { @@ -99,7 +99,7 @@ public void setAttribute(String name, Object value) { /* * (non-Javadoc) * - * @see javax.servlet.ServletContext#removeAttribute(java.lang.String) + * @see jakarta.servlet.ServletContext#removeAttribute(java.lang.String) */ @Override public void removeAttribute(String name) { @@ -109,7 +109,7 @@ public void removeAttribute(String name) { /* * (non-Javadoc) * - * @see javax.servlet.ServletContext#getContext(java.lang.String) + * @see jakarta.servlet.ServletContext#getContext(java.lang.String) */ @Override public ServletContext getContext(String uri) { @@ -119,7 +119,7 @@ public ServletContext getContext(String uri) { /* * (non-Javadoc) * - * @see javax.servlet.ServletContext#getInitParameter(java.lang.String) + * @see jakarta.servlet.ServletContext#getInitParameter(java.lang.String) */ @Override public String getInitParameter(String name) { @@ -138,7 +138,7 @@ public String getInitParameter(String name) { /* * (non-Javadoc) * - * @see javax.servlet.ServletContext#getInitParameterNames() + * @see jakarta.servlet.ServletContext#getInitParameterNames() */ @Override public Enumeration getInitParameterNames() { @@ -160,7 +160,7 @@ public boolean setInitParameter(String name, String value) { /* * (non-Javadoc) * - * @see javax.servlet.ServletContext#getMajorVersion() + * @see jakarta.servlet.ServletContext#getMajorVersion() */ @Override public int getMajorVersion() { @@ -170,7 +170,7 @@ public int getMajorVersion() { /* * (non-Javadoc) * - * @see javax.servlet.ServletContext#getMimeType(java.lang.String) + * @see jakarta.servlet.ServletContext#getMimeType(java.lang.String) */ @Override public String getMimeType(String arg0) { @@ -180,7 +180,7 @@ public String getMimeType(String arg0) { /* * (non-Javadoc) * - * @see javax.servlet.ServletContext#getMinorVersion() + * @see jakarta.servlet.ServletContext#getMinorVersion() */ @Override public int getMinorVersion() { @@ -190,7 +190,7 @@ public int getMinorVersion() { /* * (non-Javadoc) * - * @see javax.servlet.ServletContext#getNamedDispatcher(java.lang.String) + * @see jakarta.servlet.ServletContext#getNamedDispatcher(java.lang.String) */ @Override public RequestDispatcher getNamedDispatcher(String uri) { @@ -200,7 +200,7 @@ public RequestDispatcher getNamedDispatcher(String uri) { /* * (non-Javadoc) * - * @see javax.servlet.ServletContext#getRealPath(java.lang.String) + * @see jakarta.servlet.ServletContext#getRealPath(java.lang.String) */ @Override public String getRealPath(String path) { @@ -214,7 +214,7 @@ public String getRealPath(String path) { /* * (non-Javadoc) * - * @see javax.servlet.ServletContext#getRequestDispatcher(java.lang.String) + * @see jakarta.servlet.ServletContext#getRequestDispatcher(java.lang.String) */ @Override public RequestDispatcher getRequestDispatcher(String uri) { @@ -224,7 +224,7 @@ public RequestDispatcher getRequestDispatcher(String uri) { /* * (non-Javadoc) * - * @see javax.servlet.ServletContext#getResource(java.lang.String) + * @see jakarta.servlet.ServletContext#getResource(java.lang.String) */ @Override public URL getResource(String path) throws MalformedURLException { @@ -234,7 +234,7 @@ public URL getResource(String path) throws MalformedURLException { /* * (non-Javadoc) * - * @see javax.servlet.ServletContext#getResourceAsStream(java.lang.String) + * @see jakarta.servlet.ServletContext#getResourceAsStream(java.lang.String) */ @Override public InputStream getResourceAsStream(String arg0) { @@ -244,7 +244,7 @@ public InputStream getResourceAsStream(String arg0) { /* * (non-Javadoc) * - * @see javax.servlet.ServletContext#getResourcePaths(java.lang.String) + * @see jakarta.servlet.ServletContext#getResourcePaths(java.lang.String) */ @Override public Set getResourcePaths(String arg0) { @@ -254,7 +254,7 @@ public Set getResourcePaths(String arg0) { /* * (non-Javadoc) * - * @see javax.servlet.ServletContext#getServerInfo() + * @see jakarta.servlet.ServletContext#getServerInfo() */ @Override public String getServerInfo() { @@ -264,17 +264,7 @@ public String getServerInfo() { /* * (non-Javadoc) * - * @see javax.servlet.ServletContext#getServlet(java.lang.String) - */ - @Override - public Servlet getServlet(String name) throws ServletException { - throw new UnsupportedOperationException("Do not support getServlet operation!"); //$NON-NLS-1$ - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletContext#getServletContextName() + * @see jakarta.servlet.ServletContext#getServletContextName() */ @Override public String getServletContextName() { @@ -284,27 +274,7 @@ public String getServletContextName() { /* * (non-Javadoc) * - * @see javax.servlet.ServletContext#getServletNames() - */ - @Override - public Enumeration getServletNames() { - throw new UnsupportedOperationException("Do not support getServletNames operation!"); //$NON-NLS-1$ - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletContext#getServlets() - */ - @Override - public Enumeration getServlets() { - throw new UnsupportedOperationException("Do not support getServlets operation!"); //$NON-NLS-1$ - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletContext#log(java.lang.String) + * @see jakarta.servlet.ServletContext#log(java.lang.String) */ @Override public void log(String content) { @@ -314,17 +284,7 @@ public void log(String content) { /* * (non-Javadoc) * - * @see javax.servlet.ServletContext#log(java.lang.Exception, java.lang.String) - */ - @Override - public void log(Exception exception, String content) { - System.out.println(content + "--" + exception.getMessage()); //$NON-NLS-1$ - } - - /* - * (non-Javadoc) - * - * @see javax.servlet.ServletContext#log(java.lang.String, java.lang.Throwable) + * @see jakarta.servlet.ServletContext#log(java.lang.String, java.lang.Throwable) */ @Override public void log(String content, Throwable throwable) { @@ -423,19 +383,19 @@ public ServletRegistration getServletRegistration(String servletName) { } @Override - public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, String className) { + public jakarta.servlet.FilterRegistration.Dynamic addFilter(String filterName, String className) { // TODO Auto-generated method stub return null; } @Override - public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Filter filter) { + public jakarta.servlet.FilterRegistration.Dynamic addFilter(String filterName, Filter filter) { // TODO Auto-generated method stub return null; } @Override - public javax.servlet.FilterRegistration.Dynamic addFilter(String filterName, Class filterClass) { + public jakarta.servlet.FilterRegistration.Dynamic addFilter(String filterName, Class filterClass) { // TODO Auto-generated method stub return null; } diff --git a/viewer/org.eclipse.birt.report.viewer.tests/test/org/eclipse/birt/report/viewer/mock/ServletOutputStreamSimulator.java b/viewer/org.eclipse.birt.report.viewer.tests/test/org/eclipse/birt/report/viewer/mock/ServletOutputStreamSimulator.java index b232885d9b3..77dd291426b 100644 --- a/viewer/org.eclipse.birt.report.viewer.tests/test/org/eclipse/birt/report/viewer/mock/ServletOutputStreamSimulator.java +++ b/viewer/org.eclipse.birt.report.viewer.tests/test/org/eclipse/birt/report/viewer/mock/ServletOutputStreamSimulator.java @@ -16,8 +16,8 @@ import java.io.IOException; import java.io.OutputStream; -import javax.servlet.ServletOutputStream; -import javax.servlet.WriteListener; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.WriteListener; /** * This class extends and mocks an abstract ServletOutputStream class for Viewer diff --git a/viewer/org.eclipse.birt.report.viewer.tests/test/org/eclipse/birt/report/viewer/utility/ParameterAccessorTest.java b/viewer/org.eclipse.birt.report.viewer.tests/test/org/eclipse/birt/report/viewer/utility/ParameterAccessorTest.java index ddc99cd9cd9..34e2c69f57d 100644 --- a/viewer/org.eclipse.birt.report.viewer.tests/test/org/eclipse/birt/report/viewer/utility/ParameterAccessorTest.java +++ b/viewer/org.eclipse.birt.report.viewer.tests/test/org/eclipse/birt/report/viewer/utility/ParameterAccessorTest.java @@ -19,8 +19,6 @@ import java.util.Locale; import java.util.Map; -import javax.servlet.http.HttpServletRequest; - import org.eclipse.birt.report.IBirtConstants; import org.eclipse.birt.report.context.BirtContext; import org.eclipse.birt.report.context.ViewerAttributeBean; @@ -28,6 +26,8 @@ import org.eclipse.birt.report.utility.ParameterAccessor; import org.eclipse.birt.report.viewer.util.BaseTestCase; +import jakarta.servlet.http.HttpServletRequest; + /** * TestCases for ParameterAccessor class. For test, mock some objects over http: * ServletContext, HttpServletRequest, HttpSession. @@ -305,7 +305,7 @@ public void testGenerateFileName() { generateFileName(request, "pdf")); //$NON-NLS-1$ request.removeParameter(ParameterAccessor.PARAM_REPORT); request.removeParameter(IBirtConstants.ATTRIBUTE_BEAN); - request.setCharacterEncoding(null); + request.setCharacterEncoding((String) null); } private String generateFileName(HttpServletRequest request, String format) { diff --git a/viewer/org.eclipse.birt.report.viewer/META-INF/MANIFEST.MF b/viewer/org.eclipse.birt.report.viewer/META-INF/MANIFEST.MF index 33ac15094a2..aae384c4a59 100644 --- a/viewer/org.eclipse.birt.report.viewer/META-INF/MANIFEST.MF +++ b/viewer/org.eclipse.birt.report.viewer/META-INF/MANIFEST.MF @@ -9,10 +9,10 @@ Bundle-Activator: org.eclipse.birt.report.viewer.ViewerPlugin Bundle-Vendor: %Bundle-Vendor Bundle-Localization: plugin Bundle-RequiredExecutionEnvironment: JavaSE-11 -Import-Package: javax.servlet;version="2.4.0", - javax.servlet.http;version="2.4.0", - javax.servlet.jsp;version="2.0.0", - javax.servlet.jsp.tagext;version="2.0.0", +Import-Package: jakarta.servlet;version="6.0.0", + jakarta.servlet.http;version="3.0.0", + jakarta.servlet.jsp;version="3.0.0", + jakarta.servlet.jsp.tagext;version="3.0.0", javax.xml.rpc;version="1.1.0", javax.xml.rpc.encoding;version="1.1.0", org.apache.commons.logging, @@ -50,13 +50,12 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)", org.eclipse.jetty.xml;bundle-version="12.0.2", org.eclipse.jetty.servlet-api;bundle-version="4.0.6", org.eclipse.jetty.util;bundle-version="12.0.2", - org.eclipse.jetty.ee8.webapp;bundle-version="12.0.2", - org.eclipse.jetty.ee8.plus;bundle-version="12.0.2", - org.eclipse.jetty.ee8.servlet;bundle-version="12.0.2", - org.eclipse.jetty.ee8.server;bundle-version="12.0.2", - org.eclipse.jetty.ee8.apache-jsp;bundle-version="12.0.2", - org.mortbay.jasper.apache-jsp;bundle-version="[9.0.29,10.0.0)", - org.mortbay.jasper.apache-el;bundle-version="[9.0.29,10.0.0)", + org.eclipse.jetty.ee10.webapp;bundle-version="12.0.11", + org.eclipse.jetty.ee10.plus;bundle-version="12.0.11", + org.eclipse.jetty.ee10.servlet;bundle-version="12.0.11", + org.eclipse.jetty.ee10.apache-jsp;bundle-version="12.0.11", + org.mortbay.jasper.apache-jsp;bundle-version="[10.1.16,11.0.0)", + org.mortbay.jasper.apache-el;bundle-version="[10.1.16,11.0.0)", com.sun.el.javax.el;bundle-version="3.0.0", javax.xml.rpc-api;bundle-version="1.1.4" Bundle-ActivationPolicy: lazy diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/context/BaseAttributeBean.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/context/BaseAttributeBean.java index 18c4ea09fc0..63b02627890 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/context/BaseAttributeBean.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/context/BaseAttributeBean.java @@ -18,7 +18,7 @@ import java.util.Map; import java.util.TimeZone; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.eclipse.birt.report.engine.api.IReportRunnable; import org.eclipse.birt.report.engine.api.ReportParameterConverter; diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/context/BaseContext.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/context/BaseContext.java index 15842f449c0..92b6fc70343 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/context/BaseContext.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/context/BaseContext.java @@ -13,8 +13,8 @@ package org.eclipse.birt.report.context; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; abstract public class BaseContext implements IContext { /** diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/context/BirtContext.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/context/BirtContext.java index e6e8107ed31..070dbfca138 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/context/BirtContext.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/context/BirtContext.java @@ -13,8 +13,8 @@ package org.eclipse.birt.report.context; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.eclipse.birt.report.IBirtConstants; diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/context/IContext.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/context/IContext.java index 4b5fbeca2ae..75df3f0ebd9 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/context/IContext.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/context/IContext.java @@ -13,8 +13,8 @@ package org.eclipse.birt.report.context; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; public interface IContext { /** diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/context/ViewerAttributeBean.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/context/ViewerAttributeBean.java index c55095d4cf8..21eb38eaad9 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/context/ViewerAttributeBean.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/context/ViewerAttributeBean.java @@ -25,7 +25,7 @@ import java.util.Map; import java.util.Set; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.eclipse.birt.report.IBirtConstants; import org.eclipse.birt.report.engine.api.EngineException; diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/filter/ViewerFilter.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/filter/ViewerFilter.java index 2efbe1688d4..c6c576390ed 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/filter/ViewerFilter.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/filter/ViewerFilter.java @@ -15,12 +15,12 @@ import java.io.IOException; -import javax.servlet.Filter; -import javax.servlet.FilterChain; -import javax.servlet.FilterConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; /** * Filter class for birt viewer. It is according to Servlet 2.3 specification. @@ -45,7 +45,7 @@ public ViewerFilter() { /* * (non-Javadoc) * - * @see javax.servlet.Filter#destroy() + * @see jakarta.servlet.Filter#destroy() */ @Override public void destroy() { @@ -56,8 +56,8 @@ public void destroy() { /* * (non-Javadoc) * - * @see javax.servlet.Filter#doFilter(javax.servlet.ServletRequest, - * javax.servlet.ServletResponse, javax.servlet.FilterChain) + * @see jakarta.servlet.Filter#doFilter(jakarta.servlet.ServletRequest, + * jakarta.servlet.ServletResponse, jakarta.servlet.FilterChain) */ @Override public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) @@ -74,7 +74,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha /* * (non-Javadoc) * - * @see javax.servlet.Filter#init(javax.servlet.FilterConfig) + * @see jakarta.servlet.Filter#init(jakarta.servlet.FilterConfig) */ @Override public void init(FilterConfig filterConfig) throws ServletException { diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/listener/ViewerHttpSessionListener.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/listener/ViewerHttpSessionListener.java index 890eb655958..e4ed0c43d8d 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/listener/ViewerHttpSessionListener.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/listener/ViewerHttpSessionListener.java @@ -15,9 +15,9 @@ import java.util.HashMap; -import javax.servlet.http.HttpSession; -import javax.servlet.http.HttpSessionEvent; -import javax.servlet.http.HttpSessionListener; +import jakarta.servlet.http.HttpSession; +import jakarta.servlet.http.HttpSessionEvent; +import jakarta.servlet.http.HttpSessionListener; import org.eclipse.birt.report.IBirtConstants; @@ -31,7 +31,7 @@ public class ViewerHttpSessionListener implements HttpSessionListener { /** * After session created * - * @see javax.servlet.http.HttpSessionListener#sessionCreated(javax.servlet.http.HttpSessionEvent) + * @see jakarta.servlet.http.HttpSessionListener#sessionCreated(jakarta.servlet.http.HttpSessionEvent) */ @Override public void sessionCreated(HttpSessionEvent event) { @@ -43,7 +43,7 @@ public void sessionCreated(HttpSessionEvent event) { /** * When session destroyed * - * @see javax.servlet.http.HttpSessionListener#sessionDestroyed(javax.servlet.http.HttpSessionEvent) + * @see jakarta.servlet.http.HttpSessionListener#sessionDestroyed(jakarta.servlet.http.HttpSessionEvent) */ @Override public void sessionDestroyed(HttpSessionEvent event) { diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/listener/ViewerServletContextListener.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/listener/ViewerServletContextListener.java index ab55f799dda..4b907fe1bc4 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/listener/ViewerServletContextListener.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/listener/ViewerServletContextListener.java @@ -13,8 +13,8 @@ package org.eclipse.birt.report.listener; -import javax.servlet.ServletContextEvent; -import javax.servlet.ServletContextListener; +import jakarta.servlet.ServletContextEvent; +import jakarta.servlet.ServletContextListener; import org.eclipse.birt.core.exception.BirtException; import org.eclipse.birt.core.framework.Platform; @@ -34,7 +34,7 @@ public class ViewerServletContextListener implements ServletContextListener { /* * (non-Javadoc) * - * @see javax.servlet.ServletContextListener#contextDestroyed(javax.servlet. + * @see jakarta.servlet.ServletContextListener#contextDestroyed(jakarta.servlet. * ServletContextEvent) */ @Override @@ -51,7 +51,7 @@ public void contextDestroyed(ServletContextEvent event) { /* * (non-Javadoc) * - * @see javax.servlet.ServletContextListener#contextInitialized(javax.servlet. + * @see jakarta.servlet.ServletContextListener#contextInitialized(jakarta.servlet. * ServletContextEvent) */ @Override diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/AbstractBaseFragment.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/AbstractBaseFragment.java index a3b503582b3..bbb32545c63 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/AbstractBaseFragment.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/AbstractBaseFragment.java @@ -18,10 +18,10 @@ import java.util.Collection; import java.util.Iterator; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.eclipse.birt.core.exception.BirtException; import org.eclipse.birt.report.service.api.IViewerReportService; diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/BirtBaseFragment.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/BirtBaseFragment.java index 28f1b65d8c3..d10dfecc20e 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/BirtBaseFragment.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/BirtBaseFragment.java @@ -15,9 +15,9 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.eclipse.birt.report.service.BirtReportServiceFactory; import org.eclipse.birt.report.service.api.IViewerReportService; diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/IFragment.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/IFragment.java index 1c8b76f1f9d..bb2f34e5365 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/IFragment.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/IFragment.java @@ -16,9 +16,9 @@ import java.io.IOException; import java.util.Collection; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.eclipse.birt.core.exception.BirtException; diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/control/BaseControlFragment.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/control/BaseControlFragment.java index 2c244c64ff5..08b0e73f386 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/control/BaseControlFragment.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/control/BaseControlFragment.java @@ -15,9 +15,9 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.eclipse.birt.report.presentation.aggregation.BirtBaseFragment; diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/dialog/BaseDialogFragment.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/dialog/BaseDialogFragment.java index 92ee329c57b..da2663686ab 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/dialog/BaseDialogFragment.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/dialog/BaseDialogFragment.java @@ -15,9 +15,9 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.eclipse.birt.report.presentation.aggregation.BirtBaseFragment; diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/dialog/ParameterDialogFragment.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/dialog/ParameterDialogFragment.java index 3813dcccd64..a298f3c027b 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/dialog/ParameterDialogFragment.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/dialog/ParameterDialogFragment.java @@ -18,9 +18,9 @@ import java.util.Collection; import java.util.Iterator; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.eclipse.birt.report.IBirtConstants; import org.eclipse.birt.report.context.BaseAttributeBean; diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/layout/EngineFragment.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/layout/EngineFragment.java index 9984ec4ccbd..2018473ddf5 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/layout/EngineFragment.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/layout/EngineFragment.java @@ -21,9 +21,9 @@ import java.io.OutputStream; import java.rmi.RemoteException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.axis.AxisFault; import org.eclipse.birt.report.IBirtConstants; diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/layout/FramesetFragment.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/layout/FramesetFragment.java index 6587a62635f..996123b1628 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/layout/FramesetFragment.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/layout/FramesetFragment.java @@ -21,10 +21,10 @@ import java.io.OutputStream; import java.rmi.RemoteException; -import javax.servlet.RequestDispatcher; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.RequestDispatcher; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.axis.AxisFault; import org.eclipse.birt.core.exception.BirtException; diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/layout/RequesterFragment.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/layout/RequesterFragment.java index 0002973d00f..432a8f1c946 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/layout/RequesterFragment.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/layout/RequesterFragment.java @@ -14,9 +14,9 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.eclipse.birt.report.presentation.aggregation.BirtBaseFragment; diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/layout/RunFragment.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/layout/RunFragment.java index 6e02d489464..7571d3ea7f7 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/layout/RunFragment.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/layout/RunFragment.java @@ -20,9 +20,9 @@ import java.io.OutputStream; import java.rmi.RemoteException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.eclipse.birt.report.IBirtConstants; import org.eclipse.birt.report.context.BaseAttributeBean; diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/parameter/ComboBoxParameterFragment.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/parameter/ComboBoxParameterFragment.java index 671eeafabfa..b15238a79b3 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/parameter/ComboBoxParameterFragment.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/parameter/ComboBoxParameterFragment.java @@ -18,7 +18,7 @@ import java.util.Map; import java.util.TimeZone; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.eclipse.birt.report.IBirtConstants; import org.eclipse.birt.report.context.ScalarParameterBean; @@ -52,7 +52,7 @@ public ComboBoxParameterFragment(ParameterDefinition parameter) { /** * Override implementation of prepareParameterBean method * - * @see org.eclipse.birt.report.presentation.aggregation.parameter.ScalarParameterFragment#prepareParameterBean(javax.servlet.http.HttpServletRequest, + * @see org.eclipse.birt.report.presentation.aggregation.parameter.ScalarParameterFragment#prepareParameterBean(jakarta.servlet.http.HttpServletRequest, * org.eclipse.birt.report.service.api.IViewerReportService, * org.eclipse.birt.report.context.ScalarParameterBean, java.util.Locale, * Timezone) diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/parameter/HiddenParameterFragment.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/parameter/HiddenParameterFragment.java index 1f03edfdb8d..61ed7d2eb95 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/parameter/HiddenParameterFragment.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/parameter/HiddenParameterFragment.java @@ -19,7 +19,7 @@ import java.util.Map; import java.util.TimeZone; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.eclipse.birt.report.IBirtConstants; import org.eclipse.birt.report.context.ScalarParameterBean; diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/parameter/ParameterGroupFragment.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/parameter/ParameterGroupFragment.java index 2b31a0bf7f5..a01ba3c020d 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/parameter/ParameterGroupFragment.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/parameter/ParameterGroupFragment.java @@ -18,9 +18,9 @@ import java.util.Collection; import java.util.Iterator; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.eclipse.birt.report.IBirtConstants; import org.eclipse.birt.report.context.ParameterGroupBean; diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/parameter/RadioButtonParameterFragment.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/parameter/RadioButtonParameterFragment.java index dc96eed59e1..7e7b1335dd3 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/parameter/RadioButtonParameterFragment.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/parameter/RadioButtonParameterFragment.java @@ -17,7 +17,7 @@ import java.util.Locale; import java.util.TimeZone; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.eclipse.birt.report.IBirtConstants; import org.eclipse.birt.report.context.ScalarParameterBean; diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/parameter/ScalarParameterFragment.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/parameter/ScalarParameterFragment.java index 9cc003953a7..d6612c52a6b 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/parameter/ScalarParameterFragment.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/parameter/ScalarParameterFragment.java @@ -20,9 +20,9 @@ import java.util.Map; import java.util.TimeZone; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.eclipse.birt.report.IBirtConstants; import org.eclipse.birt.report.context.ScalarParameterBean; diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/BirtViewerReportService.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/BirtViewerReportService.java index 6cf1dc90358..c056f70cb02 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/BirtViewerReportService.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/BirtViewerReportService.java @@ -27,8 +27,8 @@ import java.util.Set; import java.util.TimeZone; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; import org.eclipse.birt.core.exception.BirtException; import org.eclipse.birt.report.IBirtConstants; diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/ReportEngineService.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/ReportEngineService.java index 9357e6f688a..6cd5c0a8930 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/ReportEngineService.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/ReportEngineService.java @@ -34,9 +34,9 @@ import java.util.TimeZone; import java.util.logging.Level; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; import org.eclipse.birt.core.exception.BirtException; import org.eclipse.birt.core.framework.IPlatformContext; diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/actionhandler/AbstractBaseActionHandler.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/actionhandler/AbstractBaseActionHandler.java index f426562645a..e3d6fc2c9bf 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/actionhandler/AbstractBaseActionHandler.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/actionhandler/AbstractBaseActionHandler.java @@ -16,7 +16,7 @@ import java.rmi.RemoteException; import java.util.ArrayList; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import javax.xml.namespace.QName; import org.apache.axis.AxisFault; diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/actionhandler/AbstractChangeParameterActionHandler.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/actionhandler/AbstractChangeParameterActionHandler.java index d8f0e1c9a1e..63d6586c4c1 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/actionhandler/AbstractChangeParameterActionHandler.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/actionhandler/AbstractChangeParameterActionHandler.java @@ -15,7 +15,7 @@ import java.rmi.RemoteException; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import javax.xml.namespace.QName; import org.apache.axis.AxisFault; diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/actionhandler/AbstractExtractResultSetActionHandler.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/actionhandler/AbstractExtractResultSetActionHandler.java index 436c473fe79..e225e0c4188 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/actionhandler/AbstractExtractResultSetActionHandler.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/actionhandler/AbstractExtractResultSetActionHandler.java @@ -18,7 +18,7 @@ import java.util.HashSet; import java.util.Set; -import javax.servlet.ServletOutputStream; +import jakarta.servlet.ServletOutputStream; import org.eclipse.birt.report.context.BaseAttributeBean; import org.eclipse.birt.report.context.IContext; diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/actionhandler/AbstractGetPageActionHandler.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/actionhandler/AbstractGetPageActionHandler.java index 17f8221fff0..0e3208912c4 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/actionhandler/AbstractGetPageActionHandler.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/actionhandler/AbstractGetPageActionHandler.java @@ -17,7 +17,7 @@ import java.rmi.RemoteException; import java.util.ArrayList; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import javax.xml.namespace.QName; import org.apache.axis.AxisFault; diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/actionhandler/AbstractGetTOCActionHandler.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/actionhandler/AbstractGetTOCActionHandler.java index 3b1ecb72f05..9a8ae6bf9da 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/actionhandler/AbstractGetTOCActionHandler.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/actionhandler/AbstractGetTOCActionHandler.java @@ -16,7 +16,7 @@ import java.rmi.RemoteException; import java.util.List; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.eclipse.birt.report.IBirtConstants; import org.eclipse.birt.report.context.BaseAttributeBean; diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/actionhandler/AbstractRenderImageActionHandler.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/actionhandler/AbstractRenderImageActionHandler.java index 6cab7ced5ac..9b319f2ab3b 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/actionhandler/AbstractRenderImageActionHandler.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/actionhandler/AbstractRenderImageActionHandler.java @@ -13,9 +13,9 @@ package org.eclipse.birt.report.service.actionhandler; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.eclipse.birt.report.context.IContext; import org.eclipse.birt.report.service.api.InputOptions; diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/actionhandler/BirtCustomerExtractDataActionHandler.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/actionhandler/BirtCustomerExtractDataActionHandler.java index b812c200a84..65dc528d0d4 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/actionhandler/BirtCustomerExtractDataActionHandler.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/actionhandler/BirtCustomerExtractDataActionHandler.java @@ -13,7 +13,7 @@ package org.eclipse.birt.report.service.actionhandler; -import javax.servlet.ServletOutputStream; +import jakarta.servlet.ServletOutputStream; import org.apache.axis.AxisFault; import org.eclipse.birt.report.context.IContext; diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/actionhandler/BirtExtractDataActionHandler.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/actionhandler/BirtExtractDataActionHandler.java index 54bb0268eb5..5f2195ec32d 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/actionhandler/BirtExtractDataActionHandler.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/service/actionhandler/BirtExtractDataActionHandler.java @@ -17,7 +17,7 @@ import java.util.Collections; import java.util.Set; -import javax.servlet.ServletOutputStream; +import jakarta.servlet.ServletOutputStream; import org.eclipse.birt.report.context.IContext; import org.eclipse.birt.report.context.ViewerAttributeBean; diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/servlet/BaseReportEngineServlet.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/servlet/BaseReportEngineServlet.java index 3a6ca9d0c10..c7f5d5c01c9 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/servlet/BaseReportEngineServlet.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/servlet/BaseReportEngineServlet.java @@ -15,12 +15,12 @@ import java.io.IOException; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.axis.transport.http.AxisServlet; import org.eclipse.birt.core.exception.BirtException; @@ -96,8 +96,8 @@ public void init(ServletConfig config) throws ServletException { } /** - * @see javax.servlet.http.HttpServlet#service(javax.servlet.ServletRequest, - * javax.servlet.ServletResponse) + * @see jakarta.servlet.http.HttpServlet#service(jakarta.servlet.ServletRequest, + * jakarta.servlet.ServletResponse) */ @Override public void service(ServletRequest req, ServletResponse res) throws ServletException, IOException { diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/servlet/BirtEngineServlet.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/servlet/BirtEngineServlet.java index 40dd396c959..7328ed5d735 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/servlet/BirtEngineServlet.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/servlet/BirtEngineServlet.java @@ -15,10 +15,10 @@ import java.io.IOException; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.eclipse.birt.core.exception.BirtException; import org.eclipse.birt.report.IBirtConstants; diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/servlet/BirtSoapMessageDispatcherServlet.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/servlet/BirtSoapMessageDispatcherServlet.java index c0e51e4c8b5..d2007e29f29 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/servlet/BirtSoapMessageDispatcherServlet.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/servlet/BirtSoapMessageDispatcherServlet.java @@ -16,12 +16,12 @@ import java.io.IOException; import java.util.Iterator; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.ServletResponse; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.axis.transport.http.AxisServlet; import org.eclipse.birt.core.exception.BirtException; @@ -98,8 +98,8 @@ public void init(ServletConfig config) throws ServletException { } /** - * @see javax.servlet.http.HttpServlet#service(javax.servlet.ServletRequest, - * javax.servlet.ServletResponse) + * @see jakarta.servlet.http.HttpServlet#service(jakarta.servlet.ServletRequest, + * jakarta.servlet.ServletResponse) */ @Override public void service(ServletRequest req, ServletResponse res) throws ServletException, IOException { diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/servlet/ViewerServlet.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/servlet/ViewerServlet.java index d9e7f57b338..e80011e7929 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/servlet/ViewerServlet.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/servlet/ViewerServlet.java @@ -15,10 +15,10 @@ import java.io.IOException; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.eclipse.birt.core.exception.BirtException; import org.eclipse.birt.report.IBirtConstants; diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/session/ViewingSessionManager.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/session/ViewingSessionManager.java index 580cfffa96a..35d6c306bde 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/session/ViewingSessionManager.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/session/ViewingSessionManager.java @@ -19,8 +19,8 @@ import java.util.LinkedHashMap; import java.util.Map; -import javax.servlet.http.HttpSessionBindingEvent; -import javax.servlet.http.HttpSessionBindingListener; +import jakarta.servlet.http.HttpSessionBindingEvent; +import jakarta.servlet.http.HttpSessionBindingListener; import org.eclipse.birt.report.exception.ViewerException; import org.eclipse.birt.report.resource.BirtResources; @@ -364,14 +364,14 @@ private void checkExpired() { } /** - * @see javax.servlet.http.HttpSessionBindingListener#valueBound(javax.servlet.http.HttpSessionBindingEvent) + * @see jakarta.servlet.http.HttpSessionBindingListener#valueBound(jakarta.servlet.http.HttpSessionBindingEvent) */ @Override public void valueBound(HttpSessionBindingEvent event) { } /** - * @see javax.servlet.http.HttpSessionBindingListener#valueUnbound(javax.servlet.http.HttpSessionBindingEvent) + * @see jakarta.servlet.http.HttpSessionBindingListener#valueUnbound(jakarta.servlet.http.HttpSessionBindingEvent) */ @Override public void valueUnbound(HttpSessionBindingEvent event) { diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/session/ViewingSessionUtil.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/session/ViewingSessionUtil.java index f4954a37e89..bb5c1ecd976 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/session/ViewingSessionUtil.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/session/ViewingSessionUtil.java @@ -13,8 +13,8 @@ package org.eclipse.birt.report.session; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import org.eclipse.birt.report.IBirtConstants; import org.eclipse.birt.report.exception.ViewerException; diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/taglib/AbstractBaseTag.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/taglib/AbstractBaseTag.java index 83c24a955b2..f5351c0dc02 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/taglib/AbstractBaseTag.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/taglib/AbstractBaseTag.java @@ -15,11 +15,11 @@ import java.io.IOException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.PageContext; +import jakarta.servlet.jsp.tagext.TagSupport; import org.eclipse.birt.report.taglib.component.ViewerField; @@ -71,7 +71,7 @@ public void __init() { /** * Initialize pageContext * - * @see javax.servlet.jsp.tagext.TagSupport#setPageContext(javax.servlet.jsp.PageContext) + * @see jakarta.servlet.jsp.tagext.TagSupport#setPageContext(jakarta.servlet.jsp.PageContext) */ @Override public void setPageContext(PageContext context) { @@ -82,7 +82,7 @@ public void setPageContext(PageContext context) { /** * When reach the start tag, fire this operation * - * @see javax.servlet.jsp.tagext.TagSupport#doStartTag() + * @see jakarta.servlet.jsp.tagext.TagSupport#doStartTag() */ @Override public int doStartTag() throws JspException { @@ -92,7 +92,7 @@ public int doStartTag() throws JspException { /** * When reach the end tag, fire this operation * - * @see javax.servlet.jsp.tagext.TagSupport#doEndTag() + * @see jakarta.servlet.jsp.tagext.TagSupport#doEndTag() */ @Override public int doEndTag() throws JspException { diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/taglib/AbstractViewerTag.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/taglib/AbstractViewerTag.java index 490b5f8709e..65eb9d03269 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/taglib/AbstractViewerTag.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/taglib/AbstractViewerTag.java @@ -22,9 +22,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.jsp.JspTagException; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.jsp.JspTagException; +import jakarta.servlet.jsp.JspWriter; import org.eclipse.birt.report.resource.BirtResources; import org.eclipse.birt.report.resource.ResourceConstants; diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/taglib/ParamDefTag.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/taglib/ParamDefTag.java index 1cd5f5a0f52..9ab45454c59 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/taglib/ParamDefTag.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/taglib/ParamDefTag.java @@ -23,13 +23,13 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspTagException; -import javax.servlet.jsp.JspWriter; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.BodyTagSupport; -import javax.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspTagException; +import jakarta.servlet.jsp.JspWriter; +import jakarta.servlet.jsp.PageContext; +import jakarta.servlet.jsp.tagext.BodyTagSupport; +import jakarta.servlet.jsp.tagext.TagSupport; import org.eclipse.birt.report.IBirtConstants; import org.eclipse.birt.report.engine.api.IScalarParameterDefn; @@ -136,7 +136,7 @@ public class ParamDefTag extends BodyTagSupport { /** * Initialize pageContext * - * @see javax.servlet.jsp.tagext.TagSupport#setPageContext(javax.servlet.jsp.PageContext) + * @see jakarta.servlet.jsp.tagext.TagSupport#setPageContext(jakarta.servlet.jsp.PageContext) */ @Override public void setPageContext(PageContext context) { @@ -147,7 +147,7 @@ public void setPageContext(PageContext context) { /** * When reach the end tag, fire this operation * - * @see javax.servlet.jsp.tagext.BodyTagSupport#doEndTag() + * @see jakarta.servlet.jsp.tagext.BodyTagSupport#doEndTag() */ @Override public int doEndTag() throws JspException { diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/taglib/ParamTag.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/taglib/ParamTag.java index 8f1f76c0bf9..8ee7db0fb6f 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/taglib/ParamTag.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/taglib/ParamTag.java @@ -13,10 +13,10 @@ package org.eclipse.birt.report.taglib; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.BodyTagSupport; -import javax.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.PageContext; +import jakarta.servlet.jsp.tagext.BodyTagSupport; +import jakarta.servlet.jsp.tagext.TagSupport; import org.eclipse.birt.report.taglib.component.ParamValueField; import org.eclipse.birt.report.taglib.component.ParameterField; @@ -40,7 +40,7 @@ public class ParamTag extends BodyTagSupport { /** * Initialize pageContext * - * @see javax.servlet.jsp.tagext.TagSupport#setPageContext(javax.servlet.jsp.PageContext) + * @see jakarta.servlet.jsp.tagext.TagSupport#setPageContext(jakarta.servlet.jsp.PageContext) */ @Override public void setPageContext(PageContext context) { @@ -51,7 +51,7 @@ public void setPageContext(PageContext context) { /** * When reach the end tag, fire this operation * - * @see javax.servlet.jsp.tagext.BodyTagSupport#doEndTag() + * @see jakarta.servlet.jsp.tagext.BodyTagSupport#doEndTag() */ @Override public int doEndTag() throws JspException { diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/taglib/ParamValueTag.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/taglib/ParamValueTag.java index e4715ffc7ee..9acbbb22e3e 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/taglib/ParamValueTag.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/taglib/ParamValueTag.java @@ -13,10 +13,10 @@ package org.eclipse.birt.report.taglib; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.PageContext; -import javax.servlet.jsp.tagext.BodyTagSupport; -import javax.servlet.jsp.tagext.TagSupport; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.PageContext; +import jakarta.servlet.jsp.tagext.BodyTagSupport; +import jakarta.servlet.jsp.tagext.TagSupport; import org.eclipse.birt.report.taglib.component.ParamValueField; @@ -39,7 +39,7 @@ public class ParamValueTag extends BodyTagSupport { /** * Initialize pageContext * - * @see javax.servlet.jsp.tagext.TagSupport#setPageContext(javax.servlet.jsp.PageContext) + * @see jakarta.servlet.jsp.tagext.TagSupport#setPageContext(jakarta.servlet.jsp.PageContext) */ @Override public void setPageContext(PageContext context) { @@ -50,7 +50,7 @@ public void setPageContext(PageContext context) { /** * When reach the end tag, fire this operation * - * @see javax.servlet.jsp.tagext.BodyTagSupport#doEndTag() + * @see jakarta.servlet.jsp.tagext.BodyTagSupport#doEndTag() */ @Override public int doEndTag() throws JspException { diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/taglib/ReportTag.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/taglib/ReportTag.java index f94261c5b7e..487afb86242 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/taglib/ReportTag.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/taglib/ReportTag.java @@ -26,9 +26,9 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.jsp.JspWriter; import org.eclipse.birt.core.exception.BirtException; import org.eclipse.birt.report.IBirtConstants; diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/taglib/RequesterTag.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/taglib/RequesterTag.java index 54ddf9428a8..17e542b4ae6 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/taglib/RequesterTag.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/taglib/RequesterTag.java @@ -19,10 +19,10 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.jsp.JspException; -import javax.servlet.jsp.JspTagException; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.jsp.JspException; +import jakarta.servlet.jsp.JspTagException; +import jakarta.servlet.jsp.JspWriter; import org.eclipse.birt.report.IBirtConstants; import org.eclipse.birt.report.resource.BirtResources; @@ -66,7 +66,7 @@ public void __init() { * When reach the start tag, fire this operation If set isCustom as true, use * FORM to create user-defined parameter page * - * @see javax.servlet.jsp.tagext.TagSupport#doStartTag() + * @see jakarta.servlet.jsp.tagext.TagSupport#doStartTag() */ @Override public int doStartTag() throws JspException { diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/taglib/util/BirtTagUtil.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/taglib/util/BirtTagUtil.java index 4c122ca00a4..0d4757e5471 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/taglib/util/BirtTagUtil.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/taglib/util/BirtTagUtil.java @@ -20,8 +20,8 @@ import java.util.Map; import java.util.TimeZone; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.jsp.JspWriter; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.jsp.JspWriter; import org.eclipse.birt.report.engine.api.IReportDocument; import org.eclipse.birt.report.engine.api.IReportRunnable; diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/BirtUtility.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/BirtUtility.java index f6506e18a3d..2f976a6d4bd 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/BirtUtility.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/BirtUtility.java @@ -33,10 +33,10 @@ import java.util.Map; import java.util.TimeZone; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpSession; import javax.xml.namespace.QName; import org.apache.axis.AxisFault; diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/ParameterAccessor.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/ParameterAccessor.java index 3d0b9a2e0af..ccf89ab86e0 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/ParameterAccessor.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/ParameterAccessor.java @@ -39,10 +39,10 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpSession; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpSession; import org.eclipse.birt.report.IBirtConstants; import org.eclipse.birt.report.context.BaseAttributeBean; diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/PrintUtility.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/PrintUtility.java index 77402047b2f..e281cc79a4a 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/PrintUtility.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/PrintUtility.java @@ -37,7 +37,7 @@ import javax.print.attribute.standard.PrinterMakeAndModel; import javax.print.attribute.standard.SheetCollate; import javax.print.attribute.standard.Sides; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import javax.xml.namespace.QName; import org.apache.axis.AxisFault; diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/filename/IFilenameGenerator.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/filename/IFilenameGenerator.java index 60848ebffe7..de18faec66f 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/filename/IFilenameGenerator.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/filename/IFilenameGenerator.java @@ -14,8 +14,8 @@ import java.util.Map; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; import org.eclipse.birt.report.context.ViewerAttributeBean; import org.eclipse.birt.report.engine.api.EmitterInfo; diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/filename/IFilenameGeneratorFactory.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/filename/IFilenameGeneratorFactory.java index 6b380af2ec4..75bf3c8c03d 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/filename/IFilenameGeneratorFactory.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/filename/IFilenameGeneratorFactory.java @@ -12,7 +12,7 @@ ************************************************************************************/ package org.eclipse.birt.report.utility.filename; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; /** * Factory interface for the implementors of IFilenameGenerator. diff --git a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/filename/TimestampFilenameGeneratorFactory.java b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/filename/TimestampFilenameGeneratorFactory.java index 79c030e602a..a4ed2edebed 100644 --- a/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/filename/TimestampFilenameGeneratorFactory.java +++ b/viewer/org.eclipse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/utility/filename/TimestampFilenameGeneratorFactory.java @@ -12,7 +12,7 @@ ************************************************************************************/ package org.eclipse.birt.report.utility.filename; -import javax.servlet.ServletContext; +import jakarta.servlet.ServletContext; /** * Factory class for the time stamp file name generator. @@ -26,7 +26,7 @@ public class TimestampFilenameGeneratorFactory implements IFilenameGeneratorFact * Returns an instance of TimestampFilenameGenerator. Reads the date format from * the INIT_PARAMETER_FILENAME_DATE_PATTERN from the servlet context. * - * @see org.eclipse.birt.report.utility.filename.IFilenameGeneratorFactory#createFilenameGenerator(javax.servlet.ServletContext) + * @see org.eclipse.birt.report.utility.filename.IFilenameGeneratorFactory#createFilenameGenerator(jakarta.servlet.ServletContext) */ @Override public IFilenameGenerator createFilenameGenerator(ServletContext context) { diff --git a/viewer/org.eclipse.birt.report.viewer/src/org/eclipse/birt/report/viewer/ViewerPlugin.java b/viewer/org.eclipse.birt.report.viewer/src/org/eclipse/birt/report/viewer/ViewerPlugin.java index 5a6d605cf85..13a896c866d 100644 --- a/viewer/org.eclipse.birt.report.viewer/src/org/eclipse/birt/report/viewer/ViewerPlugin.java +++ b/viewer/org.eclipse.birt.report.viewer/src/org/eclipse/birt/report/viewer/ViewerPlugin.java @@ -23,7 +23,7 @@ import java.util.TimeZone; import java.util.TreeMap; -import javax.servlet.jsp.JspFactory; +import jakarta.servlet.jsp.JspFactory; import org.eclipse.birt.report.viewer.browsers.BrowserManager; import org.eclipse.birt.report.viewer.utilities.WebViewer; diff --git a/viewer/org.eclipse.birt.report.viewer/src/org/eclipse/birt/report/viewer/utilities/ViewerWebApp.java b/viewer/org.eclipse.birt.report.viewer/src/org/eclipse/birt/report/viewer/utilities/ViewerWebApp.java index 39e81c879b8..ac676b5e3c1 100644 --- a/viewer/org.eclipse.birt.report.viewer/src/org/eclipse/birt/report/viewer/utilities/ViewerWebApp.java +++ b/viewer/org.eclipse.birt.report.viewer/src/org/eclipse/birt/report/viewer/utilities/ViewerWebApp.java @@ -17,9 +17,9 @@ import org.apache.tomcat.SimpleInstanceManager; import org.eclipse.core.runtime.FileLocator; import org.eclipse.core.runtime.URIUtil; -import org.eclipse.jetty.ee8.webapp.WebAppClassLoader; -import org.eclipse.jetty.ee8.webapp.WebAppContext; -import org.eclipse.jetty.ee8.webapp.WebXmlConfiguration; +import org.eclipse.jetty.ee10.webapp.WebAppClassLoader; +import org.eclipse.jetty.ee10.webapp.WebAppContext; +import org.eclipse.jetty.ee10.webapp.WebXmlConfiguration; import org.eclipse.jetty.server.Handler; import org.eclipse.jetty.server.Server; import org.eclipse.jetty.server.handler.ContextHandlerCollection; @@ -91,7 +91,7 @@ public void stop() throws Exception { Handler handler = this.server.getHandler(); if (handler instanceof ContextHandlerCollection) { ContextHandlerCollection contextHandlerCollection = (ContextHandlerCollection) handler; - contextHandlerCollection.removeHandler(this.webAppContext.get()); + contextHandlerCollection.removeHandler(this.webAppContext.getHandler()); } this.webAppContext = null;