Merge pull request #1645 from lat-lon/fix/faces4Uris

Fixed web.xml and faces-config.xml deployment descriptor
deegree · Feb 21, 2024 · e72a6a5 · e72a6a5
2 parents 6a51fcd + 1551299
commit e72a6a5
Show file tree

Hide file tree

Showing 8 changed files with 46 additions and 33 deletions.
diff --git a/deegree-client/deegree-jsf-core/pom.xml b/deegree-client/deegree-jsf-core/pom.xml
@@ -77,6 +77,11 @@
       <artifactId>jakarta.faces-api</artifactId>
     </dependency>
     -->
+    <dependency>
+      <groupId>org.jboss.weld.servlet</groupId>
+      <artifactId>weld-servlet-shaded</artifactId>
+      <version>5.1.2.Final</version>
+    </dependency>
     <dependency>
       <groupId>jakarta.el</groupId>
       <artifactId>jakarta.el-api</artifactId>

diff --git a/deegree-client/deegree-jsf-core/src/main/resources/META-INF/deegree.taglib.xml b/deegree-client/deegree-jsf-core/src/main/resources/META-INF/deegree.taglib.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<facelet-taglib xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<facelet-taglib xmlns="https://jakarta.ee/xml/ns/jakartaee"
                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facelettaglibrary_2_2.xsd"
-  version="2.2">
+                xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-facelettaglibrary_4_0.xsd"
+                version="4.0">
   <namespace>http://deegree.org/jsf</namespace>
   <tag>
     <tag-name>fieldset</tag-name>

diff --git a/deegree-client/deegree-jsf-core/src/main/resources/META-INF/faces-config.xml b/deegree-client/deegree-jsf-core/src/main/resources/META-INF/faces-config.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<faces-config xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<faces-config xmlns="https://jakarta.ee/xml/ns/jakartaee"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd"
-    version="2.2" metadata-complete="false">
+              xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_4_0.xsd"
+              version="4.0" metadata-complete="false">
 
     <name>deegree-jsf-core</name>
 

diff --git a/deegree-services/deegree-webservices/src/main/webapp/WEB-INF/faces-config.xml b/deegree-services/deegree-webservices/src/main/webapp/WEB-INF/faces-config.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
-<faces-config xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<faces-config xmlns="https://jakarta.ee/xml/ns/jakartaee"
               xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-facesconfig_2_2.xsd"
-  version="2.2" metadata-complete="false">
+              xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-facesconfig_4_0.xsd"
+              version="4.0" metadata-complete="false">
 
   <name>deegree services console UI</name>
 

diff --git a/deegree-services/deegree-webservices/src/main/webapp/WEB-INF/web.xml b/deegree-services/deegree-webservices/src/main/webapp/WEB-INF/web.xml
@@ -1,15 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
-         id="WebApp_ID" version="3.1">
+<web-app xmlns = "https://jakarta.ee/xml/ns/jakartaee"
+         xmlns:xsi = "http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation = "https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"
+         version = "6.0"
+         metadata-complete = "false">
   <display-name>deegree 3 OGC services console + generic client</display-name>
 
   <context-param>
-    <param-name>javax.faces.PROJECT_STAGE</param-name>
+    <param-name>jakarta.faces.PROJECT_STAGE</param-name>
     <param-value>Development</param-value>
   </context-param>
 
+  <context-param>
+    <param-name>jakarta.faces.FACELETS_BUFFER_SIZE</param-name>
+    <param-value>65535</param-value> <!-- 64KB -->
+  </context-param>
+
+  <context-param>
+    <param-name>jakarta.faces.SERIALIZE_SERVER_STATE</param-name>
+    <param-value>true</param-value>
+  </context-param>
+
+  <!-- Prevent duplicate jakarta.faces.ViewState element IDs. -->
+  <context-param>
+    <param-name>com.sun.faces.enableViewStateIdRendering</param-name>
+    <param-value>false</param-value>
+  </context-param>
+
   <context-param>
     <param-name>primefaces.THEME</param-name>
     <param-value>nova-light</param-value>
@@ -19,23 +36,10 @@
     <param-name>primefaces.UPLOADER</param-name>
     <param-value>native</param-value>
   </context-param>
-<!--
-  <filter>
-    <filter-name>Upload Filter</filter-name>
-    <filter-class>org.primefaces.webapp.filter.FileUploadFilter</filter-class>
-  </filter>
-  <filter-mapping>
-    <filter-name>Upload Filter</filter-name>
-    <servlet-name>Faces Servlet</servlet-name>
-  </filter-mapping>
--->
-  <listener>
-    <listener-class>com.sun.faces.config.ConfigureListener</listener-class>
-  </listener>
 
   <servlet>
     <servlet-name>Faces Servlet</servlet-name>
-    <servlet-class>javax.faces.webapp.FacesServlet</servlet-class>
+    <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
     <load-on-startup>1</load-on-startup>
   </servlet>
 

diff --git a/deegree-services/deegree-webservices/src/main/webapp/index.xhtml b/deegree-services/deegree-webservices/src/main/webapp/index.xhtml
@@ -1,5 +1,7 @@
-<ui:composition template="/layout.xhtml" xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://xmlns.jcp.org/jsf/html"
-  xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:p="http://primefaces.org/ui">
+<ui:composition template="/layout.xhtml"
+                xmlns="http://www.w3.org/1999/xhtml"
+                xmlns:h="jakarta.faces.html"
+                xmlns:ui="jakarta.faces.facelets">
   <ui:define name="center">
     <h:panelGroup>
       <h:outputText styleClass="titel" value="#{labels.welcome}" />

diff --git a/deegree-services/deegree-webservices/src/main/webapp/layout.xhtml b/deegree-services/deegree-webservices/src/main/webapp/layout.xhtml
@@ -1,6 +1,8 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xmlns:h="http://xmlns.jcp.org/jsf/html" xmlns:f="http://xmlns.jcp.org/jsf/core"
-  xmlns:ui="http://xmlns.jcp.org/jsf/facelets" xmlns:p="http://primefaces.org/ui">
+<html xmlns="http://www.w3.org/1999/xhtml"
+      xmlns:h="jakarta.faces.html"
+      xmlns:ui="jakarta.faces.facelets"
+      xmlns:p="http://primefaces.org/ui">
 <h:head>
   <title>deegree 3 console</title>
   <h:outputStylesheet name="pagelayout.css" />

diff --git a/pom.xml b/pom.xml
@@ -531,7 +531,7 @@
       <dependency>
         <groupId>commons-io</groupId>
         <artifactId>commons-io</artifactId>
-        <version>2.7</version>
+        <version>2.15.1</version>
       </dependency>
       <dependency>
         <groupId>commons-beanutils</groupId>