This is an automated email from the ASF dual-hosted git repository. lukaszlenart pushed a commit to branch feat/struts-730-modernization in repository https://gitbox.apache.org/repos/asf/struts-examples.git
commit 7187c8cb7268e0da7d99cb347f44d986535f9ded Author: Lukasz Lenart <[email protected]> AuthorDate: Fri Aug 14 12:12:30 2026 +0200 Migrate web.xml descriptors to Jakarta EE 6.0 schema Brings the 29 descriptors still on Servlet 2.3-3.1 era schemas in line with the 18 already using web-app_6_0.xsd. Co-Authored-By: Claude Opus 5 <[email protected]> --- action-chaining/src/main/webapp/WEB-INF/web.xml | 6 +++--- annotations/src/main/webapp/WEB-INF/web.xml | 7 ++++--- basic-struts/src/main/webapp/WEB-INF/web.xml | 5 ++++- bean-validation/src/main/webapp/WEB-INF/web.xml | 5 ++++- blank/src/main/webapp/WEB-INF/web.xml | 5 +++-- control-tags/src/main/webapp/WEB-INF/web.xml | 5 ++++- crud/src/main/webapp/WEB-INF/web.xml | 7 ++++--- debugging-struts/src/main/webapp/WEB-INF/web.xml | 5 ++++- dynamic-href/src/main/webapp/WEB-INF/web.xml | 5 +++-- expression-cache/src/main/webapp/WEB-INF/web.xml | 7 +++---- jfreechart/src/main/webapp/WEB-INF/web.xml | 7 +++---- json-customize/src/main/webapp/WEB-INF/web.xml | 6 +++--- json/src/main/webapp/WEB-INF/web.xml | 6 +++--- mailreader2/src/main/webapp/WEB-INF/web.xml | 8 +++++--- message-store/src/main/webapp/WEB-INF/web.xml | 6 +++--- quarkus/src/main/resources/META-INF/web.xml | 5 +++-- rest-angular/src/main/webapp/WEB-INF/web.xml | 5 +++-- restful2actionmapper/src/main/webapp/WEB-INF/web.xml | 5 ++++- shiro-basic/src/main/webapp/WEB-INF/web.xml | 5 ++++- sitemesh3/src/main/webapp/WEB-INF/web.xml | 7 +++---- struts-parameter/src/main/webapp/WEB-INF/web.xml | 7 +++---- text-provider/src/main/webapp/WEB-INF/web.xml | 6 +++--- themes-override/src/main/webapp/WEB-INF/web.xml | 5 ++++- tiles/src/main/webapp/WEB-INF/web.xml | 7 +++---- type-conversion/src/main/webapp/WEB-INF/web.xml | 6 +++--- unknown-handler/src/main/webapp/WEB-INF/web.xml | 6 +++--- using-tags/src/main/webapp/WEB-INF/web.xml | 5 ++++- validation-messages/src/main/webapp/WEB-INF/web.xml | 6 +++--- wildcard-regex/src/main/webapp/WEB-INF/web.xml | 6 +++--- 29 files changed, 99 insertions(+), 72 deletions(-) diff --git a/action-chaining/src/main/webapp/WEB-INF/web.xml b/action-chaining/src/main/webapp/WEB-INF/web.xml index 8858656..aa802de 100644 --- a/action-chaining/src/main/webapp/WEB-INF/web.xml +++ b/action-chaining/src/main/webapp/WEB-INF/web.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app id="struts_blank" version="2.4" - xmlns="http://java.sun.com/xml/ns/j2ee"; +<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"; + version="6.0"> <display-name>Struts Blank</display-name> <filter> diff --git a/annotations/src/main/webapp/WEB-INF/web.xml b/annotations/src/main/webapp/WEB-INF/web.xml index 89d0ac4..175a2bb 100644 --- a/annotations/src/main/webapp/WEB-INF/web.xml +++ b/annotations/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app id="WebApp_ID" version="2.4" - xmlns="http://java.sun.com/xml/ns/j2ee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";> +<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"> <display-name>annotations</display-name> <filter> diff --git a/basic-struts/src/main/webapp/WEB-INF/web.xml b/basic-struts/src/main/webapp/WEB-INF/web.xml index b2d5468..5d0123f 100644 --- a/basic-struts/src/main/webapp/WEB-INF/web.xml +++ b/basic-struts/src/main/webapp/WEB-INF/web.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";> +<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"> <display-name>Basic Struts2</display-name> <welcome-file-list> <welcome-file>index</welcome-file> diff --git a/bean-validation/src/main/webapp/WEB-INF/web.xml b/bean-validation/src/main/webapp/WEB-INF/web.xml index f2fd98e..bf79d7b 100755 --- a/bean-validation/src/main/webapp/WEB-INF/web.xml +++ b/bean-validation/src/main/webapp/WEB-INF/web.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";> +<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"> <display-name>JSR303_Validation_Struts2_Mvn</display-name> <welcome-file-list> <welcome-file>index.jsp</welcome-file> diff --git a/blank/src/main/webapp/WEB-INF/web.xml b/blank/src/main/webapp/WEB-INF/web.xml index 884eff9..0e63332 100644 --- a/blank/src/main/webapp/WEB-INF/web.xml +++ b/blank/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app id="WebApp_9" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"; +<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"; + version="6.0"> <display-name>Struts Blank</display-name> diff --git a/control-tags/src/main/webapp/WEB-INF/web.xml b/control-tags/src/main/webapp/WEB-INF/web.xml index f045032..56666a8 100755 --- a/control-tags/src/main/webapp/WEB-INF/web.xml +++ b/control-tags/src/main/webapp/WEB-INF/web.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";> +<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"> <display-name>control_tags</display-name> <welcome-file-list> <welcome-file>/index</welcome-file> diff --git a/crud/src/main/webapp/WEB-INF/web.xml b/crud/src/main/webapp/WEB-INF/web.xml index 65cd4a2..fb0e2ea 100755 --- a/crud/src/main/webapp/WEB-INF/web.xml +++ b/crud/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"; - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";> +<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"> <display-name>Struts 2 CRUD Example</display-name> <welcome-file-list> diff --git a/debugging-struts/src/main/webapp/WEB-INF/web.xml b/debugging-struts/src/main/webapp/WEB-INF/web.xml index 4daa5a2..4edcdb7 100644 --- a/debugging-struts/src/main/webapp/WEB-INF/web.xml +++ b/debugging-struts/src/main/webapp/WEB-INF/web.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";> +<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"> <display-name>Debugging Struts</display-name> <welcome-file-list> <welcome-file>index.jsp</welcome-file> diff --git a/dynamic-href/src/main/webapp/WEB-INF/web.xml b/dynamic-href/src/main/webapp/WEB-INF/web.xml index 5923ee0..57e02e7 100644 --- a/dynamic-href/src/main/webapp/WEB-INF/web.xml +++ b/dynamic-href/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app id="struts_dynamic_url" version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"; +<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd";> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"; + version="6.0"> <display-name>Dynamic Url</display-name> diff --git a/expression-cache/src/main/webapp/WEB-INF/web.xml b/expression-cache/src/main/webapp/WEB-INF/web.xml index d830047..6e4e87d 100644 --- a/expression-cache/src/main/webapp/WEB-INF/web.xml +++ b/expression-cache/src/main/webapp/WEB-INF/web.xml @@ -19,11 +19,10 @@ * under the License. */ --> -<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"; +<web-app 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-app_3_1.xsd"; - version="3.1"> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"; + version="6.0"> <display-name>Struts 2 - Expression Cache</display-name> diff --git a/jfreechart/src/main/webapp/WEB-INF/web.xml b/jfreechart/src/main/webapp/WEB-INF/web.xml index 03d5eda..2008613 100644 --- a/jfreechart/src/main/webapp/WEB-INF/web.xml +++ b/jfreechart/src/main/webapp/WEB-INF/web.xml @@ -20,11 +20,10 @@ */ --> -<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"; +<web-app 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-app_3_1.xsd"; - version="3.1"> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"; + version="6.0"> <display-name>Struts JFreeChart example</display-name> diff --git a/json-customize/src/main/webapp/WEB-INF/web.xml b/json-customize/src/main/webapp/WEB-INF/web.xml index 8858656..aa802de 100644 --- a/json-customize/src/main/webapp/WEB-INF/web.xml +++ b/json-customize/src/main/webapp/WEB-INF/web.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app id="struts_blank" version="2.4" - xmlns="http://java.sun.com/xml/ns/j2ee"; +<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"; + version="6.0"> <display-name>Struts Blank</display-name> <filter> diff --git a/json/src/main/webapp/WEB-INF/web.xml b/json/src/main/webapp/WEB-INF/web.xml index 8858656..aa802de 100644 --- a/json/src/main/webapp/WEB-INF/web.xml +++ b/json/src/main/webapp/WEB-INF/web.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app id="struts_blank" version="2.4" - xmlns="http://java.sun.com/xml/ns/j2ee"; +<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"; + version="6.0"> <display-name>Struts Blank</display-name> <filter> diff --git a/mailreader2/src/main/webapp/WEB-INF/web.xml b/mailreader2/src/main/webapp/WEB-INF/web.xml index c09b9e6..1dcf5fc 100644 --- a/mailreader2/src/main/webapp/WEB-INF/web.xml +++ b/mailreader2/src/main/webapp/WEB-INF/web.xml @@ -1,6 +1,8 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd";> -<web-app> +<?xml version="1.0" encoding="UTF-8"?> +<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"> <display-name>Struts 2 Mailreader 2</display-name> diff --git a/message-store/src/main/webapp/WEB-INF/web.xml b/message-store/src/main/webapp/WEB-INF/web.xml index 8858656..aa802de 100644 --- a/message-store/src/main/webapp/WEB-INF/web.xml +++ b/message-store/src/main/webapp/WEB-INF/web.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app id="struts_blank" version="2.4" - xmlns="http://java.sun.com/xml/ns/j2ee"; +<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"; + version="6.0"> <display-name>Struts Blank</display-name> <filter> diff --git a/quarkus/src/main/resources/META-INF/web.xml b/quarkus/src/main/resources/META-INF/web.xml index 0eb6bbf..01efd15 100644 --- a/quarkus/src/main/resources/META-INF/web.xml +++ b/quarkus/src/main/resources/META-INF/web.xml @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app id="struts_angularjs" version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"; +<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd";> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"; + version="6.0"> <display-name>Struts Blank AngularJS App</display-name> <filter> diff --git a/rest-angular/src/main/webapp/WEB-INF/web.xml b/rest-angular/src/main/webapp/WEB-INF/web.xml index 8d08c0b..5c4b40d 100644 --- a/rest-angular/src/main/webapp/WEB-INF/web.xml +++ b/rest-angular/src/main/webapp/WEB-INF/web.xml @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app id="struts_angularjs" version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"; +<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd";> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"; + version="6.0"> <display-name>Struts Blank AngularJS App</display-name> <filter> diff --git a/restful2actionmapper/src/main/webapp/WEB-INF/web.xml b/restful2actionmapper/src/main/webapp/WEB-INF/web.xml index f12db2b..a6903a6 100755 --- a/restful2actionmapper/src/main/webapp/WEB-INF/web.xml +++ b/restful2actionmapper/src/main/webapp/WEB-INF/web.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";> +<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"> <display-name>REST Style URLs</display-name> <welcome-file-list> <welcome-file>index.jsp</welcome-file> diff --git a/shiro-basic/src/main/webapp/WEB-INF/web.xml b/shiro-basic/src/main/webapp/WEB-INF/web.xml index c62e000..7cfbe3e 100644 --- a/shiro-basic/src/main/webapp/WEB-INF/web.xml +++ b/shiro-basic/src/main/webapp/WEB-INF/web.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xmlns="http://java.sun.com/xml/ns/javaee"; xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"; id="WebApp_ID" version="3.0"> +<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"> <display-name>struts2shiro</display-name> <listener> <listener-class>org.apache.shiro.web.env.EnvironmentLoaderListener</listener-class> diff --git a/sitemesh3/src/main/webapp/WEB-INF/web.xml b/sitemesh3/src/main/webapp/WEB-INF/web.xml index a09fa7b..d0a822c 100644 --- a/sitemesh3/src/main/webapp/WEB-INF/web.xml +++ b/sitemesh3/src/main/webapp/WEB-INF/web.xml @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"; +<web-app 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-app_3_1.xsd"; - version="3.1"> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"; + version="6.0"> <display-name>Struts Sitemesh 3 Demo</display-name> diff --git a/struts-parameter/src/main/webapp/WEB-INF/web.xml b/struts-parameter/src/main/webapp/WEB-INF/web.xml index 7f5eaf9..cc3f048 100644 --- a/struts-parameter/src/main/webapp/WEB-INF/web.xml +++ b/struts-parameter/src/main/webapp/WEB-INF/web.xml @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"; +<web-app 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-app_3_1.xsd"; - version="3.1"> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"; + version="6.0"> <filter> <filter-name>struts2</filter-name> <filter-class>org.apache.struts2.dispatcher.filter.StrutsPrepareAndExecuteFilter</filter-class> diff --git a/text-provider/src/main/webapp/WEB-INF/web.xml b/text-provider/src/main/webapp/WEB-INF/web.xml index 8858656..aa802de 100644 --- a/text-provider/src/main/webapp/WEB-INF/web.xml +++ b/text-provider/src/main/webapp/WEB-INF/web.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app id="struts_blank" version="2.4" - xmlns="http://java.sun.com/xml/ns/j2ee"; +<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"; + version="6.0"> <display-name>Struts Blank</display-name> <filter> diff --git a/themes-override/src/main/webapp/WEB-INF/web.xml b/themes-override/src/main/webapp/WEB-INF/web.xml index 68d7de0..f0772e3 100644 --- a/themes-override/src/main/webapp/WEB-INF/web.xml +++ b/themes-override/src/main/webapp/WEB-INF/web.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";> +<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"> <display-name>Themes Struts 2</display-name> <welcome-file-list> <welcome-file>index.jsp</welcome-file> diff --git a/tiles/src/main/webapp/WEB-INF/web.xml b/tiles/src/main/webapp/WEB-INF/web.xml index 401c434..87ae10e 100644 --- a/tiles/src/main/webapp/WEB-INF/web.xml +++ b/tiles/src/main/webapp/WEB-INF/web.xml @@ -1,9 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee"; +<web-app 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-app_3_1.xsd"; - version="3.1"> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"; + version="6.0"> <display-name>Struts Tiles 2 Demo</display-name> diff --git a/type-conversion/src/main/webapp/WEB-INF/web.xml b/type-conversion/src/main/webapp/WEB-INF/web.xml index 8858656..aa802de 100644 --- a/type-conversion/src/main/webapp/WEB-INF/web.xml +++ b/type-conversion/src/main/webapp/WEB-INF/web.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app id="struts_blank" version="2.4" - xmlns="http://java.sun.com/xml/ns/j2ee"; +<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"; + version="6.0"> <display-name>Struts Blank</display-name> <filter> diff --git a/unknown-handler/src/main/webapp/WEB-INF/web.xml b/unknown-handler/src/main/webapp/WEB-INF/web.xml index 9bfaa49..f7a0805 100644 --- a/unknown-handler/src/main/webapp/WEB-INF/web.xml +++ b/unknown-handler/src/main/webapp/WEB-INF/web.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app id="struts_blank" version="2.4" - xmlns="http://java.sun.com/xml/ns/j2ee"; +<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"; + version="6.0"> <display-name>Struts Blank</display-name> <listener> diff --git a/using-tags/src/main/webapp/WEB-INF/web.xml b/using-tags/src/main/webapp/WEB-INF/web.xml index a7752df..5d41abc 100644 --- a/using-tags/src/main/webapp/WEB-INF/web.xml +++ b/using-tags/src/main/webapp/WEB-INF/web.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app id="WebApp_ID" version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";> +<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"> <display-name>Using_Tags_Struts2</display-name> <welcome-file-list> <welcome-file>index.jsp</welcome-file> diff --git a/validation-messages/src/main/webapp/WEB-INF/web.xml b/validation-messages/src/main/webapp/WEB-INF/web.xml index 8858656..aa802de 100644 --- a/validation-messages/src/main/webapp/WEB-INF/web.xml +++ b/validation-messages/src/main/webapp/WEB-INF/web.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app id="struts_blank" version="2.4" - xmlns="http://java.sun.com/xml/ns/j2ee"; +<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"; + version="6.0"> <display-name>Struts Blank</display-name> <filter> diff --git a/wildcard-regex/src/main/webapp/WEB-INF/web.xml b/wildcard-regex/src/main/webapp/WEB-INF/web.xml index ebbbf70..6e67199 100644 --- a/wildcard-regex/src/main/webapp/WEB-INF/web.xml +++ b/wildcard-regex/src/main/webapp/WEB-INF/web.xml @@ -1,8 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> -<web-app id="struts_blank" version="2.4" - xmlns="http://java.sun.com/xml/ns/j2ee"; +<web-app xmlns="https://jakarta.ee/xml/ns/jakartaee"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd";> + xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/web-app_6_0.xsd"; + version="6.0"> <display-name>Struts Blank</display-name> <filter>
