diff --git a/deegree-client/deegree-jsf-core/pom.xml b/deegree-client/deegree-jsf-core/pom.xml index 81254f2a9f..59b6c1622a 100644 --- a/deegree-client/deegree-jsf-core/pom.xml +++ b/deegree-client/deegree-jsf-core/pom.xml @@ -60,40 +60,42 @@ ${project.version} - javax.servlet - javax.servlet-api + jakarta.enterprise + jakarta.enterprise.cdi-api - javax.servlet - jstl + jakarta.servlet + jakarta.servlet-api - javax.faces - javax.faces-api + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + - commons-io - commons-io + jakarta.el + jakarta.el-api - commons-fileupload - commons-fileupload + org.glassfish + jakarta.faces - junit - junit + commons-io + commons-io - javax.el - javax.el-api + org.apache.commons + commons-fileupload2-jakarta-servlet6 - javax.servlet.jsp - javax.servlet.jsp-api + junit + junit diff --git a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/component/HtmlAjaxStatus.java b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/component/HtmlAjaxStatus.java index 4e5e2a5dac..953cd4f3c2 100644 --- a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/component/HtmlAjaxStatus.java +++ b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/component/HtmlAjaxStatus.java @@ -34,10 +34,10 @@ ----------------------------------------------------------------------------*/ package org.deegree.client.core.component; -import javax.faces.application.ResourceDependencies; -import javax.faces.application.ResourceDependency; -import javax.faces.component.FacesComponent; -import javax.faces.component.UIComponentBase; +import jakarta.faces.application.ResourceDependencies; +import jakarta.faces.application.ResourceDependency; +import jakarta.faces.component.FacesComponent; +import jakarta.faces.component.UIComponentBase; import org.deegree.client.core.utils.MessageUtils; diff --git a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/component/HtmlExternalLink.java b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/component/HtmlExternalLink.java index bf69da786f..b1fb1244cc 100644 --- a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/component/HtmlExternalLink.java +++ b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/component/HtmlExternalLink.java @@ -34,8 +34,8 @@ ----------------------------------------------------------------------------*/ package org.deegree.client.core.component; -import javax.faces.component.FacesComponent; -import javax.faces.component.UICommand; +import jakarta.faces.component.FacesComponent; +import jakarta.faces.component.UICommand; /** * HtmlExternalLink a link component ignoring the JSF navigation diff --git a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/component/HtmlFieldset.java b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/component/HtmlFieldset.java index dfaf9c742e..c36aef2842 100644 --- a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/component/HtmlFieldset.java +++ b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/component/HtmlFieldset.java @@ -34,8 +34,8 @@ ----------------------------------------------------------------------------*/ package org.deegree.client.core.component; -import javax.faces.component.FacesComponent; -import javax.faces.component.UIPanel; +import jakarta.faces.component.FacesComponent; +import jakarta.faces.component.UIPanel; /** * TODO add class documentation here diff --git a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/component/HtmlInputBBox.java b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/component/HtmlInputBBox.java index fecb353829..a426ed2980 100644 --- a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/component/HtmlInputBBox.java +++ b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/component/HtmlInputBBox.java @@ -34,11 +34,11 @@ ----------------------------------------------------------------------------*/ package org.deegree.client.core.component; -import javax.faces.FacesException; -import javax.faces.application.FacesMessage; -import javax.faces.component.FacesComponent; -import javax.faces.component.UISelectOne; -import javax.faces.context.FacesContext; +import jakarta.faces.FacesException; +import jakarta.faces.application.FacesMessage; +import jakarta.faces.component.FacesComponent; +import jakarta.faces.component.UISelectOne; +import jakarta.faces.context.FacesContext; import org.deegree.client.core.model.BBox; import org.deegree.client.core.utils.MessageUtils; diff --git a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/component/HtmlInputConfigurationXML.java b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/component/HtmlInputConfigurationXML.java index e563c56cbf..2bf1e54e0f 100644 --- a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/component/HtmlInputConfigurationXML.java +++ b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/component/HtmlInputConfigurationXML.java @@ -42,11 +42,11 @@ import java.util.ArrayList; import java.util.List; -import javax.faces.application.FacesMessage; -import javax.faces.component.FacesComponent; -import javax.faces.component.html.HtmlInputTextarea; -import javax.faces.context.FacesContext; -import javax.faces.convert.ConverterException; +import jakarta.faces.application.FacesMessage; +import jakarta.faces.component.FacesComponent; +import jakarta.faces.component.html.HtmlInputTextarea; +import jakarta.faces.context.FacesContext; +import jakarta.faces.convert.ConverterException; import org.deegree.client.core.utils.MessageUtils; import org.deegree.commons.xml.schema.SchemaValidationEvent; diff --git a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/component/HtmlInputFile.java b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/component/HtmlInputFile.java index 4ab9838416..f627636365 100644 --- a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/component/HtmlInputFile.java +++ b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/component/HtmlInputFile.java @@ -34,11 +34,11 @@ ----------------------------------------------------------------------------*/ package org.deegree.client.core.component; -import javax.faces.application.FacesMessage; -import javax.faces.component.FacesComponent; -import javax.faces.component.UIInput; -import javax.faces.component.behavior.ClientBehaviorHolder; -import javax.faces.context.FacesContext; +import jakarta.faces.application.FacesMessage; +import jakarta.faces.component.FacesComponent; +import jakarta.faces.component.UIInput; +import jakarta.faces.component.behavior.ClientBehaviorHolder; +import jakarta.faces.context.FacesContext; import org.deegree.client.core.model.UploadedFile; import org.deegree.client.core.utils.MessageUtils; diff --git a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/component/HtmlInputMultiple.java b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/component/HtmlInputMultiple.java index 731c4193a7..86b09d9ea6 100644 --- a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/component/HtmlInputMultiple.java +++ b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/component/HtmlInputMultiple.java @@ -37,13 +37,13 @@ import java.util.ArrayList; import java.util.List; -import javax.faces.FacesException; -import javax.faces.application.ResourceDependencies; -import javax.faces.application.ResourceDependency; -import javax.faces.component.FacesComponent; -import javax.faces.component.UIInput; -import javax.faces.component.behavior.ClientBehaviorHolder; -import javax.faces.component.html.HtmlInputText; +import jakarta.faces.FacesException; +import jakarta.faces.application.ResourceDependencies; +import jakarta.faces.application.ResourceDependency; +import jakarta.faces.component.FacesComponent; +import jakarta.faces.component.UIInput; +import jakarta.faces.component.behavior.ClientBehaviorHolder; +import jakarta.faces.component.html.HtmlInputText; import com.sun.faces.util.Util; diff --git a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/component/HtmlInputMultipleText.java b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/component/HtmlInputMultipleText.java index e1afdf68fe..5d318eae47 100644 --- a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/component/HtmlInputMultipleText.java +++ b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/component/HtmlInputMultipleText.java @@ -36,11 +36,11 @@ import java.util.List; -import javax.faces.FacesException; -import javax.faces.application.ResourceDependencies; -import javax.faces.application.ResourceDependency; -import javax.faces.component.FacesComponent; -import javax.faces.component.UIInput; +import jakarta.faces.FacesException; +import jakarta.faces.application.ResourceDependencies; +import jakarta.faces.application.ResourceDependency; +import jakarta.faces.component.FacesComponent; +import jakarta.faces.component.UIInput; /** * Input component which allows multiple insert. diff --git a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/component/HtmlOutputXML.java b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/component/HtmlOutputXML.java index 9d3c23a538..1cc195d190 100644 --- a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/component/HtmlOutputXML.java +++ b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/component/HtmlOutputXML.java @@ -34,9 +34,9 @@ ----------------------------------------------------------------------------*/ package org.deegree.client.core.component; -import javax.faces.application.ResourceDependency; -import javax.faces.component.FacesComponent; -import javax.faces.component.UIOutput; +import jakarta.faces.application.ResourceDependency; +import jakarta.faces.component.FacesComponent; +import jakarta.faces.component.UIOutput; import org.deegree.client.core.utils.MessageUtils; diff --git a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/debug/DebugPhaseListener.java b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/debug/DebugPhaseListener.java index 3e89e24704..8bea25c6f7 100644 --- a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/debug/DebugPhaseListener.java +++ b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/debug/DebugPhaseListener.java @@ -37,9 +37,9 @@ import static org.slf4j.LoggerFactory.getLogger; -import javax.faces.event.PhaseEvent; -import javax.faces.event.PhaseId; -import javax.faces.event.PhaseListener; +import jakarta.faces.event.PhaseEvent; +import jakarta.faces.event.PhaseId; +import jakarta.faces.event.PhaseListener; import org.slf4j.Logger; diff --git a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/debug/ParameterPhaseListener.java b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/debug/ParameterPhaseListener.java index f8413229c7..f13a779bf7 100644 --- a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/debug/ParameterPhaseListener.java +++ b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/debug/ParameterPhaseListener.java @@ -39,10 +39,10 @@ import java.util.Map; -import javax.faces.context.FacesContext; -import javax.faces.event.PhaseEvent; -import javax.faces.event.PhaseId; -import javax.faces.event.PhaseListener; +import jakarta.faces.context.FacesContext; +import jakarta.faces.event.PhaseEvent; +import jakarta.faces.event.PhaseId; +import jakarta.faces.event.PhaseListener; import org.slf4j.Logger; diff --git a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/filter/EncodingFilter.java b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/filter/EncodingFilter.java index 7b9acec81c..fb602e4d36 100644 --- a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/filter/EncodingFilter.java +++ b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/filter/EncodingFilter.java @@ -16,12 +16,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; import org.slf4j.Logger; diff --git a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/filter/InputFileFilter.java b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/filter/InputFileFilter.java index 214c82e456..0cf079e015 100644 --- a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/filter/InputFileFilter.java +++ b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/filter/InputFileFilter.java @@ -36,15 +36,15 @@ 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 javax.servlet.http.HttpServletRequest; +import jakarta.servlet.Filter; +import jakarta.servlet.FilterChain; +import jakarta.servlet.FilterConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.ServletResponse; +import jakarta.servlet.http.HttpServletRequest; -import org.apache.commons.fileupload.servlet.ServletFileUpload; +import org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletFileUpload; /** * @@ -63,7 +63,7 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha throws IOException, ServletException { if ((request instanceof HttpServletRequest)) { HttpServletRequest httpRequest = (HttpServletRequest) request; - if (ServletFileUpload.isMultipartContent(httpRequest)) { + if (JakartaServletFileUpload.isMultipartContent(httpRequest)) { request = new InputFileWrapper(httpRequest); } } diff --git a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/filter/InputFileWrapper.java b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/filter/InputFileWrapper.java index 0760ee294d..5d5e161228 100644 --- a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/filter/InputFileWrapper.java +++ b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/filter/InputFileWrapper.java @@ -34,21 +34,23 @@ ----------------------------------------------------------------------------*/ package org.deegree.client.core.filter; +import java.io.IOException; import java.io.UnsupportedEncodingException; +import java.nio.charset.Charset; import java.util.Collections; import java.util.Enumeration; import java.util.HashMap; import java.util.List; import java.util.Map; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; -import org.apache.commons.fileupload.FileItem; -import org.apache.commons.fileupload.FileUploadException; -import org.apache.commons.fileupload.disk.DiskFileItemFactory; -import org.apache.commons.fileupload.servlet.ServletFileUpload; +import org.apache.commons.fileupload2.core.FileItem; +import org.apache.commons.fileupload2.core.FileUploadException; +import org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletDiskFileUpload; +import org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletFileUpload; /** * TODO add class documentation here @@ -63,9 +65,7 @@ public class InputFileWrapper extends HttpServletRequestWrapper { public InputFileWrapper(HttpServletRequest request) throws ServletException { super(request); try { - ServletFileUpload upload = new ServletFileUpload(); - DiskFileItemFactory factory = new DiskFileItemFactory(); - upload.setFileItemFactory(factory); + JakartaServletFileUpload upload = new JakartaServletDiskFileUpload(); String encoding = request.getCharacterEncoding(); List fileItems = upload.parseRequest(request); formParameters = new HashMap(); @@ -75,7 +75,7 @@ public InputFileWrapper(HttpServletRequest request) throws ServletException { String[] values; String v; if (encoding != null) { - v = item.getString(encoding); + v = item.getString(Charset.forName(encoding)); } else { v = item.getString(); @@ -99,13 +99,15 @@ else if (item.getName() != null && item.getName().length() > 0 && item.getSize() } } catch (FileUploadException fe) { - ServletException servletEx = new ServletException(); - servletEx.initCause(fe); + ServletException servletEx = new ServletException(fe); throw servletEx; } catch (UnsupportedEncodingException e) { - ServletException servletEx = new ServletException(); - servletEx.initCause(e); + ServletException servletEx = new ServletException(e); + throw servletEx; + } + catch (IOException e) { + ServletException servletEx = new ServletException(e); throw servletEx; } } diff --git a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/model/UploadedFile.java b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/model/UploadedFile.java index ff3a8b794d..c32993f68a 100644 --- a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/model/UploadedFile.java +++ b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/model/UploadedFile.java @@ -38,7 +38,7 @@ import java.io.Serializable; import java.net.URL; -import org.apache.commons.fileupload.FileItem; +import org.apache.commons.fileupload2.core.FileItem; /** * UploadedFile wraps the uploaded file item diff --git a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/renderer/AjaxStatusRenderer.java b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/renderer/AjaxStatusRenderer.java index e5e04d2ab2..5a1e08fae7 100644 --- a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/renderer/AjaxStatusRenderer.java +++ b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/renderer/AjaxStatusRenderer.java @@ -36,11 +36,11 @@ import java.io.IOException; -import javax.faces.application.Resource; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; -import javax.faces.render.FacesRenderer; +import jakarta.faces.application.Resource; +import jakarta.faces.component.UIComponent; +import jakarta.faces.context.FacesContext; +import jakarta.faces.context.ResponseWriter; +import jakarta.faces.render.FacesRenderer; import org.deegree.client.core.component.HtmlAjaxStatus; diff --git a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/renderer/ExternalLinkRenderer.java b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/renderer/ExternalLinkRenderer.java index badcb61a7c..fdeae423fc 100644 --- a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/renderer/ExternalLinkRenderer.java +++ b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/renderer/ExternalLinkRenderer.java @@ -36,11 +36,11 @@ import java.io.IOException; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; -import javax.faces.render.FacesRenderer; -import javax.faces.render.Renderer; +import jakarta.faces.component.UIComponent; +import jakarta.faces.context.FacesContext; +import jakarta.faces.context.ResponseWriter; +import jakarta.faces.render.FacesRenderer; +import jakarta.faces.render.Renderer; import org.deegree.client.core.component.HtmlExternalLink; diff --git a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/renderer/FieldsetRenderer.java b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/renderer/FieldsetRenderer.java index 9cf75e0595..f7acd656c6 100644 --- a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/renderer/FieldsetRenderer.java +++ b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/renderer/FieldsetRenderer.java @@ -36,11 +36,11 @@ import java.io.IOException; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; -import javax.faces.render.FacesRenderer; -import javax.faces.render.Renderer; +import jakarta.faces.component.UIComponent; +import jakarta.faces.context.FacesContext; +import jakarta.faces.context.ResponseWriter; +import jakarta.faces.render.FacesRenderer; +import jakarta.faces.render.Renderer; import org.deegree.client.core.component.HtmlFieldset; diff --git a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/renderer/InputBBoxRenderer.java b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/renderer/InputBBoxRenderer.java index 1f2e72ede3..7a267262cc 100644 --- a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/renderer/InputBBoxRenderer.java +++ b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/renderer/InputBBoxRenderer.java @@ -39,22 +39,21 @@ import java.io.IOException; import java.text.NumberFormat; import java.text.ParseException; -import java.util.Iterator; import java.util.Map; -import javax.faces.component.UIComponent; -import javax.faces.component.UIInput; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; -import javax.faces.convert.ConverterException; -import javax.faces.model.SelectItem; -import javax.faces.render.FacesRenderer; +import jakarta.faces.component.UIComponent; +import jakarta.faces.component.UIInput; +import jakarta.faces.context.FacesContext; +import jakarta.faces.context.ResponseWriter; +import jakarta.faces.convert.ConverterException; +import jakarta.faces.model.SelectItem; +import jakarta.faces.render.FacesRenderer; -import com.sun.faces.renderkit.SelectItemsIterator; import org.deegree.client.core.component.HtmlInputBBox; import org.deegree.client.core.model.BBox; import org.slf4j.Logger; +import com.sun.faces.renderkit.SelectItemsIterator; import com.sun.faces.renderkit.RenderKitUtils; import com.sun.faces.renderkit.html_basic.MenuRenderer; diff --git a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/renderer/InputFileRenderer.java b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/renderer/InputFileRenderer.java index 37536e66d0..0110d07bea 100644 --- a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/renderer/InputFileRenderer.java +++ b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/renderer/InputFileRenderer.java @@ -39,19 +39,19 @@ import java.net.MalformedURLException; import java.net.URL; -import javax.faces.application.ResourceDependencies; -import javax.faces.application.ResourceDependency; -import javax.faces.component.UIComponent; -import javax.faces.context.ExternalContext; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; -import javax.faces.convert.ConverterException; -import javax.faces.render.FacesRenderer; -import javax.faces.render.Renderer; -import javax.servlet.ServletContext; -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.fileupload.FileItem; +import jakarta.faces.application.ResourceDependencies; +import jakarta.faces.application.ResourceDependency; +import jakarta.faces.component.UIComponent; +import jakarta.faces.context.ExternalContext; +import jakarta.faces.context.FacesContext; +import jakarta.faces.context.ResponseWriter; +import jakarta.faces.convert.ConverterException; +import jakarta.faces.render.FacesRenderer; +import jakarta.faces.render.Renderer; +import jakarta.servlet.ServletContext; +import jakarta.servlet.http.HttpServletRequest; + +import org.apache.commons.fileupload2.core.FileItem; import org.deegree.client.core.component.HtmlInputFile; import org.deegree.client.core.model.UploadedFile; import org.deegree.commons.utils.TempFileManager; @@ -110,7 +110,7 @@ public void decode(FacesContext context, UIComponent component) { URL url = getUrl(request, target, item.getName()); ServletContext sc = (ServletContext) external.getContext(); File file = getTargetFile(sc, target, item.getName()); - item.write(file); + item.write(file.toPath()); uploadedFile.setFileItem(item); uploadedFile.setUrl(url); uploadedFile.setAbsolutePath(file.getAbsolutePath()); diff --git a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/renderer/InputMultipleRenderer.java b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/renderer/InputMultipleRenderer.java index d4f14c5380..6332ea6f79 100644 --- a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/renderer/InputMultipleRenderer.java +++ b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/renderer/InputMultipleRenderer.java @@ -39,13 +39,13 @@ import java.util.List; import java.util.Map; -import javax.faces.component.UIComponent; -import javax.faces.component.UIInput; -import javax.faces.context.ExternalContext; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; -import javax.faces.render.FacesRenderer; -import javax.faces.render.Renderer; +import jakarta.faces.component.UIComponent; +import jakarta.faces.component.UIInput; +import jakarta.faces.context.ExternalContext; +import jakarta.faces.context.FacesContext; +import jakarta.faces.context.ResponseWriter; +import jakarta.faces.render.FacesRenderer; +import jakarta.faces.render.Renderer; import org.deegree.client.core.component.HtmlInputMultiple; import org.deegree.client.core.utils.JavaScriptUtils; diff --git a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/renderer/InputMultipleTextRenderer.java b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/renderer/InputMultipleTextRenderer.java index 4a6df1865c..3b8f885bbb 100644 --- a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/renderer/InputMultipleTextRenderer.java +++ b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/renderer/InputMultipleTextRenderer.java @@ -39,12 +39,12 @@ import java.util.List; import java.util.Map; -import javax.faces.component.UIComponent; -import javax.faces.context.ExternalContext; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; -import javax.faces.render.FacesRenderer; -import javax.faces.render.Renderer; +import jakarta.faces.component.UIComponent; +import jakarta.faces.context.ExternalContext; +import jakarta.faces.context.FacesContext; +import jakarta.faces.context.ResponseWriter; +import jakarta.faces.render.FacesRenderer; +import jakarta.faces.render.Renderer; import org.deegree.client.core.component.HtmlInputMultiple; import org.deegree.client.core.component.HtmlInputMultipleText; diff --git a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/renderer/OutputXMLRenderer.java b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/renderer/OutputXMLRenderer.java index 312d759529..ad8dfd03da 100644 --- a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/renderer/OutputXMLRenderer.java +++ b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/renderer/OutputXMLRenderer.java @@ -44,11 +44,11 @@ import java.net.URL; import java.util.UUID; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; -import javax.faces.render.FacesRenderer; -import javax.faces.render.Renderer; +import jakarta.faces.component.UIComponent; +import jakarta.faces.context.FacesContext; +import jakarta.faces.context.ResponseWriter; +import jakarta.faces.render.FacesRenderer; +import jakarta.faces.render.Renderer; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamReader; diff --git a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/utils/ActionParams.java b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/utils/ActionParams.java index 1bd6dc3798..7141b930b0 100644 --- a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/utils/ActionParams.java +++ b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/utils/ActionParams.java @@ -34,9 +34,10 @@ ----------------------------------------------------------------------------*/ package org.deegree.client.core.utils; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.RequestScoped; -import javax.faces.context.FacesContext; +import jakarta.enterprise.context.RequestScoped; +import jakarta.faces.context.FacesContext; +import jakarta.inject.Named; + import java.io.Serializable; /** @@ -45,7 +46,7 @@ * * @author Markus Schneider */ -@ManagedBean(name = "actionParams") +@Named("actionParams") @RequestScoped public class ActionParams implements Serializable { diff --git a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/utils/FacesUtils.java b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/utils/FacesUtils.java index a78542bad6..6c440c8c70 100644 --- a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/utils/FacesUtils.java +++ b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/utils/FacesUtils.java @@ -39,8 +39,8 @@ import java.net.MalformedURLException; import java.net.URL; -import javax.faces.context.ExternalContext; -import javax.faces.context.FacesContext; +import jakarta.faces.context.ExternalContext; +import jakarta.faces.context.FacesContext; import org.slf4j.Logger; diff --git a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/utils/MessageUtils.java b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/utils/MessageUtils.java index 14e49383ec..4268037a7c 100644 --- a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/utils/MessageUtils.java +++ b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/utils/MessageUtils.java @@ -39,8 +39,8 @@ import java.util.MissingResourceException; import java.util.ResourceBundle; -import javax.faces.application.FacesMessage; -import javax.faces.context.FacesContext; +import jakarta.faces.application.FacesMessage; +import jakarta.faces.context.FacesContext; /** * MessageUtils diff --git a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/utils/RendererUtils.java b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/utils/RendererUtils.java index 804ce5d576..4cd535b128 100644 --- a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/utils/RendererUtils.java +++ b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/utils/RendererUtils.java @@ -36,9 +36,9 @@ import java.io.IOException; -import javax.faces.application.Resource; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; +import jakarta.faces.application.Resource; +import jakarta.faces.context.FacesContext; +import jakarta.faces.context.ResponseWriter; /** * TODO add class documentation here diff --git a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/utils/SQLExecution.java b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/utils/SQLExecution.java index d7d1224da5..ad50fa2a8b 100644 --- a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/utils/SQLExecution.java +++ b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/utils/SQLExecution.java @@ -34,16 +34,16 @@ ----------------------------------------------------------------------------*/ package org.deegree.client.core.utils; -import static javax.faces.application.FacesMessage.SEVERITY_ERROR; -import static javax.faces.application.FacesMessage.SEVERITY_INFO; +import static jakarta.faces.application.FacesMessage.SEVERITY_ERROR; +import static jakarta.faces.application.FacesMessage.SEVERITY_INFO; import java.io.Serializable; import java.sql.Connection; import java.sql.SQLException; import java.sql.Statement; -import javax.faces.application.FacesMessage; -import javax.faces.context.FacesContext; +import jakarta.faces.application.FacesMessage; +import jakarta.faces.context.FacesContext; import org.deegree.commons.utils.JDBCUtils; import org.deegree.db.ConnectionProvider; diff --git a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/validator/FileMimeTypeValidator.java b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/validator/FileMimeTypeValidator.java index db2242576e..670cba1e94 100644 --- a/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/validator/FileMimeTypeValidator.java +++ b/deegree-client/deegree-jsf-core/src/main/java/org/deegree/client/core/validator/FileMimeTypeValidator.java @@ -35,16 +35,16 @@ package org.deegree.client.core.validator; import jakarta.activation.MimetypesFileTypeMap; +import jakarta.faces.application.FacesMessage; +import jakarta.faces.component.UIComponent; +import jakarta.faces.context.FacesContext; +import jakarta.faces.validator.FacesValidator; +import jakarta.faces.validator.Validator; +import jakarta.faces.validator.ValidatorException; + import java.util.ArrayList; import java.util.List; -import javax.faces.application.FacesMessage; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.validator.FacesValidator; -import javax.faces.validator.Validator; -import javax.faces.validator.ValidatorException; - import org.deegree.client.core.model.UploadedFile; import org.deegree.client.core.utils.MessageUtils; diff --git a/deegree-client/deegree-wps-webclient/pom.xml b/deegree-client/deegree-wps-webclient/pom.xml index 06d146bc9b..5c985f8e84 100644 --- a/deegree-client/deegree-wps-webclient/pom.xml +++ b/deegree-client/deegree-wps-webclient/pom.xml @@ -20,6 +20,14 @@ jakarta.annotation jakarta.annotation-api + + jakarta.enterprise + jakarta.enterprise.cdi-api + + + jakarta.el + jakarta.el-api + org.deegree deegree-protocol-commons @@ -30,9 +38,5 @@ deegree-jsf-core ${project.version} - - javax.el - javax.el-api - diff --git a/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/controller/ProcessExecuter.java b/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/controller/ProcessExecuter.java index 3cf8f37c38..57fcc45c64 100644 --- a/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/controller/ProcessExecuter.java +++ b/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/controller/ProcessExecuter.java @@ -42,8 +42,8 @@ import java.util.List; import java.util.Map; -import javax.faces.application.FacesMessage; -import javax.faces.context.FacesContext; +import jakarta.faces.application.FacesMessage; +import jakarta.faces.context.FacesContext; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamReader; diff --git a/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/ClientBean.java b/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/ClientBean.java index cd2a8917fe..e06a9f00d5 100644 --- a/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/ClientBean.java +++ b/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/ClientBean.java @@ -46,13 +46,13 @@ import java.util.Locale; import java.util.Map; -import javax.faces.application.FacesMessage; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ViewScoped; -import javax.faces.context.FacesContext; -import javax.faces.event.AbortProcessingException; -import javax.faces.event.AjaxBehaviorEvent; +import jakarta.faces.application.FacesMessage; +import jakarta.faces.context.FacesContext; +import jakarta.faces.event.AbortProcessingException; +import jakarta.faces.event.AjaxBehaviorEvent; +import jakarta.faces.view.ViewScoped; +import jakarta.inject.Named; import org.deegree.commons.ows.metadata.ServiceIdentification; import org.deegree.commons.tom.ows.CodeType; import org.deegree.commons.tom.ows.LanguageString; @@ -67,7 +67,7 @@ * * @author Lyn Buesching */ -@ManagedBean +@Named @ViewScoped public class ClientBean implements Serializable { diff --git a/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/ExecuteBean.java b/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/ExecuteBean.java index 16ea4c4a35..5a1c2fe5b8 100644 --- a/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/ExecuteBean.java +++ b/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/ExecuteBean.java @@ -43,11 +43,11 @@ import java.util.List; import java.util.Map; -import javax.faces.application.FacesMessage; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.RequestScoped; -import javax.faces.context.FacesContext; +import jakarta.enterprise.context.RequestScoped; +import jakarta.faces.application.FacesMessage; +import jakarta.faces.context.FacesContext; +import jakarta.inject.Named; import org.deegree.client.core.model.BBox; import org.deegree.client.core.model.UploadedFile; import org.deegree.commons.utils.StringPair; @@ -66,7 +66,7 @@ * * @author Lyn Buesching */ -@ManagedBean +@Named @RequestScoped public class ExecuteBean implements Serializable { diff --git a/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/FormBean.java b/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/FormBean.java index 5e75437275..944f241717 100644 --- a/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/FormBean.java +++ b/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/FormBean.java @@ -46,30 +46,30 @@ import java.util.Map; import java.util.UUID; -import javax.el.ExpressionFactory; -import javax.el.MethodExpression; -import javax.el.ValueExpression; -import javax.faces.application.FacesMessage; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.RequestScoped; -import javax.faces.component.UIComponent; -import javax.faces.component.UIParameter; -import javax.faces.component.UISelectItem; -import javax.faces.component.behavior.AjaxBehavior; -import javax.faces.component.html.HtmlCommandButton; -import javax.faces.component.html.HtmlForm; -import javax.faces.component.html.HtmlInputText; -import javax.faces.component.html.HtmlMessage; -import javax.faces.component.html.HtmlOutputLabel; -import javax.faces.component.html.HtmlOutputText; -import javax.faces.component.html.HtmlPanelGrid; -import javax.faces.component.html.HtmlPanelGroup; -import javax.faces.component.html.HtmlSelectManyCheckbox; -import javax.faces.component.html.HtmlSelectOneRadio; -import javax.faces.context.FacesContext; -import javax.faces.event.AbortProcessingException; -import javax.faces.event.ComponentSystemEvent; - +import jakarta.el.ExpressionFactory; +import jakarta.el.MethodExpression; +import jakarta.el.ValueExpression; +import jakarta.enterprise.context.RequestScoped; +import jakarta.faces.application.FacesMessage; +import jakarta.faces.component.UIComponent; +import jakarta.faces.component.UIParameter; +import jakarta.faces.component.UISelectItem; +import jakarta.faces.component.behavior.AjaxBehavior; +import jakarta.faces.component.html.HtmlCommandButton; +import jakarta.faces.component.html.HtmlForm; +import jakarta.faces.component.html.HtmlInputText; +import jakarta.faces.component.html.HtmlMessage; +import jakarta.faces.component.html.HtmlOutputLabel; +import jakarta.faces.component.html.HtmlOutputText; +import jakarta.faces.component.html.HtmlPanelGrid; +import jakarta.faces.component.html.HtmlPanelGroup; +import jakarta.faces.component.html.HtmlSelectManyCheckbox; +import jakarta.faces.component.html.HtmlSelectOneRadio; +import jakarta.faces.context.FacesContext; +import jakarta.faces.event.AbortProcessingException; +import jakarta.faces.event.ComponentSystemEvent; + +import jakarta.inject.Named; import org.deegree.client.core.component.HtmlFieldset; import org.deegree.client.core.component.HtmlInputBBox; import org.deegree.client.core.component.HtmlInputFile; @@ -99,7 +99,7 @@ * * @author Lyn Buesching */ -@ManagedBean +@Named @RequestScoped public class FormBean { diff --git a/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/MultipleComponentListener.java b/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/MultipleComponentListener.java index 1a7ab078ea..49612ede56 100644 --- a/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/MultipleComponentListener.java +++ b/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/MultipleComponentListener.java @@ -40,12 +40,12 @@ import java.util.List; import java.util.Map; -import javax.faces.component.UIComponent; -import javax.faces.component.UIParameter; -import javax.faces.context.FacesContext; -import javax.faces.event.AbortProcessingException; -import javax.faces.event.AjaxBehaviorEvent; -import javax.faces.event.AjaxBehaviorListener; +import jakarta.faces.component.UIComponent; +import jakarta.faces.component.UIParameter; +import jakarta.faces.context.FacesContext; +import jakarta.faces.event.AbortProcessingException; +import jakarta.faces.event.AjaxBehaviorEvent; +import jakarta.faces.event.AjaxBehaviorListener; import org.slf4j.Logger; diff --git a/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/component/HtmlLiteralInput.java b/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/component/HtmlLiteralInput.java index 3249556d89..95f8c6360a 100644 --- a/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/component/HtmlLiteralInput.java +++ b/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/component/HtmlLiteralInput.java @@ -37,10 +37,10 @@ import java.util.Collections; import java.util.List; -import javax.faces.application.FacesMessage; -import javax.faces.component.FacesComponent; -import javax.faces.component.UISelectOne; -import javax.faces.context.FacesContext; +import jakarta.faces.application.FacesMessage; +import jakarta.faces.component.FacesComponent; +import jakarta.faces.component.UISelectOne; +import jakarta.faces.context.FacesContext; import org.deegree.client.core.utils.MessageUtils; import org.deegree.commons.utils.StringPair; diff --git a/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/component/HtmlSelectFormat.java b/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/component/HtmlSelectFormat.java index bfa88e2d3b..232572cbdc 100644 --- a/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/component/HtmlSelectFormat.java +++ b/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/component/HtmlSelectFormat.java @@ -34,9 +34,9 @@ ----------------------------------------------------------------------------*/ package org.deegree.wpsclient.gui.component; -import javax.faces.component.FacesComponent; -import javax.faces.component.UISelectOne; -import javax.faces.context.FacesContext; +import jakarta.faces.component.FacesComponent; +import jakarta.faces.component.UISelectOne; +import jakarta.faces.context.FacesContext; import org.deegree.protocol.wps.client.param.ComplexFormat; @@ -92,9 +92,8 @@ public void setDefaultFormat(ComplexFormat defaultFormat) { /* * (non-Javadoc) * - * @see - * javax.faces.component.UISelectOne#validateValue(javax.faces.context.FacesContext, - * java.lang.Object) + * @see jakarta.faces.component.UISelectOne#validateValue(jakarta.faces.context. + * FacesContext, java.lang.Object) */ @Override protected void validateValue(FacesContext context, Object value) { diff --git a/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/component/LiteralInputRenderer.java b/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/component/LiteralInputRenderer.java index 436718b770..933709532d 100644 --- a/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/component/LiteralInputRenderer.java +++ b/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/component/LiteralInputRenderer.java @@ -35,16 +35,15 @@ package org.deegree.wpsclient.gui.component; import java.io.IOException; -import java.util.Iterator; import java.util.Map; -import javax.faces.component.UIComponent; -import javax.faces.component.UIInput; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; -import javax.faces.convert.ConverterException; -import javax.faces.model.SelectItem; -import javax.faces.render.FacesRenderer; +import jakarta.faces.component.UIComponent; +import jakarta.faces.component.UIInput; +import jakarta.faces.context.FacesContext; +import jakarta.faces.context.ResponseWriter; +import jakarta.faces.convert.ConverterException; +import jakarta.faces.model.SelectItem; +import jakarta.faces.render.FacesRenderer; import com.sun.faces.renderkit.SelectItemsIterator; import org.deegree.commons.utils.StringPair; diff --git a/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/component/SelectFormatRenderer.java b/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/component/SelectFormatRenderer.java index d1ff1a9ed1..0de7eeb7fa 100644 --- a/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/component/SelectFormatRenderer.java +++ b/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/component/SelectFormatRenderer.java @@ -36,15 +36,14 @@ import java.io.IOException; import java.util.HashMap; -import java.util.Iterator; import java.util.Map; -import javax.faces.component.UIComponent; -import javax.faces.component.UIInput; -import javax.faces.context.FacesContext; -import javax.faces.context.ResponseWriter; -import javax.faces.model.SelectItem; -import javax.faces.render.FacesRenderer; +import jakarta.faces.component.UIComponent; +import jakarta.faces.component.UIInput; +import jakarta.faces.context.FacesContext; +import jakarta.faces.context.ResponseWriter; +import jakarta.faces.model.SelectItem; +import jakarta.faces.render.FacesRenderer; import com.sun.faces.renderkit.SelectItemsIterator; import org.deegree.client.core.utils.JavaScriptUtils; diff --git a/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/converter/CodeTypeConverter.java b/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/converter/CodeTypeConverter.java index 0792a0c67d..8bcdab3cc6 100644 --- a/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/converter/CodeTypeConverter.java +++ b/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/converter/CodeTypeConverter.java @@ -34,11 +34,11 @@ ----------------------------------------------------------------------------*/ package org.deegree.wpsclient.gui.converter; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.convert.Converter; -import javax.faces.convert.ConverterException; -import javax.faces.convert.FacesConverter; +import jakarta.faces.component.UIComponent; +import jakarta.faces.context.FacesContext; +import jakarta.faces.convert.Converter; +import jakarta.faces.convert.ConverterException; +import jakarta.faces.convert.FacesConverter; import org.deegree.commons.tom.ows.CodeType; diff --git a/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/converter/ComplexFormatConverter.java b/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/converter/ComplexFormatConverter.java index 7cd7a49b78..7bdd8aeb88 100644 --- a/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/converter/ComplexFormatConverter.java +++ b/deegree-client/deegree-wps-webclient/src/main/java/org/deegree/wpsclient/gui/converter/ComplexFormatConverter.java @@ -34,10 +34,10 @@ ----------------------------------------------------------------------------*/ package org.deegree.wpsclient.gui.converter; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.convert.Converter; -import javax.faces.convert.FacesConverter; +import jakarta.faces.component.UIComponent; +import jakarta.faces.context.FacesContext; +import jakarta.faces.convert.Converter; +import jakarta.faces.convert.FacesConverter; import org.deegree.protocol.wps.client.param.ComplexFormat; diff --git a/deegree-client/deegree-wpsprinter-webclient/pom.xml b/deegree-client/deegree-wpsprinter-webclient/pom.xml index 415d612b03..714256c49d 100644 --- a/deegree-client/deegree-wpsprinter-webclient/pom.xml +++ b/deegree-client/deegree-wpsprinter-webclient/pom.xml @@ -27,8 +27,8 @@ ${project.version} - javax.el - javax.el-api + jakarta.el + jakarta.el-api diff --git a/deegree-client/deegree-wpsprinter-webclient/src/main/java/org/deegree/client/wpsprinter/CodeTypeConverter.java b/deegree-client/deegree-wpsprinter-webclient/src/main/java/org/deegree/client/wpsprinter/CodeTypeConverter.java index 4caa53a579..cca180c026 100644 --- a/deegree-client/deegree-wpsprinter-webclient/src/main/java/org/deegree/client/wpsprinter/CodeTypeConverter.java +++ b/deegree-client/deegree-wpsprinter-webclient/src/main/java/org/deegree/client/wpsprinter/CodeTypeConverter.java @@ -34,11 +34,11 @@ ----------------------------------------------------------------------------*/ package org.deegree.client.wpsprinter; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.convert.Converter; -import javax.faces.convert.ConverterException; -import javax.faces.convert.FacesConverter; +import jakarta.faces.component.UIComponent; +import jakarta.faces.context.FacesContext; +import jakarta.faces.convert.Converter; +import jakarta.faces.convert.ConverterException; +import jakarta.faces.convert.FacesConverter; import org.deegree.commons.tom.ows.CodeType; diff --git a/deegree-client/deegree-wpsprinter-webclient/src/main/java/org/deegree/client/wpsprinter/ExecuteBean.java b/deegree-client/deegree-wpsprinter-webclient/src/main/java/org/deegree/client/wpsprinter/ExecuteBean.java index 74a3ff111c..f4360f7724 100644 --- a/deegree-client/deegree-wpsprinter-webclient/src/main/java/org/deegree/client/wpsprinter/ExecuteBean.java +++ b/deegree-client/deegree-wpsprinter-webclient/src/main/java/org/deegree/client/wpsprinter/ExecuteBean.java @@ -44,9 +44,8 @@ import java.util.HashMap; import java.util.Map; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.RequestScoped; - +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Named; import org.deegree.commons.tom.ows.CodeType; import org.deegree.protocol.wps.client.WPSClient; import org.deegree.protocol.wps.client.output.ComplexOutput; @@ -60,7 +59,7 @@ * * @author Lyn Goltz */ -@ManagedBean +@Named @RequestScoped public class ExecuteBean implements Serializable { diff --git a/deegree-client/deegree-wpsprinter-webclient/src/main/java/org/deegree/client/wpsprinter/WpsPrinterBean.java b/deegree-client/deegree-wpsprinter-webclient/src/main/java/org/deegree/client/wpsprinter/WpsPrinterBean.java index e8621ced87..cdebc376ea 100644 --- a/deegree-client/deegree-wpsprinter-webclient/src/main/java/org/deegree/client/wpsprinter/WpsPrinterBean.java +++ b/deegree-client/deegree-wpsprinter-webclient/src/main/java/org/deegree/client/wpsprinter/WpsPrinterBean.java @@ -41,31 +41,31 @@ import java.util.ArrayList; import java.util.List; -import javax.el.ValueExpression; -import javax.faces.application.FacesMessage; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ViewScoped; -import javax.faces.component.UIInput; -import javax.faces.component.html.HtmlInputHidden; -import javax.faces.component.html.HtmlInputText; -import javax.faces.component.html.HtmlOutputLabel; -import javax.faces.component.html.HtmlOutputText; -import javax.faces.component.html.HtmlPanelGrid; -import javax.faces.component.html.HtmlPanelGroup; -import javax.faces.component.html.HtmlSelectBooleanCheckbox; -import javax.faces.context.FacesContext; -import javax.faces.convert.DateTimeConverter; -import javax.faces.convert.DoubleConverter; -import javax.faces.convert.FloatConverter; -import javax.faces.convert.IntegerConverter; -import javax.faces.convert.LongConverter; -import javax.faces.event.AbortProcessingException; -import javax.faces.event.AjaxBehaviorEvent; -import javax.faces.event.ComponentSystemEvent; -import javax.faces.model.SelectItem; -import javax.faces.validator.DoubleRangeValidator; -import javax.faces.validator.LongRangeValidator; - +import jakarta.el.ValueExpression; +import jakarta.faces.application.FacesMessage; +import jakarta.faces.component.UIInput; +import jakarta.faces.component.html.HtmlInputHidden; +import jakarta.faces.component.html.HtmlInputText; +import jakarta.faces.component.html.HtmlOutputLabel; +import jakarta.faces.component.html.HtmlOutputText; +import jakarta.faces.component.html.HtmlPanelGrid; +import jakarta.faces.component.html.HtmlPanelGroup; +import jakarta.faces.component.html.HtmlSelectBooleanCheckbox; +import jakarta.faces.context.FacesContext; +import jakarta.faces.convert.DateTimeConverter; +import jakarta.faces.convert.DoubleConverter; +import jakarta.faces.convert.FloatConverter; +import jakarta.faces.convert.IntegerConverter; +import jakarta.faces.convert.LongConverter; +import jakarta.faces.event.AbortProcessingException; +import jakarta.faces.event.AjaxBehaviorEvent; +import jakarta.faces.event.ComponentSystemEvent; +import jakarta.faces.model.SelectItem; +import jakarta.faces.validator.DoubleRangeValidator; +import jakarta.faces.validator.LongRangeValidator; + +import jakarta.faces.view.ViewScoped; +import jakarta.inject.Named; import org.deegree.client.core.utils.MessageUtils; import org.deegree.commons.tom.ows.CodeType; import org.deegree.commons.utils.ArrayUtils; @@ -83,7 +83,7 @@ /** * @author Lyn Goltz */ -@ManagedBean +@Named @ViewScoped public class WpsPrinterBean implements Serializable { diff --git a/deegree-services/deegree-services-commons/pom.xml b/deegree-services/deegree-services-commons/pom.xml index ae7e53a140..2c2811e7b4 100644 --- a/deegree-services/deegree-services-commons/pom.xml +++ b/deegree-services/deegree-services-commons/pom.xml @@ -66,12 +66,12 @@ --> - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api - commons-fileupload - commons-fileupload + org.apache.commons + commons-fileupload2-jakarta-servlet6 org.slf4j diff --git a/deegree-services/deegree-services-commons/src/api/java/org/deegree/services/controller/AbstractOWS.java b/deegree-services/deegree-services-commons/src/api/java/org/deegree/services/controller/AbstractOWS.java index 29ae2f5444..077c041580 100644 --- a/deegree-services/deegree-services-commons/src/api/java/org/deegree/services/controller/AbstractOWS.java +++ b/deegree-services/deegree-services-commons/src/api/java/org/deegree/services/controller/AbstractOWS.java @@ -43,8 +43,8 @@ import java.util.SortedSet; import java.util.TreeSet; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; @@ -52,7 +52,7 @@ import org.apache.axiom.soap.SOAPFactory; import org.apache.axiom.soap.SOAPHeader; import org.apache.axiom.soap.SOAPVersion; -import org.apache.commons.fileupload.FileItem; +import org.apache.commons.fileupload2.core.FileItem; import org.deegree.commons.ows.exception.OWSException; import org.deegree.commons.tom.ows.Version; import org.deegree.commons.utils.kvp.InvalidParameterValueException; diff --git a/deegree-services/deegree-services-commons/src/api/java/org/deegree/services/controller/CredentialsProvider.java b/deegree-services/deegree-services-commons/src/api/java/org/deegree/services/controller/CredentialsProvider.java index 7440f98b25..62ee0f7d19 100644 --- a/deegree-services/deegree-services-commons/src/api/java/org/deegree/services/controller/CredentialsProvider.java +++ b/deegree-services/deegree-services-commons/src/api/java/org/deegree/services/controller/CredentialsProvider.java @@ -37,8 +37,8 @@ import java.io.IOException; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import javax.xml.stream.XMLStreamReader; import org.apache.axiom.soap.SOAPEnvelope; diff --git a/deegree-services/deegree-services-commons/src/api/java/org/deegree/services/controller/GZipHttpServletResponse.java b/deegree-services/deegree-services-commons/src/api/java/org/deegree/services/controller/GZipHttpServletResponse.java index c192c40490..5efd219843 100644 --- a/deegree-services/deegree-services-commons/src/api/java/org/deegree/services/controller/GZipHttpServletResponse.java +++ b/deegree-services/deegree-services-commons/src/api/java/org/deegree/services/controller/GZipHttpServletResponse.java @@ -39,9 +39,9 @@ import java.util.Collection; 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 org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -70,7 +70,7 @@ public GZipHttpServletResponse( HttpServletResponse response ) { /** * @param cookie - * @see javax.servlet.http.HttpServletResponse#addCookie(javax.servlet.http.Cookie) + * @see jakarta.servlet.http.HttpServletResponse#addCookie(jakarta.servlet.http.Cookie) */ public void addCookie( Cookie cookie ) { response.addCookie( cookie ); @@ -79,7 +79,7 @@ public void addCookie( Cookie cookie ) { /** * @param name * @return - * @see javax.servlet.http.HttpServletResponse#containsHeader(java.lang.String) + * @see jakarta.servlet.http.HttpServletResponse#containsHeader(java.lang.String) */ public boolean containsHeader( String name ) { return response.containsHeader( name ); @@ -88,7 +88,7 @@ public boolean containsHeader( String name ) { /** * @param url * @return - * @see javax.servlet.http.HttpServletResponse#encodeURL(java.lang.String) + * @see jakarta.servlet.http.HttpServletResponse#encodeURL(java.lang.String) */ public String encodeURL( String url ) { return response.encodeURL( url ); @@ -96,7 +96,7 @@ public String encodeURL( String url ) { /** * @return - * @see javax.servlet.ServletResponse#getCharacterEncoding() + * @see jakarta.servlet.ServletResponse#getCharacterEncoding() */ public String getCharacterEncoding() { return response.getCharacterEncoding(); @@ -105,7 +105,7 @@ public String getCharacterEncoding() { /** * @param url * @return - * @see javax.servlet.http.HttpServletResponse#encodeRedirectURL(java.lang.String) + * @see jakarta.servlet.http.HttpServletResponse#encodeRedirectURL(java.lang.String) */ public String encodeRedirectURL( String url ) { return response.encodeRedirectURL( url ); @@ -113,7 +113,7 @@ public String encodeRedirectURL( String url ) { /** * @return - * @see javax.servlet.ServletResponse#getContentType() + * @see jakarta.servlet.ServletResponse#getContentType() */ public String getContentType() { return response.getContentType(); @@ -123,26 +123,26 @@ public String getContentType() { * @param url * @return * @deprecated - * @see javax.servlet.http.HttpServletResponse#encodeUrl(java.lang.String) + * @see jakarta.servlet.http.HttpServletResponse#encodeURL(java.lang.String) */ public String encodeUrl( String url ) { - return response.encodeUrl( url ); + return response.encodeURL( url ); } /** * @param url * @return * @deprecated - * @see javax.servlet.http.HttpServletResponse#encodeRedirectUrl(java.lang.String) + * @see jakarta.servlet.http.HttpServletResponse#encodeRedirectURL(java.lang.String) */ public String encodeRedirectUrl( String url ) { - return response.encodeRedirectUrl( url ); + return response.encodeRedirectURL( url ); } /** * @return * @throws IOException - * @see javax.servlet.ServletResponse#getOutputStream() + * @see jakarta.servlet.ServletResponse#getOutputStream() */ public ServletOutputStream getOutputStream() throws IOException { @@ -156,7 +156,7 @@ public ServletOutputStream getOutputStream() * @param sc * @param msg * @throws IOException - * @see javax.servlet.http.HttpServletResponse#sendError(int, java.lang.String) + * @see jakarta.servlet.http.HttpServletResponse#sendError(int, java.lang.String) */ public void sendError( int sc, String msg ) throws IOException { @@ -166,7 +166,7 @@ public void sendError( int sc, String msg ) /** * @return * @throws IOException - * @see javax.servlet.ServletResponse#getWriter() + * @see jakarta.servlet.ServletResponse#getWriter() */ public PrintWriter getWriter() throws IOException { @@ -176,7 +176,7 @@ public PrintWriter getWriter() /** * @param sc * @throws IOException - * @see javax.servlet.http.HttpServletResponse#sendError(int) + * @see jakarta.servlet.http.HttpServletResponse#sendError(int) */ public void sendError( int sc ) throws IOException { @@ -186,7 +186,7 @@ public void sendError( int sc ) /** * @param location * @throws IOException - * @see javax.servlet.http.HttpServletResponse#sendRedirect(java.lang.String) + * @see jakarta.servlet.http.HttpServletResponse#sendRedirect(java.lang.String) */ public void sendRedirect( String location ) throws IOException { @@ -195,7 +195,7 @@ public void sendRedirect( String location ) /** * @param charset - * @see javax.servlet.ServletResponse#setCharacterEncoding(java.lang.String) + * @see jakarta.servlet.ServletResponse#setCharacterEncoding(java.lang.String) */ public void setCharacterEncoding( String charset ) { response.setCharacterEncoding( charset ); @@ -204,7 +204,7 @@ public void setCharacterEncoding( String charset ) { /** * @param name * @param date - * @see javax.servlet.http.HttpServletResponse#setDateHeader(java.lang.String, long) + * @see jakarta.servlet.http.HttpServletResponse#setDateHeader(java.lang.String, long) */ public void setDateHeader( String name, long date ) { response.setDateHeader( name, date ); @@ -213,7 +213,7 @@ public void setDateHeader( String name, long date ) { /** * @param name * @param date - * @see javax.servlet.http.HttpServletResponse#addDateHeader(java.lang.String, long) + * @see jakarta.servlet.http.HttpServletResponse#addDateHeader(java.lang.String, long) */ public void addDateHeader( String name, long date ) { response.addDateHeader( name, date ); @@ -222,7 +222,7 @@ public void addDateHeader( String name, long date ) { /** * @param name * @param value - * @see javax.servlet.http.HttpServletResponse#setHeader(java.lang.String, java.lang.String) + * @see jakarta.servlet.http.HttpServletResponse#setHeader(java.lang.String, java.lang.String) */ public void setHeader( String name, String value ) { response.setHeader( name, value ); @@ -230,7 +230,7 @@ public void setHeader( String name, String value ) { /** * @param len - * @see javax.servlet.ServletResponse#setContentLength(int) + * @see jakarta.servlet.ServletResponse#setContentLength(int) */ public void setContentLength( int len ) { LOG.warn( "setContentLength() is not supported for gzipped responses" ); @@ -243,7 +243,7 @@ public void setContentLengthLong(long l) { /** * @param type - * @see javax.servlet.ServletResponse#setContentType(java.lang.String) + * @see jakarta.servlet.ServletResponse#setContentType(java.lang.String) */ public void setContentType( String type ) { response.setContentType( type ); @@ -252,7 +252,7 @@ public void setContentType( String type ) { /** * @param name * @param value - * @see javax.servlet.http.HttpServletResponse#addHeader(java.lang.String, java.lang.String) + * @see jakarta.servlet.http.HttpServletResponse#addHeader(java.lang.String, java.lang.String) */ public void addHeader( String name, String value ) { response.addHeader( name, value ); @@ -261,7 +261,7 @@ public void addHeader( String name, String value ) { /** * @param name * @param value - * @see javax.servlet.http.HttpServletResponse#setIntHeader(java.lang.String, int) + * @see jakarta.servlet.http.HttpServletResponse#setIntHeader(java.lang.String, int) */ public void setIntHeader( String name, int value ) { response.setIntHeader( name, value ); @@ -270,7 +270,7 @@ public void setIntHeader( String name, int value ) { /** * @param name * @param value - * @see javax.servlet.http.HttpServletResponse#addIntHeader(java.lang.String, int) + * @see jakarta.servlet.http.HttpServletResponse#addIntHeader(java.lang.String, int) */ public void addIntHeader( String name, int value ) { response.addIntHeader( name, value ); @@ -278,7 +278,7 @@ public void addIntHeader( String name, int value ) { /** * @param size - * @see javax.servlet.ServletResponse#setBufferSize(int) + * @see jakarta.servlet.ServletResponse#setBufferSize(int) */ public void setBufferSize( int size ) { response.setBufferSize( size ); @@ -286,22 +286,12 @@ public void setBufferSize( int size ) { /** * @param sc - * @see javax.servlet.http.HttpServletResponse#setStatus(int) + * @see jakarta.servlet.http.HttpServletResponse#setStatus(int) */ public void setStatus( int sc ) { response.setStatus( sc ); } - /** - * @param sc - * @param sm - * @deprecated - * @see javax.servlet.http.HttpServletResponse#setStatus(int, java.lang.String) - */ - public void setStatus( int sc, String sm ) { - response.setStatus( sc, sm ); - } - @Override public int getStatus() { return 0; @@ -324,7 +314,7 @@ public Collection getHeaderNames() { /** * @return - * @see javax.servlet.ServletResponse#getBufferSize() + * @see jakarta.servlet.ServletResponse#getBufferSize() */ public int getBufferSize() { return response.getBufferSize(); @@ -332,7 +322,7 @@ public int getBufferSize() { /** * @throws IOException - * @see javax.servlet.ServletResponse#flushBuffer() + * @see jakarta.servlet.ServletResponse#flushBuffer() */ public void flushBuffer() throws IOException { @@ -346,7 +336,7 @@ public void flushBuffer() /** * - * @see javax.servlet.ServletResponse#resetBuffer() + * @see jakarta.servlet.ServletResponse#resetBuffer() */ public void resetBuffer() { response.resetBuffer(); @@ -354,7 +344,7 @@ public void resetBuffer() { /** * @return - * @see javax.servlet.ServletResponse#isCommitted() + * @see jakarta.servlet.ServletResponse#isCommitted() */ public boolean isCommitted() { return response.isCommitted(); @@ -362,7 +352,7 @@ public boolean isCommitted() { /** * - * @see javax.servlet.ServletResponse#reset() + * @see jakarta.servlet.ServletResponse#reset() */ public void reset() { response.reset(); @@ -370,7 +360,7 @@ public void reset() { /** * @param loc - * @see javax.servlet.ServletResponse#setLocale(java.util.Locale) + * @see jakarta.servlet.ServletResponse#setLocale(java.util.Locale) */ public void setLocale( Locale loc ) { response.setLocale( loc ); @@ -378,7 +368,7 @@ public void setLocale( Locale loc ) { /** * @return - * @see javax.servlet.ServletResponse#getLocale() + * @see jakarta.servlet.ServletResponse#getLocale() */ public Locale getLocale() { return response.getLocale(); diff --git a/deegree-services/deegree-services-commons/src/api/java/org/deegree/services/controller/GZipServletOutputStream.java b/deegree-services/deegree-services-commons/src/api/java/org/deegree/services/controller/GZipServletOutputStream.java index 3360e44405..068203c908 100644 --- a/deegree-services/deegree-services-commons/src/api/java/org/deegree/services/controller/GZipServletOutputStream.java +++ b/deegree-services/deegree-services-commons/src/api/java/org/deegree/services/controller/GZipServletOutputStream.java @@ -37,8 +37,8 @@ import java.io.IOException; import java.util.zip.GZIPOutputStream; -import javax.servlet.ServletOutputStream; -import javax.servlet.WriteListener; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.WriteListener; /** * {@link ServletOutputStream} used by {@link GZipHttpServletResponse}. diff --git a/deegree-services/deegree-services-commons/src/api/java/org/deegree/services/controller/OGCFrontController.java b/deegree-services/deegree-services-commons/src/api/java/org/deegree/services/controller/OGCFrontController.java index f7c6c7d45b..458b2fe9c4 100644 --- a/deegree-services/deegree-services-commons/src/api/java/org/deegree/services/controller/OGCFrontController.java +++ b/deegree-services/deegree-services-commons/src/api/java/org/deegree/services/controller/OGCFrontController.java @@ -39,7 +39,6 @@ import static org.deegree.commons.ows.exception.OWSException.NO_APPLICABLE_CODE; import static org.deegree.commons.tom.ows.Version.parseVersion; import static org.reflections.util.ClasspathHelper.forClassLoader; -import static org.reflections.util.ClasspathHelper.forWebInfLib; import static org.slf4j.LoggerFactory.getLogger; import java.beans.Introspector; @@ -60,20 +59,23 @@ import java.net.URL; import java.net.URLDecoder; import java.nio.charset.Charset; +import java.util.ArrayList; import java.util.Collection; import java.util.Enumeration; import java.util.Iterator; +import java.util.LinkedHashMap; import java.util.List; import java.util.Map; import java.util.Properties; +import java.util.Set; import javax.imageio.spi.IIORegistry; -import javax.servlet.ServletConfig; -import javax.servlet.ServletContext; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletContext; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamReader; @@ -84,11 +86,10 @@ import org.apache.axiom.soap.SOAPEnvelope; import org.apache.axiom.soap.SOAPFactory; import org.apache.axiom.soap.SOAPModelBuilder; -import org.apache.commons.fileupload.FileItem; -import org.apache.commons.fileupload.FileItemFactory; -import org.apache.commons.fileupload.FileUploadException; -import org.apache.commons.fileupload.disk.DiskFileItemFactory; -import org.apache.commons.fileupload.servlet.ServletFileUpload; +import org.apache.commons.fileupload2.core.FileItem; +import org.apache.commons.fileupload2.core.FileUploadException; +import org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletDiskFileUpload; +import org.apache.commons.fileupload2.jakarta.servlet6.JakartaServletFileUpload; import org.apache.commons.io.IOUtils; import org.apache.commons.logging.LogFactory; import org.deegree.commons.concurrent.Executor; @@ -626,12 +627,10 @@ private static String readPostBodyAsString( InputStream is ) private List checkAndRetrieveMultiparts( HttpServletRequest request ) throws FileUploadException { List result = null; - if ( ServletFileUpload.isMultipartContent( request ) ) { - // Create a factory for disk-based file items - FileItemFactory factory = new DiskFileItemFactory(); + if ( JakartaServletFileUpload.isMultipartContent( request ) ) { LOG.debug( "The incoming request is a multipart request." ); // Create a new file upload handler - ServletFileUpload upload = new ServletFileUpload( factory ); + JakartaServletFileUpload upload = new JakartaServletDiskFileUpload(); // Parse the request result = upload.parseRequest( request ); @@ -1084,6 +1083,46 @@ private Collection extractModulesInfo( ServletContext servletContext } return ModuleInfo.extractModulesInfo( forClassLoader() ); } + // + // ******************** BEGIN ******************** + // Insourced methods from org.reflections:reflections + // TODO: needs to be removed or replaced + // + private static Collection forWebInfLib(ServletContext servletContext) { + Collection urls = new ArrayList(); + Set resourcePaths = servletContext.getResourcePaths("/WEB-INF/lib"); + if (resourcePaths == null) { + return urls; + } else { + Iterator var3 = resourcePaths.iterator(); + + while(var3.hasNext()) { + Object urlString = var3.next(); + + try { + urls.add(servletContext.getResource((String)urlString)); + } catch (MalformedURLException var6) { + } + } + + return distinctUrls(urls); + } + } + + private static Collection distinctUrls(Collection urls) { + Map distinct = new LinkedHashMap(urls.size()); + Iterator var2 = urls.iterator(); + + while(var2.hasNext()) { + URL url = (URL)var2.next(); + distinct.put(url.toExternalForm(), url); + } + + return distinct.values(); + } + // + // ******************** END ******************** + // private void initWorkspace() throws IOException, URISyntaxException, ResourceInitException { diff --git a/deegree-services/deegree-services-commons/src/api/java/org/deegree/services/controller/RequestContext.java b/deegree-services/deegree-services-commons/src/api/java/org/deegree/services/controller/RequestContext.java index fef3161700..417871ff2b 100644 --- a/deegree-services/deegree-services-commons/src/api/java/org/deegree/services/controller/RequestContext.java +++ b/deegree-services/deegree-services-commons/src/api/java/org/deegree/services/controller/RequestContext.java @@ -37,7 +37,7 @@ import static org.slf4j.LoggerFactory.getLogger; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.deegree.services.resources.ResourcesServlet; import org.slf4j.Logger; diff --git a/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/OWS.java b/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/OWS.java index 7d29669fe8..fb6b93edd3 100644 --- a/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/OWS.java +++ b/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/OWS.java @@ -38,13 +38,13 @@ import java.util.List; import java.util.Map; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; import javax.xml.stream.XMLStreamReader; import org.apache.axiom.soap.SOAPEnvelope; import org.apache.axiom.soap.SOAPFactory; -import org.apache.commons.fileupload.FileItem; +import org.apache.commons.fileupload2.core.FileItem; import org.deegree.commons.tom.ows.Version; import org.deegree.services.authentication.SecurityException; import org.deegree.services.controller.OGCFrontController; diff --git a/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/OWSResponse.java b/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/OWSResponse.java index 24336b6fee..30db6d4583 100644 --- a/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/OWSResponse.java +++ b/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/OWSResponse.java @@ -42,9 +42,9 @@ import java.util.Map; import java.util.zip.GZIPOutputStream; -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 javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; diff --git a/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/authentication/DeegreeAuthentication.java b/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/authentication/DeegreeAuthentication.java index 5cdcd8b870..8c20b9fe65 100644 --- a/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/authentication/DeegreeAuthentication.java +++ b/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/authentication/DeegreeAuthentication.java @@ -37,8 +37,8 @@ import java.io.IOException; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import javax.xml.stream.XMLStreamReader; import org.apache.axiom.soap.SOAPEnvelope; diff --git a/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/authentication/HttpBasicAuthentication.java b/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/authentication/HttpBasicAuthentication.java index f48fa17485..713f67ec60 100644 --- a/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/authentication/HttpBasicAuthentication.java +++ b/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/authentication/HttpBasicAuthentication.java @@ -37,8 +37,8 @@ import java.io.IOException; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import javax.xml.stream.XMLStreamReader; import org.apache.axiom.soap.SOAPEnvelope; diff --git a/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/authentication/SOAPAuthentication.java b/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/authentication/SOAPAuthentication.java index 3f4f6cd045..a688a3abf7 100644 --- a/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/authentication/SOAPAuthentication.java +++ b/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/authentication/SOAPAuthentication.java @@ -37,8 +37,8 @@ import java.io.IOException; import java.util.Map; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import javax.xml.stream.XMLStreamReader; import org.apache.axiom.om.OMElement; diff --git a/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/controller/security/SecureProxy.java b/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/controller/security/SecureProxy.java index 3a9a84c48f..27522a8527 100644 --- a/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/controller/security/SecureProxy.java +++ b/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/controller/security/SecureProxy.java @@ -63,11 +63,11 @@ import java.util.HashMap; import java.util.Map; -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletConfig; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; diff --git a/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/controller/utils/HttpResponseBuffer.java b/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/controller/utils/HttpResponseBuffer.java index 1cf4339e16..cb33ed6f33 100644 --- a/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/controller/utils/HttpResponseBuffer.java +++ b/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/controller/utils/HttpResponseBuffer.java @@ -46,11 +46,11 @@ import java.util.Collections; import java.util.List; -import javax.servlet.ServletOutputStream; -import javax.servlet.WriteListener; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpServletResponseWrapper; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.WriteListener; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponseWrapper; import javax.xml.namespace.QName; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLOutputFactory; diff --git a/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/controller/utils/LoggingHttpRequestWrapper.java b/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/controller/utils/LoggingHttpRequestWrapper.java index 5432abe662..13255f369e 100644 --- a/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/controller/utils/LoggingHttpRequestWrapper.java +++ b/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/controller/utils/LoggingHttpRequestWrapper.java @@ -38,10 +38,10 @@ import org.deegree.services.controller.RequestLogger; import org.slf4j.Logger; -import javax.servlet.ReadListener; -import javax.servlet.ServletInputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletRequestWrapper; +import jakarta.servlet.ReadListener; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequestWrapper; import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileOutputStream; diff --git a/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/resources/ResourcesServlet.java b/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/resources/ResourcesServlet.java index 71f8d015d5..9a6d1b6577 100644 --- a/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/resources/ResourcesServlet.java +++ b/deegree-services/deegree-services-commons/src/main/java/org/deegree/services/resources/ResourcesServlet.java @@ -40,10 +40,10 @@ import java.io.FileInputStream; import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.deegree.services.controller.OGCFrontController; import org.slf4j.Logger; diff --git a/deegree-services/deegree-services-commons/src/test/java/org/deegree/services/controller/RequestContextTest.java b/deegree-services/deegree-services-commons/src/test/java/org/deegree/services/controller/RequestContextTest.java index 46af01df17..eaa1d956df 100644 --- a/deegree-services/deegree-services-commons/src/test/java/org/deegree/services/controller/RequestContextTest.java +++ b/deegree-services/deegree-services-commons/src/test/java/org/deegree/services/controller/RequestContextTest.java @@ -34,7 +34,7 @@ ----------------------------------------------------------------------------*/ package org.deegree.services.controller; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import junit.framework.Assert; diff --git a/deegree-services/deegree-services-commons/src/test/java/org/deegree/services/controller/utils/HttpResponseBufferTest.java b/deegree-services/deegree-services-commons/src/test/java/org/deegree/services/controller/utils/HttpResponseBufferTest.java index b8df693d87..a24bed2a71 100644 --- a/deegree-services/deegree-services-commons/src/test/java/org/deegree/services/controller/utils/HttpResponseBufferTest.java +++ b/deegree-services/deegree-services-commons/src/test/java/org/deegree/services/controller/utils/HttpResponseBufferTest.java @@ -48,8 +48,10 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; -import javax.servlet.http.HttpServletResponse; + +import jakarta.servlet.http.HttpServletResponse; import javax.xml.stream.XMLStreamException; + import org.deegree.commons.utils.io.StreamBufferStore; import org.junit.Test; import org.mockito.Mockito; diff --git a/deegree-services/deegree-services-config/pom.xml b/deegree-services/deegree-services-config/pom.xml index c47f4b974f..8f73e18426 100644 --- a/deegree-services/deegree-services-config/pom.xml +++ b/deegree-services/deegree-services-config/pom.xml @@ -22,8 +22,8 @@ ${project.version} - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api org.deegree diff --git a/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/ApiKey.java b/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/ApiKey.java index cfff32b932..1c6b13e50c 100644 --- a/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/ApiKey.java +++ b/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/ApiKey.java @@ -13,7 +13,7 @@ import java.util.List; import java.util.Random; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletRequest; import org.apache.commons.codec.binary.Hex; import org.apache.commons.codec.digest.DigestUtils; diff --git a/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/Crs.java b/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/Crs.java index b47e408788..a162e4dd19 100644 --- a/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/Crs.java +++ b/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/Crs.java @@ -37,9 +37,9 @@ import java.util.List; import java.util.regex.Pattern; -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.apache.commons.io.IOUtils; import org.deegree.commons.config.DeegreeWorkspace; diff --git a/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/Delete.java b/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/Delete.java index 63e3821822..9a5122be6e 100644 --- a/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/Delete.java +++ b/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/Delete.java @@ -41,7 +41,7 @@ import java.io.File; import java.io.IOException; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.io.IOUtils; import org.deegree.commons.config.DeegreeWorkspace; diff --git a/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/Download.java b/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/Download.java index 57d0ee6459..2f1fd828a7 100644 --- a/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/Download.java +++ b/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/Download.java @@ -44,7 +44,7 @@ import java.io.IOException; import java.util.zip.ZipOutputStream; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.io.IOUtils; import org.deegree.commons.config.DeegreeWorkspace; diff --git a/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/Invalidate.java b/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/Invalidate.java index e64c281b30..cfdd618e2d 100644 --- a/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/Invalidate.java +++ b/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/Invalidate.java @@ -45,7 +45,7 @@ Occam Labs UG (haftungsbeschränkt) import java.io.IOException; import java.net.URLDecoder; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.io.IOUtils; import org.deegree.commons.config.DeegreeWorkspace; diff --git a/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/List.java b/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/List.java index dbf157ada3..0618d0a31a 100644 --- a/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/List.java +++ b/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/List.java @@ -39,8 +39,8 @@ import java.io.File; import java.io.IOException; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.io.IOUtils; import org.deegree.commons.config.DeegreeWorkspace; diff --git a/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/ListFonts.java b/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/ListFonts.java index dc30b67f88..5acb6d2ea6 100644 --- a/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/ListFonts.java +++ b/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/ListFonts.java @@ -40,8 +40,8 @@ import java.util.SortedSet; import java.util.TreeSet; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.io.IOUtils; diff --git a/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/ListWorkspaces.java b/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/ListWorkspaces.java index 6fb09d3cf0..f5143ee626 100644 --- a/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/ListWorkspaces.java +++ b/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/ListWorkspaces.java @@ -37,8 +37,8 @@ import java.io.File; import java.io.IOException; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.io.IOUtils; import org.deegree.commons.config.DeegreeWorkspace; diff --git a/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/Restart.java b/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/Restart.java index 1a97cf9fcb..1628f3bceb 100644 --- a/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/Restart.java +++ b/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/Restart.java @@ -42,8 +42,8 @@ import java.util.ArrayList; import java.util.List; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletResponse; import org.deegree.commons.config.DeegreeWorkspace; import org.deegree.commons.utils.Pair; diff --git a/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/Update.java b/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/Update.java index 89a669b323..9efd4105bb 100644 --- a/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/Update.java +++ b/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/Update.java @@ -5,8 +5,8 @@ import java.io.IOException; import java.util.List; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.io.IOUtils; import org.deegree.commons.config.DeegreeWorkspace; diff --git a/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/UpdateBboxCache.java b/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/UpdateBboxCache.java index 8e42143fcf..ce4555357e 100644 --- a/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/UpdateBboxCache.java +++ b/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/UpdateBboxCache.java @@ -13,8 +13,8 @@ import java.util.List; import java.util.Map; -import javax.servlet.ServletOutputStream; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletOutputStream; +import jakarta.servlet.http.HttpServletResponse; import javax.xml.namespace.QName; import org.apache.commons.io.IOUtils; diff --git a/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/Upload.java b/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/Upload.java index b61ba130f2..da5c28192e 100644 --- a/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/Upload.java +++ b/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/Upload.java @@ -44,9 +44,9 @@ import java.io.File; import java.io.IOException; -import javax.servlet.ServletInputStream; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletInputStream; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.io.FilenameUtils; import org.apache.commons.io.IOUtils; diff --git a/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/Validate.java b/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/Validate.java index 6e0ce4c050..81759cdce5 100644 --- a/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/Validate.java +++ b/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/actions/Validate.java @@ -15,7 +15,7 @@ import java.util.Map; import java.util.TreeMap; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.http.HttpServletResponse; import org.deegree.commons.config.DeegreeWorkspace; import org.deegree.commons.config.ResourceInitException; diff --git a/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/servlet/ConfigServlet.java b/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/servlet/ConfigServlet.java index 0ba1b9967a..3a0a6d91f6 100644 --- a/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/servlet/ConfigServlet.java +++ b/deegree-services/deegree-services-config/src/main/java/org/deegree/services/config/servlet/ConfigServlet.java @@ -52,10 +52,10 @@ import java.io.IOException; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServlet; +import jakarta.servlet.http.HttpServletRequest; +import jakarta.servlet.http.HttpServletResponse; import org.apache.commons.io.IOUtils; import org.deegree.services.config.ApiKey; diff --git a/deegree-services/deegree-services-csw/pom.xml b/deegree-services/deegree-services-csw/pom.xml index 5d8f7d03a0..e8d9ea77f9 100644 --- a/deegree-services/deegree-services-csw/pom.xml +++ b/deegree-services/deegree-services-csw/pom.xml @@ -36,12 +36,12 @@ ${project.version} - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api - commons-fileupload - commons-fileupload + org.apache.commons + commons-fileupload2-jakarta-servlet6 de.odysseus.staxon diff --git a/deegree-services/deegree-services-csw/src/main/java/org/deegree/services/csw/CSWController.java b/deegree-services/deegree-services-csw/src/main/java/org/deegree/services/csw/CSWController.java index 6c321b428a..b92958c25c 100644 --- a/deegree-services/deegree-services-csw/src/main/java/org/deegree/services/csw/CSWController.java +++ b/deegree-services/deegree-services-csw/src/main/java/org/deegree/services/csw/CSWController.java @@ -53,9 +53,9 @@ import java.util.ServiceLoader; import java.util.Set; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.http.HttpServletRequest; import javax.xml.namespace.QName; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; @@ -67,7 +67,7 @@ import org.apache.axiom.soap.SOAPEnvelope; import org.apache.axiom.soap.SOAPFactory; import org.apache.axiom.soap.SOAPVersion; -import org.apache.commons.fileupload.FileItem; +import org.apache.commons.fileupload2.core.FileItem; import org.deegree.commons.ows.exception.OWSException; import org.deegree.commons.tom.ows.Version; import org.deegree.commons.utils.ArrayUtils; diff --git a/deegree-services/deegree-services-wcs/pom.xml b/deegree-services/deegree-services-wcs/pom.xml index edfbfcd9b7..2244559e36 100644 --- a/deegree-services/deegree-services-wcs/pom.xml +++ b/deegree-services/deegree-services-wcs/pom.xml @@ -31,8 +31,8 @@ ${project.version} - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api diff --git a/deegree-services/deegree-services-wcs/src/main/java/org/deegree/services/wcs/WCSController.java b/deegree-services/deegree-services-wcs/src/main/java/org/deegree/services/wcs/WCSController.java index bd44775b9d..8ac9da98eb 100644 --- a/deegree-services/deegree-services-wcs/src/main/java/org/deegree/services/wcs/WCSController.java +++ b/deegree-services/deegree-services-wcs/src/main/java/org/deegree/services/wcs/WCSController.java @@ -50,15 +50,15 @@ import java.util.Map; import java.util.Set; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.HttpServletRequest; import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; import org.apache.axiom.om.OMElement; -import org.apache.commons.fileupload.FileItem; +import org.apache.commons.fileupload2.core.FileItem; import org.deegree.commons.ows.exception.OWSException; import org.deegree.commons.tom.ows.Version; import org.deegree.commons.utils.kvp.KVPUtils; diff --git a/deegree-services/deegree-services-wfs/pom.xml b/deegree-services/deegree-services-wfs/pom.xml index 4783c86cb2..c2e937ec28 100644 --- a/deegree-services/deegree-services-wfs/pom.xml +++ b/deegree-services/deegree-services-wfs/pom.xml @@ -26,8 +26,8 @@ - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api org.deegree diff --git a/deegree-services/deegree-services-wfs/src/main/java/org/deegree/services/wfs/WebFeatureService.java b/deegree-services/deegree-services-wfs/src/main/java/org/deegree/services/wfs/WebFeatureService.java index c9427ab564..de35c9d925 100644 --- a/deegree-services/deegree-services-wfs/src/main/java/org/deegree/services/wfs/WebFeatureService.java +++ b/deegree-services/deegree-services-wfs/src/main/java/org/deegree/services/wfs/WebFeatureService.java @@ -39,7 +39,7 @@ import org.apache.axiom.soap.SOAP11Version; import org.apache.axiom.soap.SOAPEnvelope; import org.apache.axiom.soap.SOAPFactory; -import org.apache.commons.fileupload.FileItem; +import org.apache.commons.fileupload2.core.FileItem; import org.deegree.commons.ows.exception.OWSException; import org.deegree.commons.ows.metadata.DatasetMetadata; import org.deegree.commons.ows.metadata.MetadataUrl; @@ -151,9 +151,9 @@ import org.slf4j.LoggerFactory; import org.w3c.dom.Element; -import javax.servlet.ServletException; -import javax.servlet.ServletRequest; -import javax.servlet.http.HttpServletRequest; +import jakarta.servlet.ServletException; +import jakarta.servlet.ServletRequest; +import jakarta.servlet.http.HttpServletRequest; import jakarta.xml.bind.JAXBElement; import javax.xml.namespace.QName; import javax.xml.stream.XMLInputFactory; diff --git a/deegree-services/deegree-services-wms/pom.xml b/deegree-services/deegree-services-wms/pom.xml index ee5b0172eb..82761f604c 100644 --- a/deegree-services/deegree-services-wms/pom.xml +++ b/deegree-services/deegree-services-wms/pom.xml @@ -76,8 +76,8 @@ ${project.version} - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api - javax.servlet.jsp - javax.servlet.jsp-api + jakarta.servlet.jsp + jakarta.servlet.jsp-api jakarta.mail diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/AbstractCreateResourceBean.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/AbstractCreateResourceBean.java index b1d0e4a0f0..93078a694a 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/AbstractCreateResourceBean.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/AbstractCreateResourceBean.java @@ -35,10 +35,10 @@ import java.util.List; import java.util.Map; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ViewScoped; -import javax.faces.event.AjaxBehaviorEvent; +import jakarta.faces.event.AjaxBehaviorEvent; +import jakarta.faces.view.ViewScoped; +import jakarta.inject.Named; import org.deegree.console.metadata.ConfigExample; import org.deegree.console.metadata.ResourceManagerMetadata; import org.deegree.console.metadata.ResourceProviderMetadata; @@ -53,7 +53,7 @@ * @author Markus Schneider * @since 3.4 */ -@ManagedBean +@Named @ViewScoped public abstract class AbstractCreateResourceBean { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/Config.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/Config.java index fb3880c7f7..e6737416ec 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/Config.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/Config.java @@ -27,7 +27,7 @@ ----------------------------------------------------------------------------*/ package org.deegree.console; -import static javax.faces.application.FacesMessage.SEVERITY_ERROR; +import static jakarta.faces.application.FacesMessage.SEVERITY_ERROR; import static org.deegree.console.JsfUtils.getWorkspace; import static org.slf4j.LoggerFactory.getLogger; @@ -37,11 +37,11 @@ import java.util.ArrayList; import java.util.List; -import javax.faces.application.FacesMessage; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.RequestScoped; -import javax.faces.context.FacesContext; +import jakarta.enterprise.context.RequestScoped; +import jakarta.faces.application.FacesMessage; +import jakarta.faces.context.FacesContext; +import jakarta.inject.Named; import org.apache.commons.io.IOUtils; import org.deegree.workspace.ResourceManager; import org.deegree.workspace.ResourceMetadata; @@ -57,7 +57,7 @@ * @author Andreas Schmitz * @since 3.4 */ -@ManagedBean +@Named @RequestScoped public class Config implements Comparable, Serializable { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/JsfUtils.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/JsfUtils.java index 3d4ff9d5fc..b7222dbd2d 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/JsfUtils.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/JsfUtils.java @@ -34,10 +34,10 @@ ----------------------------------------------------------------------------*/ package org.deegree.console; -import static javax.faces.application.FacesMessage.SEVERITY_ERROR; +import static jakarta.faces.application.FacesMessage.SEVERITY_ERROR; -import javax.faces.application.FacesMessage; -import javax.faces.context.FacesContext; +import jakarta.faces.application.FacesMessage; +import jakarta.faces.context.FacesContext; import org.deegree.services.controller.OGCFrontController; import org.deegree.workspace.Workspace; diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/client/RequestBean.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/client/RequestBean.java index 249397038b..b4ec7f593b 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/client/RequestBean.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/client/RequestBean.java @@ -65,15 +65,15 @@ import java.util.TreeSet; import jakarta.annotation.PostConstruct; -import javax.faces.application.FacesMessage; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.RequestScoped; -import javax.faces.context.ExternalContext; -import javax.faces.context.FacesContext; -import javax.faces.event.AjaxBehaviorEvent; -import javax.faces.model.SelectItem; -import javax.faces.model.SelectItemGroup; - +import jakarta.enterprise.context.RequestScoped; +import jakarta.faces.application.FacesMessage; +import jakarta.faces.context.ExternalContext; +import jakarta.faces.context.FacesContext; +import jakarta.faces.event.AjaxBehaviorEvent; +import jakarta.faces.model.SelectItem; +import jakarta.faces.model.SelectItemGroup; + +import jakarta.inject.Named; import org.apache.commons.io.IOUtils; import org.apache.commons.io.input.BoundedInputStream; import org.apache.http.Header; @@ -98,7 +98,7 @@ * * @author Lyn Buesching */ -@ManagedBean +@Named @RequestScoped public class RequestBean implements Serializable { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/connection/remoteows/CreateRemoteOwsBean.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/connection/remoteows/CreateRemoteOwsBean.java index cdba216407..5ece2d6e2c 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/connection/remoteows/CreateRemoteOwsBean.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/connection/remoteows/CreateRemoteOwsBean.java @@ -27,10 +27,8 @@ ----------------------------------------------------------------------------*/ package org.deegree.console.connection.remoteows; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.RequestScoped; -import javax.faces.bean.ViewScoped; - +import jakarta.faces.view.ViewScoped; +import jakarta.inject.Named; import org.deegree.console.AbstractCreateResourceBean; import org.deegree.remoteows.RemoteOWSManager; @@ -40,7 +38,7 @@ * @author Markus Schneider * @since 3.4 */ -@ManagedBean +@Named @ViewScoped public class CreateRemoteOwsBean extends AbstractCreateResourceBean { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/connection/remoteows/RemoteOwsManagerBean.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/connection/remoteows/RemoteOwsManagerBean.java index 6bc0d6af2e..8d0bcda076 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/connection/remoteows/RemoteOwsManagerBean.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/connection/remoteows/RemoteOwsManagerBean.java @@ -36,13 +36,12 @@ import java.io.Serializable; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ViewScoped; - +import jakarta.faces.view.ViewScoped; +import jakarta.inject.Named; import org.deegree.console.AbstractResourceManagerBean; import org.deegree.remoteows.RemoteOWSManager; -@ManagedBean +@Named @ViewScoped public class RemoteOwsManagerBean extends AbstractResourceManagerBean implements Serializable { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/connection/sql/ConnectionTester.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/connection/sql/ConnectionTester.java index adc6600424..033fad29da 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/connection/sql/ConnectionTester.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/connection/sql/ConnectionTester.java @@ -34,16 +34,16 @@ ----------------------------------------------------------------------------*/ package org.deegree.console.connection.sql; -import static javax.faces.application.FacesMessage.SEVERITY_ERROR; -import static javax.faces.application.FacesMessage.SEVERITY_INFO; +import static jakarta.faces.application.FacesMessage.SEVERITY_ERROR; +import static jakarta.faces.application.FacesMessage.SEVERITY_INFO; import static org.deegree.client.core.utils.ActionParams.getParam1; -import javax.faces.application.FacesMessage; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.SessionScoped; -import javax.faces.context.ExternalContext; -import javax.faces.context.FacesContext; +import jakarta.enterprise.context.SessionScoped; +import jakarta.faces.application.FacesMessage; +import jakarta.faces.context.ExternalContext; +import jakarta.faces.context.FacesContext; +import jakarta.inject.Named; import org.deegree.console.workspace.WorkspaceBean; import org.deegree.db.ConnectionProvider; import org.deegree.db.ConnectionProviderProvider; @@ -56,7 +56,7 @@ * @author Markus Schneider * @author Andreas Schmitz */ -@ManagedBean +@Named @SessionScoped public class ConnectionTester { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/connection/sql/CreateSqlConnectionBean.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/connection/sql/CreateSqlConnectionBean.java index 7f3cfe1c9b..3b2cf105a4 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/connection/sql/CreateSqlConnectionBean.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/connection/sql/CreateSqlConnectionBean.java @@ -27,9 +27,8 @@ ----------------------------------------------------------------------------*/ package org.deegree.console.connection.sql; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ViewScoped; - +import jakarta.faces.view.ViewScoped; +import jakarta.inject.Named; import org.deegree.console.AbstractCreateResourceBean; import org.deegree.db.ConnectionProviderManager; @@ -39,7 +38,7 @@ * @author Markus Schneider * @since 3.4 */ -@ManagedBean +@Named @ViewScoped public class CreateSqlConnectionBean extends AbstractCreateResourceBean { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/connection/sql/JdbcBean.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/connection/sql/JdbcBean.java index a8c54011ce..fcd261125f 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/connection/sql/JdbcBean.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/connection/sql/JdbcBean.java @@ -1,7 +1,7 @@ package org.deegree.console.connection.sql; -import static javax.faces.application.FacesMessage.SEVERITY_ERROR; -import static javax.faces.application.FacesMessage.SEVERITY_INFO; +import static jakarta.faces.application.FacesMessage.SEVERITY_ERROR; +import static jakarta.faces.application.FacesMessage.SEVERITY_INFO; import static org.deegree.db.ConnectionProviderUtils.getSyntheticProvider; import java.io.IOException; @@ -11,19 +11,19 @@ import java.sql.SQLException; import java.util.Map; -import javax.faces.application.FacesMessage; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ViewScoped; -import javax.faces.context.ExternalContext; -import javax.faces.context.FacesContext; +import jakarta.faces.application.FacesMessage; +import jakarta.faces.context.ExternalContext; +import jakarta.faces.context.FacesContext; +import jakarta.faces.view.ViewScoped; +import jakarta.inject.Named; import org.deegree.console.Config; import org.deegree.console.workspace.WorkspaceBean; import org.deegree.db.ConnectionProvider; import org.deegree.workspace.ResourceLocation; import org.deegree.workspace.Workspace; -@ManagedBean +@Named @ViewScoped public class JdbcBean implements Serializable { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/connection/sql/SqlConnectionManagerBean.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/connection/sql/SqlConnectionManagerBean.java index 004b5ed0ca..3964ba93b2 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/connection/sql/SqlConnectionManagerBean.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/connection/sql/SqlConnectionManagerBean.java @@ -39,15 +39,14 @@ import java.util.Collections; import java.util.List; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ViewScoped; - +import jakarta.faces.view.ViewScoped; +import jakarta.inject.Named; import org.deegree.console.AbstractResourceManagerBean; import org.deegree.console.Config; import org.deegree.db.ConnectionProviderManager; import org.deegree.workspace.ResourceMetadata; -@ManagedBean +@Named @ViewScoped public class SqlConnectionManagerBean extends AbstractResourceManagerBean implements Serializable { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/coverage/CoverageManagerBean.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/coverage/CoverageManagerBean.java index d94728f652..10e7e11290 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/coverage/CoverageManagerBean.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/coverage/CoverageManagerBean.java @@ -36,13 +36,12 @@ import java.io.Serializable; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ViewScoped; - +import jakarta.faces.view.ViewScoped; +import jakarta.inject.Named; import org.deegree.console.AbstractResourceManagerBean; import org.deegree.coverage.persistence.CoverageManager; -@ManagedBean +@Named @ViewScoped public class CoverageManagerBean extends AbstractResourceManagerBean implements Serializable { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/coverage/CreateCoverageBean.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/coverage/CreateCoverageBean.java index d7a10a1123..9ad8161785 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/coverage/CreateCoverageBean.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/coverage/CreateCoverageBean.java @@ -27,9 +27,8 @@ ----------------------------------------------------------------------------*/ package org.deegree.console.datastore.coverage; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ViewScoped; - +import jakarta.faces.view.ViewScoped; +import jakarta.inject.Named; import org.deegree.console.AbstractCreateResourceBean; import org.deegree.coverage.persistence.CoverageManager; @@ -39,7 +38,7 @@ * @author Markus Schneider * @since 3.3 */ -@ManagedBean +@Named @ViewScoped public class CreateCoverageBean extends AbstractCreateResourceBean { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/feature/CreateFeatureStoreBean.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/feature/CreateFeatureStoreBean.java index 3c6a9ca8aa..f948f72487 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/feature/CreateFeatureStoreBean.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/feature/CreateFeatureStoreBean.java @@ -27,10 +27,8 @@ ----------------------------------------------------------------------------*/ package org.deegree.console.datastore.feature; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.RequestScoped; -import javax.faces.bean.ViewScoped; - +import jakarta.faces.view.ViewScoped; +import jakarta.inject.Named; import org.deegree.console.AbstractCreateResourceBean; import org.deegree.feature.persistence.FeatureStoreManager; @@ -40,7 +38,7 @@ * @author Markus Schneider * @since 3.4 */ -@ManagedBean +@Named @ViewScoped public class CreateFeatureStoreBean extends AbstractCreateResourceBean { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/feature/FeatureStoreConfig.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/feature/FeatureStoreConfig.java index 26e2b5d944..52425dd94a 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/feature/FeatureStoreConfig.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/feature/FeatureStoreConfig.java @@ -34,7 +34,7 @@ ----------------------------------------------------------------------------*/ package org.deegree.console.datastore.feature; -import static javax.faces.application.FacesMessage.SEVERITY_ERROR; +import static jakarta.faces.application.FacesMessage.SEVERITY_ERROR; import java.io.IOException; import java.util.ArrayList; @@ -45,9 +45,9 @@ import java.util.Set; import java.util.TreeSet; -import javax.faces.application.FacesMessage; -import javax.faces.context.ExternalContext; -import javax.faces.context.FacesContext; +import jakarta.faces.application.FacesMessage; +import jakarta.faces.context.ExternalContext; +import jakarta.faces.context.FacesContext; import org.deegree.client.core.utils.SQLExecution; import org.deegree.console.Config; diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/feature/FeatureStoreLoader.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/feature/FeatureStoreLoader.java index 3427ff0937..59844e7f5f 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/feature/FeatureStoreLoader.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/feature/FeatureStoreLoader.java @@ -34,8 +34,8 @@ ----------------------------------------------------------------------------*/ package org.deegree.console.datastore.feature; -import static javax.faces.application.FacesMessage.SEVERITY_ERROR; -import static javax.faces.application.FacesMessage.SEVERITY_INFO; +import static jakarta.faces.application.FacesMessage.SEVERITY_ERROR; +import static jakarta.faces.application.FacesMessage.SEVERITY_INFO; import static org.deegree.gml.GMLVersion.GML_32; import static org.deegree.protocol.wfs.transaction.action.IDGenMode.GENERATE_NEW; import static org.deegree.protocol.wfs.transaction.action.IDGenMode.USE_EXISTING; @@ -44,11 +44,11 @@ import java.net.URL; import java.util.List; -import javax.faces.application.FacesMessage; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.RequestScoped; -import javax.faces.context.FacesContext; +import jakarta.enterprise.context.RequestScoped; +import jakarta.faces.application.FacesMessage; +import jakarta.faces.context.FacesContext; +import jakarta.inject.Named; import org.deegree.feature.FeatureCollection; import org.deegree.feature.persistence.FeatureStore; import org.deegree.feature.persistence.FeatureStoreException; @@ -63,7 +63,7 @@ * * @author Markus Schneider */ -@ManagedBean +@Named @RequestScoped public class FeatureStoreLoader implements Serializable { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/feature/FeatureStoreManagerBean.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/feature/FeatureStoreManagerBean.java index 16c72434b7..3e482d9402 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/feature/FeatureStoreManagerBean.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/feature/FeatureStoreManagerBean.java @@ -39,15 +39,14 @@ import java.util.Collections; import java.util.List; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ViewScoped; - +import jakarta.faces.view.ViewScoped; +import jakarta.inject.Named; import org.deegree.console.AbstractResourceManagerBean; import org.deegree.console.Config; import org.deegree.feature.persistence.FeatureStoreManager; import org.deegree.workspace.ResourceMetadata; -@ManagedBean +@Named @ViewScoped public class FeatureStoreManagerBean extends AbstractResourceManagerBean implements Serializable { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/feature/MappingWizardSQL.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/feature/MappingWizardSQL.java index 99a1ac2d84..d3e5884784 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/feature/MappingWizardSQL.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/feature/MappingWizardSQL.java @@ -34,7 +34,7 @@ ----------------------------------------------------------------------------*/ package org.deegree.console.datastore.feature; -import static javax.faces.application.FacesMessage.SEVERITY_ERROR; +import static jakarta.faces.application.FacesMessage.SEVERITY_ERROR; import static org.apache.commons.io.FileUtils.readFileToByteArray; import static org.deegree.feature.types.property.GeometryPropertyType.CoordinateDimension.DIM_2; @@ -48,14 +48,14 @@ import java.util.SortedSet; import java.util.TreeSet; -import javax.faces.application.FacesMessage; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.SessionScoped; -import javax.faces.context.ExternalContext; -import javax.faces.context.FacesContext; +import jakarta.enterprise.context.SessionScoped; +import jakarta.faces.application.FacesMessage; +import jakarta.faces.context.ExternalContext; +import jakarta.faces.context.FacesContext; import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamWriter; +import jakarta.inject.Named; import org.apache.commons.io.IOUtils; import org.deegree.client.core.utils.SQLExecution; import org.deegree.commons.config.DeegreeWorkspace; @@ -96,7 +96,7 @@ * * @author Markus Schneider */ -@ManagedBean +@Named @SessionScoped public class MappingWizardSQL { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/metadata/CreateMetadataStoreBean.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/metadata/CreateMetadataStoreBean.java index df7ac65920..567e999cb5 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/metadata/CreateMetadataStoreBean.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/metadata/CreateMetadataStoreBean.java @@ -27,10 +27,8 @@ ----------------------------------------------------------------------------*/ package org.deegree.console.datastore.metadata; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.RequestScoped; -import javax.faces.bean.ViewScoped; - +import jakarta.faces.view.ViewScoped; +import jakarta.inject.Named; import org.deegree.console.AbstractCreateResourceBean; import org.deegree.metadata.persistence.MetadataStoreManager; @@ -40,7 +38,7 @@ * @author Markus Schneider * @since 3.3 */ -@ManagedBean +@Named @ViewScoped public class CreateMetadataStoreBean extends AbstractCreateResourceBean { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/metadata/MetadataImporter.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/metadata/MetadataImporter.java index 32a9af41c3..e3c59ef54f 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/metadata/MetadataImporter.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/metadata/MetadataImporter.java @@ -35,19 +35,19 @@ package org.deegree.console.datastore.metadata; import static java.util.Collections.singletonList; -import static javax.faces.application.FacesMessage.SEVERITY_ERROR; -import static javax.faces.application.FacesMessage.SEVERITY_INFO; +import static jakarta.faces.application.FacesMessage.SEVERITY_ERROR; +import static jakarta.faces.application.FacesMessage.SEVERITY_INFO; import java.io.File; import java.io.Serializable; import java.util.ArrayList; import java.util.List; -import javax.faces.application.FacesMessage; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.RequestScoped; -import javax.faces.context.FacesContext; +import jakarta.enterprise.context.RequestScoped; +import jakarta.faces.application.FacesMessage; +import jakarta.faces.context.FacesContext; +import jakarta.inject.Named; import org.deegree.metadata.MetadataRecord; import org.deegree.metadata.MetadataRecordFactory; import org.deegree.metadata.persistence.MetadataInspectorException; @@ -63,7 +63,7 @@ * * @author Steffen Thomas */ -@ManagedBean +@Named @RequestScoped public class MetadataImporter implements Serializable { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/metadata/MetadataStoreConfig.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/metadata/MetadataStoreConfig.java index 1658f6e42d..fbd69fb0f4 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/metadata/MetadataStoreConfig.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/metadata/MetadataStoreConfig.java @@ -37,11 +37,11 @@ import java.io.IOException; import java.io.UnsupportedEncodingException; -import javax.faces.application.FacesMessage; -import javax.faces.component.html.HtmlCommandButton; -import javax.faces.context.ExternalContext; -import javax.faces.context.FacesContext; -import javax.faces.event.ActionEvent; +import jakarta.faces.application.FacesMessage; +import jakarta.faces.component.html.HtmlCommandButton; +import jakarta.faces.context.ExternalContext; +import jakarta.faces.context.FacesContext; +import jakarta.faces.event.ActionEvent; import org.deegree.client.core.utils.MessageUtils; import org.deegree.client.core.utils.SQLExecution; diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/metadata/MetadataStoreManagerBean.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/metadata/MetadataStoreManagerBean.java index e430585674..e94129644f 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/metadata/MetadataStoreManagerBean.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/metadata/MetadataStoreManagerBean.java @@ -39,15 +39,14 @@ import java.util.Collections; import java.util.List; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ViewScoped; - +import jakarta.faces.view.ViewScoped; +import jakarta.inject.Named; import org.deegree.console.AbstractResourceManagerBean; import org.deegree.console.Config; import org.deegree.metadata.persistence.MetadataStoreManager; import org.deegree.workspace.ResourceMetadata; -@ManagedBean +@Named @ViewScoped public class MetadataStoreManagerBean extends AbstractResourceManagerBean implements Serializable { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/tile/CreateTileStoreBean.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/tile/CreateTileStoreBean.java index b94d5b28d8..f6bba53f5d 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/tile/CreateTileStoreBean.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/tile/CreateTileStoreBean.java @@ -27,9 +27,8 @@ ----------------------------------------------------------------------------*/ package org.deegree.console.datastore.tile; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ViewScoped; - +import jakarta.faces.view.ViewScoped; +import jakarta.inject.Named; import org.deegree.console.AbstractCreateResourceBean; import org.deegree.tile.persistence.TileStoreManager; @@ -39,7 +38,7 @@ * @author Markus Schneider * @since 3.3 */ -@ManagedBean +@Named @ViewScoped public class CreateTileStoreBean extends AbstractCreateResourceBean { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/tile/TileStoreManagerBean.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/tile/TileStoreManagerBean.java index e74617170f..c6a42a5df8 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/tile/TileStoreManagerBean.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/datastore/tile/TileStoreManagerBean.java @@ -36,13 +36,12 @@ import java.io.Serializable; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ViewScoped; - +import jakarta.faces.view.ViewScoped; +import jakarta.inject.Named; import org.deegree.console.AbstractResourceManagerBean; import org.deegree.tile.persistence.TileStoreManager; -@ManagedBean +@Named @ViewScoped public class TileStoreManagerBean extends AbstractResourceManagerBean implements Serializable { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/generic/Connection.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/generic/Connection.java index 442d230e2a..2b209c9dd6 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/generic/Connection.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/generic/Connection.java @@ -36,11 +36,11 @@ import java.io.Serializable; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.RequestScoped; -import javax.faces.context.ExternalContext; -import javax.faces.context.FacesContext; +import jakarta.enterprise.context.RequestScoped; +import jakarta.faces.context.ExternalContext; +import jakarta.faces.context.FacesContext; +import jakarta.inject.Named; import org.deegree.console.workspace.WorkspaceBean; import org.deegree.db.ConnectionProvider; import org.deegree.db.ConnectionProviderProvider; @@ -51,7 +51,7 @@ * * @author Markus Schneider */ -@ManagedBean +@Named @RequestScoped public class Connection implements Serializable { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/generic/URLValidator.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/generic/URLValidator.java index 855acaf8bc..5e4d16f99c 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/generic/URLValidator.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/generic/URLValidator.java @@ -37,12 +37,12 @@ import java.net.MalformedURLException; import java.net.URL; -import javax.faces.application.FacesMessage; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.validator.FacesValidator; -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.FacesValidator; +import jakarta.faces.validator.Validator; +import jakarta.faces.validator.ValidatorException; /** * The URLValidator checks if a string is a valid URL diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/generic/XMLValidator.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/generic/XMLValidator.java index 22077473a4..05f9134ac8 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/generic/XMLValidator.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/generic/XMLValidator.java @@ -34,12 +34,12 @@ ----------------------------------------------------------------------------*/ package org.deegree.console.generic; -import javax.faces.application.FacesMessage; -import javax.faces.component.UIComponent; -import javax.faces.context.FacesContext; -import javax.faces.validator.FacesValidator; -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.FacesValidator; +import jakarta.faces.validator.Validator; +import jakarta.faces.validator.ValidatorException; /** * The XMLValidator checks if a text is a XML document diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/generic/XmlEditorBean.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/generic/XmlEditorBean.java index 8b498b6f16..049a016f90 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/generic/XmlEditorBean.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/generic/XmlEditorBean.java @@ -34,10 +34,10 @@ ----------------------------------------------------------------------------*/ package org.deegree.console.generic; -import static javax.faces.application.FacesMessage.SEVERITY_ERROR; -import static javax.faces.application.FacesMessage.SEVERITY_INFO; -import static javax.faces.application.FacesMessage.SEVERITY_WARN; -import static javax.faces.context.FacesContext.getCurrentInstance; +import static jakarta.faces.application.FacesMessage.SEVERITY_ERROR; +import static jakarta.faces.application.FacesMessage.SEVERITY_INFO; +import static jakarta.faces.application.FacesMessage.SEVERITY_WARN; +import static jakarta.faces.context.FacesContext.getCurrentInstance; import static org.slf4j.LoggerFactory.getLogger; import java.io.ByteArrayInputStream; @@ -50,11 +50,11 @@ import java.net.URL; import java.util.List; -import javax.faces.application.FacesMessage; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ViewScoped; -import javax.faces.context.FacesContext; +import jakarta.faces.application.FacesMessage; +import jakarta.faces.context.FacesContext; +import jakarta.faces.view.ViewScoped; +import jakarta.inject.Named; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; import org.apache.xerces.xni.parser.XMLParseException; @@ -75,7 +75,7 @@ import org.deegree.workspace.standard.DefaultWorkspace; import org.slf4j.Logger; -@ManagedBean +@Named @ViewScoped public class XmlEditorBean implements Serializable { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/layer/layer/CreateLayerBean.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/layer/layer/CreateLayerBean.java index a7ced3fb42..185ca93ef5 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/layer/layer/CreateLayerBean.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/layer/layer/CreateLayerBean.java @@ -27,10 +27,8 @@ ----------------------------------------------------------------------------*/ package org.deegree.console.layer.layer; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.RequestScoped; -import javax.faces.bean.ViewScoped; - +import jakarta.faces.view.ViewScoped; +import jakarta.inject.Named; import org.deegree.console.AbstractCreateResourceBean; import org.deegree.layer.persistence.LayerStoreManager; @@ -40,7 +38,7 @@ * @author Markus Schneider * @since 3.3 */ -@ManagedBean +@Named @ViewScoped public class CreateLayerBean extends AbstractCreateResourceBean { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/layer/layer/LayerManagerBean.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/layer/layer/LayerManagerBean.java index d608dd001b..3bcc3ad3c0 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/layer/layer/LayerManagerBean.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/layer/layer/LayerManagerBean.java @@ -36,13 +36,13 @@ import java.io.Serializable; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ViewScoped; +import jakarta.faces.view.ViewScoped; +import jakarta.inject.Named; import org.deegree.console.AbstractResourceManagerBean; import org.deegree.layer.persistence.LayerStoreManager; -@ManagedBean +@Named @ViewScoped public class LayerManagerBean extends AbstractResourceManagerBean implements Serializable { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/layer/style/CreateStyleBean.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/layer/style/CreateStyleBean.java index 76e504e524..aa33043a7b 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/layer/style/CreateStyleBean.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/layer/style/CreateStyleBean.java @@ -27,10 +27,8 @@ ----------------------------------------------------------------------------*/ package org.deegree.console.layer.style; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.RequestScoped; -import javax.faces.bean.ViewScoped; - +import jakarta.faces.view.ViewScoped; +import jakarta.inject.Named; import org.deegree.console.AbstractCreateResourceBean; import org.deegree.style.persistence.StyleStoreManager; @@ -40,7 +38,7 @@ * @author Markus Schneider * @since 3.3 */ -@ManagedBean +@Named @ViewScoped public class CreateStyleBean extends AbstractCreateResourceBean { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/layer/style/StyleManagerBean.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/layer/style/StyleManagerBean.java index 90aa508648..9d1d2f6187 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/layer/style/StyleManagerBean.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/layer/style/StyleManagerBean.java @@ -36,13 +36,12 @@ import java.io.Serializable; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ViewScoped; - +import jakarta.faces.view.ViewScoped; +import jakarta.inject.Named; import org.deegree.console.AbstractResourceManagerBean; import org.deegree.style.persistence.StyleStoreManager; -@ManagedBean +@Named @ViewScoped public class StyleManagerBean extends AbstractResourceManagerBean implements Serializable { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/layer/theme/CreateThemeBean.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/layer/theme/CreateThemeBean.java index 054efafd0a..b50775fd48 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/layer/theme/CreateThemeBean.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/layer/theme/CreateThemeBean.java @@ -27,10 +27,8 @@ ----------------------------------------------------------------------------*/ package org.deegree.console.layer.theme; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.RequestScoped; -import javax.faces.bean.ViewScoped; - +import jakarta.faces.view.ViewScoped; +import jakarta.inject.Named; import org.deegree.console.AbstractCreateResourceBean; import org.deegree.theme.persistence.ThemeManager; @@ -40,7 +38,7 @@ * @author Markus Schneider * @since 3.3 */ -@ManagedBean +@Named @ViewScoped public class CreateThemeBean extends AbstractCreateResourceBean { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/layer/theme/ThemeManagerBean.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/layer/theme/ThemeManagerBean.java index e50aeaafde..df86e02bc9 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/layer/theme/ThemeManagerBean.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/layer/theme/ThemeManagerBean.java @@ -36,13 +36,12 @@ import java.io.Serializable; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ViewScoped; - +import jakarta.faces.view.ViewScoped; +import jakarta.inject.Named; import org.deegree.console.AbstractResourceManagerBean; import org.deegree.theme.persistence.ThemeManager; -@ManagedBean +@Named @ViewScoped public class ThemeManagerBean extends AbstractResourceManagerBean implements Serializable { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/moduleinfo/ModulesBean.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/moduleinfo/ModulesBean.java index 35027e66cc..2e349750c2 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/moduleinfo/ModulesBean.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/moduleinfo/ModulesBean.java @@ -35,11 +35,11 @@ import java.util.Collections; import java.util.List; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.RequestScoped; -import javax.faces.context.ExternalContext; -import javax.faces.context.FacesContext; +import jakarta.enterprise.context.RequestScoped; +import jakarta.faces.context.ExternalContext; +import jakarta.faces.context.FacesContext; +import jakarta.inject.Named; import org.deegree.workspace.standard.ModuleInfo; import org.deegree.console.workspace.WorkspaceBean; @@ -48,7 +48,7 @@ * * @since 3.3 */ -@ManagedBean +@Named @RequestScoped public class ModulesBean implements Serializable { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/process/CreateProcessBean.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/process/CreateProcessBean.java index a0cc63dd96..1443361036 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/process/CreateProcessBean.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/process/CreateProcessBean.java @@ -27,10 +27,8 @@ ----------------------------------------------------------------------------*/ package org.deegree.console.process; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.RequestScoped; -import javax.faces.bean.ViewScoped; - +import jakarta.faces.view.ViewScoped; +import jakarta.inject.Named; import org.deegree.console.AbstractCreateResourceBean; import org.deegree.services.wps.ProcessManager; @@ -40,7 +38,7 @@ * @author Markus Schneider * @since 3.3 */ -@ManagedBean +@Named @ViewScoped public class CreateProcessBean extends AbstractCreateResourceBean { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/process/ProcessManagerBean.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/process/ProcessManagerBean.java index c0ed0fb9b9..1bd562742e 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/process/ProcessManagerBean.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/process/ProcessManagerBean.java @@ -36,13 +36,12 @@ import java.io.Serializable; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ViewScoped; - +import jakarta.faces.view.ViewScoped; +import jakarta.inject.Named; import org.deegree.console.AbstractResourceManagerBean; import org.deegree.services.wps.ProcessManager; -@ManagedBean +@Named @ViewScoped public class ProcessManagerBean extends AbstractResourceManagerBean implements Serializable { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/proxy/ProxyBean.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/proxy/ProxyBean.java index 7e8049297e..dd1f23aa7b 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/proxy/ProxyBean.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/proxy/ProxyBean.java @@ -29,15 +29,14 @@ import java.io.IOException; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.RequestScoped; - +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Named; import org.deegree.commons.proxy.ProxySettings; /** * @author Andreas Schmitz */ -@ManagedBean +@Named @RequestScoped public class ProxyBean { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/security/LogBean.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/security/LogBean.java index fb0fae5b38..d1f9588c0d 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/security/LogBean.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/security/LogBean.java @@ -27,19 +27,19 @@ ----------------------------------------------------------------------------*/ package org.deegree.console.security; -import static javax.faces.application.FacesMessage.SEVERITY_ERROR; -import static javax.faces.application.FacesMessage.SEVERITY_WARN; +import static jakarta.faces.application.FacesMessage.SEVERITY_ERROR; +import static jakarta.faces.application.FacesMessage.SEVERITY_WARN; import java.io.File; import java.io.IOException; import java.io.Serializable; import java.security.NoSuchAlgorithmException; -import javax.faces.application.FacesMessage; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.SessionScoped; -import javax.faces.context.FacesContext; +import jakarta.enterprise.context.SessionScoped; +import jakarta.faces.application.FacesMessage; +import jakarta.faces.context.FacesContext; +import jakarta.inject.Named; import org.deegree.commons.config.DeegreeWorkspace; /** @@ -50,7 +50,7 @@ * @author Markus Schneider * @since 3.3 */ -@ManagedBean +@Named @SessionScoped public class LogBean implements Serializable { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/webservices/CreateServiceBean.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/webservices/CreateServiceBean.java index 301199b5b5..1106d41679 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/webservices/CreateServiceBean.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/webservices/CreateServiceBean.java @@ -27,10 +27,8 @@ ----------------------------------------------------------------------------*/ package org.deegree.console.webservices; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.RequestScoped; -import javax.faces.bean.ViewScoped; - +import jakarta.faces.view.ViewScoped; +import jakarta.inject.Named; import org.deegree.console.AbstractCreateResourceBean; import org.deegree.services.OwsManager; @@ -40,7 +38,7 @@ * @author Markus Schneider * @since 3.3 */ -@ManagedBean +@Named @ViewScoped public class CreateServiceBean extends AbstractCreateResourceBean { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/webservices/ServiceConfig.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/webservices/ServiceConfig.java index ca2542b559..20066cf57a 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/webservices/ServiceConfig.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/webservices/ServiceConfig.java @@ -32,8 +32,8 @@ import java.io.IOException; import java.net.URL; -import javax.faces.context.FacesContext; -import javax.servlet.http.HttpServletRequest; +import jakarta.faces.context.FacesContext; +import jakarta.servlet.http.HttpServletRequest; import org.deegree.console.Config; import org.deegree.services.OWS; diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/webservices/ServicesBean.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/webservices/ServicesBean.java index 145e48f6c2..ed16944635 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/webservices/ServicesBean.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/webservices/ServicesBean.java @@ -32,9 +32,8 @@ import java.util.Collections; import java.util.List; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.ViewScoped; - +import jakarta.faces.view.ViewScoped; +import jakarta.inject.Named; import org.deegree.console.AbstractResourceManagerBean; import org.deegree.console.Config; import org.deegree.services.OwsManager; @@ -45,7 +44,7 @@ * * @author Your Name */ -@ManagedBean +@Named @ViewScoped public class ServicesBean extends AbstractResourceManagerBean implements Serializable { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/webservices/wps/ProcessExecutionsBean.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/webservices/wps/ProcessExecutionsBean.java index 8404db23a1..38f2a4c7da 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/webservices/wps/ProcessExecutionsBean.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/webservices/wps/ProcessExecutionsBean.java @@ -37,9 +37,8 @@ import java.util.ArrayList; import java.util.List; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.RequestScoped; - +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Named; import org.deegree.services.controller.OGCFrontController; import org.deegree.services.wps.WPService; @@ -48,7 +47,7 @@ * * @author Markus Schneider */ -@ManagedBean +@Named @RequestScoped public class ProcessExecutionsBean { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/webservices/wps/WPSBean.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/webservices/wps/WPSBean.java index a2041cd439..266d091963 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/webservices/wps/WPSBean.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/webservices/wps/WPSBean.java @@ -37,9 +37,8 @@ import java.util.ArrayList; import java.util.List; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.RequestScoped; - +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Named; import org.deegree.services.controller.OGCFrontController; import org.deegree.services.wps.WPSProcess; import org.deegree.services.wps.WPService; @@ -49,7 +48,7 @@ * * @author Markus Schneider */ -@ManagedBean +@Named @RequestScoped public class WPSBean { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/workspace/CreateWorkspaceBean.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/workspace/CreateWorkspaceBean.java index 85b48d1c11..0c456af9fc 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/workspace/CreateWorkspaceBean.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/workspace/CreateWorkspaceBean.java @@ -29,9 +29,8 @@ import java.io.File; -import javax.faces.bean.ManagedBean; -import javax.faces.bean.RequestScoped; - +import jakarta.enterprise.context.RequestScoped; +import jakarta.inject.Named; import org.deegree.commons.config.DeegreeWorkspace; import org.deegree.console.JsfUtils; @@ -41,7 +40,7 @@ * @author Dirk Stenger * @since 3.4 */ -@ManagedBean +@Named @RequestScoped public class CreateWorkspaceBean { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/workspace/WorkspaceBean.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/workspace/WorkspaceBean.java index 5e0a7c8e28..7745c797f9 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/workspace/WorkspaceBean.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/workspace/WorkspaceBean.java @@ -34,8 +34,8 @@ ----------------------------------------------------------------------------*/ package org.deegree.console.workspace; -import static javax.faces.application.FacesMessage.SEVERITY_ERROR; -import static javax.faces.application.FacesMessage.SEVERITY_INFO; +import static jakarta.faces.application.FacesMessage.SEVERITY_ERROR; +import static jakarta.faces.application.FacesMessage.SEVERITY_INFO; import static org.apache.commons.io.IOUtils.closeQuietly; import static org.apache.commons.io.IOUtils.readLines; import static org.deegree.client.core.utils.ActionParams.getParam1; @@ -44,7 +44,6 @@ import static org.deegree.services.controller.OGCFrontController.getModulesInfo; import java.io.File; -import java.io.FileInputStream; import java.io.IOException; import java.io.InputStream; import java.io.Serializable; @@ -55,11 +54,11 @@ import java.util.HashMap; import java.util.List; -import javax.faces.application.FacesMessage; -import javax.faces.bean.ApplicationScoped; -import javax.faces.bean.ManagedBean; -import javax.faces.context.FacesContext; +import jakarta.enterprise.context.ApplicationScoped; +import jakarta.faces.application.FacesMessage; +import jakarta.faces.context.FacesContext; +import jakarta.inject.Named; import org.apache.commons.io.FileUtils; import org.apache.http.HttpResponse; import org.deegree.commons.config.DeegreeWorkspace; @@ -80,7 +79,7 @@ * @author Markus Schneider * @since 3.4 */ -@ManagedBean(name = "workspace") +@Named("workspace") @ApplicationScoped public class WorkspaceBean implements Serializable { diff --git a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/workspace/WorkspaceValidator.java b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/workspace/WorkspaceValidator.java index 3f077fdec8..982a144d93 100644 --- a/deegree-services/deegree-webservices/src/main/java/org/deegree/console/workspace/WorkspaceValidator.java +++ b/deegree-services/deegree-webservices/src/main/java/org/deegree/console/workspace/WorkspaceValidator.java @@ -10,8 +10,8 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.faces.application.FacesMessage; -import javax.faces.context.FacesContext; +import jakarta.faces.application.FacesMessage; +import jakarta.faces.context.FacesContext; import java.io.File; import java.net.URI; import java.nio.file.PathMatcher; @@ -20,8 +20,8 @@ import java.util.Map; import java.util.TreeMap; -import static javax.faces.application.FacesMessage.SEVERITY_ERROR; -import static javax.faces.application.FacesMessage.SEVERITY_INFO; +import static jakarta.faces.application.FacesMessage.SEVERITY_ERROR; +import static jakarta.faces.application.FacesMessage.SEVERITY_INFO; public class WorkspaceValidator { diff --git a/deegree-tests/deegree-testservice/pom.xml b/deegree-tests/deegree-testservice/pom.xml index 1d072e5899..21e9367158 100644 --- a/deegree-tests/deegree-testservice/pom.xml +++ b/deegree-tests/deegree-testservice/pom.xml @@ -161,12 +161,12 @@ commons-io - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api - javax.servlet.jsp - javax.servlet.jsp-api + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api jakarta.mail diff --git a/deegree-tests/pom.xml b/deegree-tests/pom.xml index 594e5043d2..31a423b5d9 100644 --- a/deegree-tests/pom.xml +++ b/deegree-tests/pom.xml @@ -89,6 +89,13 @@ + + + commons-io + commons-io + 2.15.1 + + org.apache.maven.plugins @@ -117,12 +124,12 @@ xml-apis - javax.servlet - javax.servlet-api + jakarta.servlet + jakarta.servlet-api - javax.servlet.jsp - javax.servlet.jsp-api + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api diff --git a/deegree-tests/src/main/java/org/deegree/test/gui/StressTestController.java b/deegree-tests/src/main/java/org/deegree/test/gui/StressTestController.java index 84cab05ce4..fb44eb7d15 100644 --- a/deegree-tests/src/main/java/org/deegree/test/gui/StressTestController.java +++ b/deegree-tests/src/main/java/org/deegree/test/gui/StressTestController.java @@ -52,12 +52,12 @@ //import java.util.Random; import javax.imageio.ImageIO; -import javax.servlet.RequestDispatcher; -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.RequestDispatcher; +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.deegree.test.services.wpvs.TestResultData; import org.deegree.test.services.wpvs.WPVSStressTest; diff --git a/pom.xml b/pom.xml index 380ef85a35..9f3a21380a 100644 --- a/pom.xml +++ b/pom.xml @@ -245,7 +245,7 @@ org.eclipse.jetty jetty-maven-plugin - 10.0.15 + 11.0.19 @@ -550,9 +550,9 @@ 1.16.0 - commons-fileupload - commons-fileupload - 1.5 + org.apache.commons + commons-fileupload2-jakarta-servlet6 + 2.0.0-M2 org.apache.httpcomponents @@ -593,38 +593,45 @@ - javax.servlet - javax.servlet-api - 3.1.0 + jakarta.servlet + jakarta.servlet-api + 6.0.0 provided - javax.servlet.jsp - javax.servlet.jsp-api - 2.3.3 + jakarta.servlet.jsp + jakarta.servlet.jsp-api + 3.1.0 provided - javax.servlet - jstl - 1.2 + jakarta.servlet.jsp.jstl + jakarta.servlet.jsp.jstl-api + 3.0.0 runtime - javax.el - javax.el-api - 3.0.0 + jakarta.el + jakarta.el-api + 5.0.1 provided + + + org.glassfish + jakarta.faces + 4.0.5 - com.sun.faces - jsf-impl - 2.2.20 + jakarta.enterprise + jakarta.enterprise.cdi-api + 4.0.1 org.reflections reflections - 0.9.12 + 0.10.2 ch.qos.logback @@ -1142,10 +1150,6 @@ ch.qos.logback logback-core - - javax.servlet - javax.servlet-api - @@ -1166,7 +1170,7 @@ jakarta.mail jakarta.mail-api - 2.0.1 + 2.1.2 provided