Migration to Jakarta EE

eclipse-birt · Jul 16, 2024 · b5bd6e1 · b5bd6e1
1 parent 37da6d1
commit b5bd6e1
Show file tree

Hide file tree

Showing 62 changed files with 223 additions and 227 deletions.
diff --git a/build/org.eclipse.birt.target/org.eclipse.birt.target.target b/build/org.eclipse.birt.target/org.eclipse.birt.target.target
@@ -23,10 +23,6 @@
       <unit id="jakarta.transaction-api" version="0.0.0"/>
       <unit id="jakarta.xml.bind" version="0.0.0"/>
       <unit id="jakarta.xml.bind-api" version="0.0.0"/>
-      <unit id="javax.activation" version="0.0.0"/>
-      <unit id="javax.annotation" version="0.0.0"/>
-      <unit id="javax.inject" version="0.0.0"/>
-      <unit id="javax.servlet-api" version="0.0.0"/>
       <unit id="javax.xml.rpc-api" version="0.0.0"/>
       <unit id="javax.xml.soap" version="0.0.0"/>
       <unit id="org.apache.aries.spifly.dynamic.bundle" version="0.0.0"/>
@@ -97,12 +93,10 @@
       <unit id="org.eclipse.equinox.http.service.api" version="0.0.0"/>
       <unit id="org.eclipse.jetty.deploy" version="0.0.0"/>
       <unit id="org.eclipse.jetty.ee" version="0.0.0"/>
-      <unit id="org.eclipse.jetty.ee8.apache-jsp" version="0.0.0"/>
-      <unit id="org.eclipse.jetty.ee8.plus" version="0.0.0"/>
-      <unit id="org.eclipse.jetty.ee8.security" version="0.0.0"/>
-      <unit id="org.eclipse.jetty.ee8.server" version="0.0.0"/>
-      <unit id="org.eclipse.jetty.ee8.servlet" version="0.0.0"/>
-      <unit id="org.eclipse.jetty.ee8.webapp" version="0.0.0"/>
+      <unit id="org.eclipse.jetty.ee10.apache-jsp" version="0.0.0"/>
+      <unit id="org.eclipse.jetty.ee10.plus" version="0.0.0"/>
+      <unit id="org.eclipse.jetty.ee10.servlet" version="0.0.0"/>
+      <unit id="org.eclipse.jetty.ee10.webapp" version="0.0.0"/>
       <unit id="org.eclipse.jetty.http" version="0.0.0"/>
       <unit id="org.eclipse.jetty.io" version="0.0.0"/>
       <unit id="org.eclipse.jetty.osgi" version="0.0.0"/>
@@ -124,8 +118,8 @@
       <unit id="org.eclipse.xsd.edit.feature.group" version="0.0.0"/>
       <unit id="org.eclipse.xsd.feature.group" version="0.0.0"/>
       <unit id="org.mongodb.mongo-java-driver" version="0.0.0"/>
-      <unit id="org.mortbay.jasper.apache-el" version="9.0.90"/>
-      <unit id="org.mortbay.jasper.apache-jsp" version="9.0.90"/>
+      <unit id="org.mortbay.jasper.apache-el" version="10.1.16"/>
+      <unit id="org.mortbay.jasper.apache-jsp" version="10.1.16"/>
       <unit id="org.mozilla.rhino" version="0.0.0"/>
       <unit id="org.objectweb.asm.commons" version="0.0.0"/>
       <unit id="org.osgi.namespace.contract" version="0.0.0"/>
@@ -147,6 +141,7 @@
       <repository location="https://download.eclipse.org/webtools/repository/latest"/>
       <repository location="https://download.eclipse.org/justj/epp/milestone/latest"/>
       <repository location="https://download.eclipse.org/justj/jres/21/updates/release/latest"/>
+      <repository location="https://download.eclipse.org/tools/orbit/simrel/orbit-aggregation/release/4.32.0/"/>
     </location>
   </locations>
 </target>
diff --git 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
@@ -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/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="6.0.0",
+ jakarta.servlet.jsp;version="3.1.1",
+ jakarta.servlet.jsp.tagext;version="3.1.1",
  javax.xml.rpc;version="1.1.0",
  javax.xml.rpc.encoding;version="1.1.0",
  org.apache.commons.logging,
@@ -43,22 +43,21 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="[3.2.0,4.0.0)",
  org.eclipse.birt.report.engine.dataextraction;bundle-version="[2.3.0,5.0.0)",
  org.apache.xerces;bundle-version="[2.8.0,3.0.0)";resolution:=optional,
  org.eclipse.birt.report.item.crosstab.core;bundle-version="[2.2.0,5.0.0)";resolution:=optional,
- org.eclipse.birt.report.designer.core;bundle-version="4.13.0",
- org.eclipse.jetty.server;bundle-version="12.0.2",
- org.eclipse.jetty.http;bundle-version="12.0.2",
- org.eclipse.jetty.osgi;bundle-version="12.0.2",
- org.eclipse.jetty.deploy;bundle-version="12.0.2",
- org.eclipse.jetty.io;bundle-version="12.0.2",
- org.eclipse.jetty.xml;bundle-version="12.0.2",
+ org.eclipse.birt.report.designer.core;bundle-version="4.16.0",
+ org.eclipse.jetty.server;bundle-version="12.0.9",
+ org.eclipse.jetty.http;bundle-version="12.0.9",
+ org.eclipse.jetty.osgi;bundle-version="12.0.9",
+ org.eclipse.jetty.deploy;bundle-version="12.0.9",
+ org.eclipse.jetty.io;bundle-version="12.0.9",
+ org.eclipse.jetty.xml;bundle-version="12.0.9",
  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.util;bundle-version="12.0.9",
+ org.eclipse.jetty.ee10.webapp;bundle-version="12.0.9",
+ org.eclipse.jetty.ee10.plus;bundle-version="12.0.9",
+ org.eclipse.jetty.ee10.servlet;bundle-version="12.0.9",
+ org.eclipse.jetty.ee10.apache-jsp;bundle-version="12.0.9",
+ 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/...report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/context/BaseAttributeBean.java b/...report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/context/BaseAttributeBean.java
@@ -18,8 +18,6 @@
 import java.util.Map;
 import java.util.TimeZone;
 
-import javax.servlet.http.HttpServletRequest;
-
 import org.eclipse.birt.report.engine.api.IReportRunnable;
 import org.eclipse.birt.report.engine.api.ReportParameterConverter;
 import org.eclipse.birt.report.model.api.ReportDesignHandle;
@@ -29,6 +27,8 @@
 import org.eclipse.birt.report.service.api.ReportServiceException;
 import org.eclipse.birt.report.utility.ParameterAccessor;
 
+import jakarta.servlet.http.HttpServletRequest;
+
 /**
  * Data bean for viewing request. Birt viewer distributes process logic into
  * viewer fragments. Each fragment seperates its front-end and back-end process

diff --git a/....birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/context/BaseContext.java b/....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/....birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/context/BirtContext.java b/....birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/context/BirtContext.java
@@ -13,11 +13,11 @@
 
 package org.eclipse.birt.report.context;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.eclipse.birt.report.IBirtConstants;
 
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 public class BirtContext extends BaseContext {
 
 	/**

diff --git a/...pse.birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/context/IContext.java b/...pse.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/...port.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/context/ViewerAttributeBean.java b/...port.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/context/ViewerAttributeBean.java
@@ -25,8 +25,6 @@
 import java.util.Map;
 import java.util.Set;
 
-import javax.servlet.http.HttpServletRequest;
-
 import org.eclipse.birt.report.IBirtConstants;
 import org.eclipse.birt.report.engine.api.EngineException;
 import org.eclipse.birt.report.engine.api.IReportDocument;
@@ -57,6 +55,8 @@
 
 import com.ibm.icu.util.ULocale;
 
+import jakarta.servlet.http.HttpServletRequest;
+
 /**
  * Data bean for viewing request. Birt viewer distributes process logic into
  * viewer fragments. Each fragment seperates its front-end and back-end process

diff --git a/....birt.report.viewer/birt/WEB-INF/classes/org/eclipse/birt/report/filter/ViewerFilter.java b/....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/...ewer/birt/WEB-INF/classes/org/eclipse/birt/report/listener/ViewerHttpSessionListener.java b/...ewer/birt/WEB-INF/classes/org/eclipse/birt/report/listener/ViewerHttpSessionListener.java
@@ -15,12 +15,12 @@
 
 import java.util.HashMap;
 
-import javax.servlet.http.HttpSession;
-import javax.servlet.http.HttpSessionEvent;
-import javax.servlet.http.HttpSessionListener;
-
 import org.eclipse.birt.report.IBirtConstants;
 
+import jakarta.servlet.http.HttpSession;
+import jakarta.servlet.http.HttpSessionEvent;
+import jakarta.servlet.http.HttpSessionListener;
+
 /**
  * HttpSession Listener for BIRT viewer web application. Do some necessary jobs
  * when create a new HttpSession or destroy it.
@@ -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/...r/birt/WEB-INF/classes/org/eclipse/birt/report/listener/ViewerServletContextListener.java b/...r/birt/WEB-INF/classes/org/eclipse/birt/report/listener/ViewerServletContextListener.java
@@ -13,9 +13,6 @@
 
 package org.eclipse.birt.report.listener;
 
-import javax.servlet.ServletContextEvent;
-import javax.servlet.ServletContextListener;
-
 import org.eclipse.birt.core.exception.BirtException;
 import org.eclipse.birt.core.framework.Platform;
 import org.eclipse.birt.report.service.BirtReportServiceFactory;
@@ -24,6 +21,9 @@
 import org.eclipse.birt.report.service.api.IViewerReportService;
 import org.eclipse.birt.report.utility.ParameterAccessor;
 
+import jakarta.servlet.ServletContextEvent;
+import jakarta.servlet.ServletContextListener;
+
 /**
  * Servlet Context Listener for BIRT viewer web application. Do some necessary
  * jobs when web application servelt loading it or destroying it.
@@ -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,8 @@ 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/...EB-INF/classes/org/eclipse/birt/report/presentation/aggregation/AbstractBaseFragment.java b/...EB-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/...rt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/BirtBaseFragment.java b/...rt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/BirtBaseFragment.java
@@ -15,13 +15,13 @@
 
 import java.io.IOException;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.eclipse.birt.report.service.BirtReportServiceFactory;
 import org.eclipse.birt.report.service.api.IViewerReportService;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 /**
  * Base implementation of fragment interface.
  * <p>

diff --git a/...ewer/birt/WEB-INF/classes/org/eclipse/birt/report/presentation/aggregation/IFragment.java b/...ewer/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/...classes/org/eclipse/birt/report/presentation/aggregation/control/BaseControlFragment.java b/...classes/org/eclipse/birt/report/presentation/aggregation/control/BaseControlFragment.java
@@ -15,12 +15,12 @@
 
 import java.io.IOException;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.eclipse.birt.report.presentation.aggregation.BirtBaseFragment;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 /**
  * Fragment for report tool bar.
  * <p>

diff --git a/...F/classes/org/eclipse/birt/report/presentation/aggregation/dialog/BaseDialogFragment.java b/...F/classes/org/eclipse/birt/report/presentation/aggregation/dialog/BaseDialogFragment.java
@@ -15,12 +15,12 @@
 
 import java.io.IOException;
 
-import javax.servlet.ServletException;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
 import org.eclipse.birt.report.presentation.aggregation.BirtBaseFragment;
 
+import jakarta.servlet.ServletException;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletResponse;
+
 /**
  * Fragment for report tool bar.
  * <p>