Move code to jakarta namespace and update dependencies to use Jakarta…

… EE 9.1
ipb-halle · Oct 23, 2024 · 8f83cf1 · 8f83cf1
1 parent 5620224
commit 8f83cf1
Show file tree

Hide file tree

Showing 11 changed files with 39 additions and 41 deletions.
diff --git a/MetFragWeb/src/main/java/de/ipbhalle/metfragweb/container/AvailableParameters.java b/MetFragWeb/src/main/java/de/ipbhalle/metfragweb/container/AvailableParameters.java
@@ -1,14 +1,12 @@
 package de.ipbhalle.metfragweb.container;
 
 import java.io.File;
-import java.nio.file.Files;
-import java.nio.file.Paths;
 import java.util.Arrays;
 import java.util.Comparator;
 import java.util.Hashtable;
 
-import javax.faces.model.SelectItem;
-import javax.faces.model.SelectItemGroup;
+import jakarta.faces.model.SelectItem;
+import jakarta.faces.model.SelectItemGroup;
 
 import de.ipbhalle.metfraglib.parameter.ClassNames;
 import de.ipbhalle.metfraglib.parameter.Constants;

diff --git a/MetFragWeb/src/main/java/de/ipbhalle/metfragweb/container/BeanSettingsContainer.java b/MetFragWeb/src/main/java/de/ipbhalle/metfragweb/container/BeanSettingsContainer.java
@@ -6,9 +6,9 @@
 import java.util.HashMap;
 import java.util.List;
 
-import javax.faces.context.FacesContext;
-import javax.faces.model.SelectItem;
-import javax.servlet.ServletContext;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.model.SelectItem;
+import jakarta.servlet.ServletContext;
 
 import org.apache.log4j.Level;
 import org.primefaces.model.chart.AxisType;

diff --git a/MetFragWeb/src/main/java/de/ipbhalle/metfragweb/controller/CompareSpectraD3JSBean.java b/MetFragWeb/src/main/java/de/ipbhalle/metfragweb/controller/CompareSpectraD3JSBean.java
@@ -4,14 +4,14 @@
 import java.io.IOException;
 import java.util.Random;
 
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.SessionScoped;
-import javax.faces.context.FacesContext;
-import javax.faces.event.ActionEvent;
+import jakarta.faces.bean.ManagedBean;
+import jakarta.faces.bean.SessionScoped;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.event.ActionEvent;
 import javax.imageio.ImageIO;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
+import jakarta.servlet.ServletContext;
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
 
 import org.apache.commons.io.FileUtils;
 import org.openscience.cdk.exception.CDKException;

diff --git a/MetFragWeb/src/main/java/de/ipbhalle/metfragweb/controller/MetFragLandingBean.java b/MetFragWeb/src/main/java/de/ipbhalle/metfragweb/controller/MetFragLandingBean.java
@@ -1,15 +1,15 @@
 package de.ipbhalle.metfragweb.controller;
 
-import javax.annotation.PostConstruct;
-import javax.faces.bean.ManagedBean;
-import javax.faces.bean.RequestScoped;
-import javax.faces.context.FacesContext;
+import jakarta.annotation.PostConstruct;
+import jakarta.faces.bean.ManagedBean;
+import jakarta.faces.bean.RequestScoped;
+import jakarta.faces.context.FacesContext;
 
 import de.ipbhalle.metfraglib.parameter.Constants;
 import de.ipbhalle.metfraglib.parameter.VariableNames;
 import de.ipbhalle.metfragweb.datatype.Parameter;
 
-import javax.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpServletRequest;
 
 import org.primefaces.PrimeFaces;
 

diff --git a/MetFragWeb/src/main/java/de/ipbhalle/metfragweb/datatype/AvailableScore.java b/MetFragWeb/src/main/java/de/ipbhalle/metfragweb/datatype/AvailableScore.java
@@ -2,7 +2,7 @@
 
 import java.io.Serializable;
 
-import javax.faces.model.SelectItem;
+import jakarta.faces.model.SelectItem;
 
 public class AvailableScore extends SelectItem implements Serializable, Comparable<AvailableScore> {
 

diff --git a/MetFragWeb/src/main/java/de/ipbhalle/metfragweb/datatype/CandidateStatistics.java b/MetFragWeb/src/main/java/de/ipbhalle/metfragweb/datatype/CandidateStatistics.java
@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import javax.faces.model.SelectItem;
+import jakarta.faces.model.SelectItem;
 
 import org.primefaces.model.chart.AxisType;
 import org.primefaces.model.chart.LineChartModel;

diff --git a/MetFragWeb/src/main/java/de/ipbhalle/metfragweb/datatype/DownloadResource.java b/MetFragWeb/src/main/java/de/ipbhalle/metfragweb/datatype/DownloadResource.java
@@ -7,8 +7,8 @@
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.faces.application.Resource;
-import javax.faces.context.FacesContext;
+import jakarta.faces.application.Resource;
+import jakarta.faces.context.FacesContext;
 
 public class DownloadResource extends Resource implements java.io.Serializable {
 

diff --git a/MetFragWeb/src/main/java/de/ipbhalle/metfragweb/validator/DoubleValueValidator.java b/MetFragWeb/src/main/java/de/ipbhalle/metfragweb/validator/DoubleValueValidator.java
@@ -1,10 +1,10 @@
 package de.ipbhalle.metfragweb.validator;
 
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.validator.Validator;
-import javax.faces.validator.ValidatorException;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.validator.Validator;
+import jakarta.faces.validator.ValidatorException;
 
 public class DoubleValueValidator implements Validator {
 

diff --git a/MetFragWeb/src/main/java/de/ipbhalle/metfragweb/validator/ElementsValidator.java b/MetFragWeb/src/main/java/de/ipbhalle/metfragweb/validator/ElementsValidator.java
@@ -1,10 +1,10 @@
 package de.ipbhalle.metfragweb.validator;
 
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.validator.Validator;
-import javax.faces.validator.ValidatorException;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.validator.Validator;
+import jakarta.faces.validator.ValidatorException;
 
 import de.ipbhalle.metfraglib.parameter.Constants;
 

diff --git a/MetFragWeb/src/main/java/de/ipbhalle/metfragweb/validator/FormulaValidator.java b/MetFragWeb/src/main/java/de/ipbhalle/metfragweb/validator/FormulaValidator.java
@@ -1,10 +1,10 @@
 package de.ipbhalle.metfragweb.validator;
 
-import javax.faces.application.FacesMessage;
-import javax.faces.component.UIComponent;
-import javax.faces.context.FacesContext;
-import javax.faces.validator.Validator;
-import javax.faces.validator.ValidatorException;
+import jakarta.faces.application.FacesMessage;
+import jakarta.faces.component.UIComponent;
+import jakarta.faces.context.FacesContext;
+import jakarta.faces.validator.Validator;
+import jakarta.faces.validator.ValidatorException;
 
 import de.ipbhalle.metfraglib.molecularformula.ByteMolecularFormula;
 

diff --git a/MetFragWeb/src/main/webapp/includes/dialogs/feedbackButtonDialog.xhtml b/MetFragWeb/src/main/webapp/includes/dialogs/feedbackButtonDialog.xhtml
@@ -1,4 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" 
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
           "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 	xmlns:ui="http://java.sun.com/jsf/facelets"
@@ -11,14 +11,14 @@
 		<h:form>
 			<p:commandLink actionListener="#{metFragWebBean.feedbackButtonListener}" update="feedbackDialogForm:feedbackDialog"
 				oncomplete="PF('feedbackDialog').show();">
-       			<p:graphicImage url="#{resource['images/feedback.png']}" />
+       			<p:graphicImage name="images/feedback.png" />
    			</p:commandLink>
   		</h:form>
    	</h:panelGroup>
    	<h:panelGroup styleClass="about" layout="block">
 		<h:form>
 			<p:commandLink oncomplete="PF('aboutDialog').show();">
-       			<p:graphicImage url="#{resource['images/about.png']}" />
+       			<p:graphicImage name="images/about.png" />
    			</p:commandLink>
   		</h:form>
    	</h:panelGroup>