[ofbiz-framework] branch trunk updated (bc52fc3 -> 226e901)

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
3 messages Options
Reply | Threaded
Open this post in threaded view
|

[ofbiz-framework] branch trunk updated (bc52fc3 -> 226e901)

mthl
This is an automated email from the ASF dual-hosted git repository.

mthl pushed a change to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git.


    from bc52fc3  Improved: Upgrade Tomcat 9.0.27 → 9.0.29 (OFBIZ-11300)
     new a93b1fc  Fixed: add XML declaration in “web.xml” files (OFBIZ-6993)
     new 226e901  Improved: Update “web.xml” files version 3.0 → 4.0 (OFBIZ-6993)

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 applications/accounting/webapp/accounting/WEB-INF/web.xml       | 2 +-
 applications/accounting/webapp/ap/WEB-INF/web.xml               | 2 +-
 applications/accounting/webapp/ar/WEB-INF/web.xml               | 2 +-
 applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml        | 2 +-
 applications/commonext/webapp/ordermgr-js/WEB-INF/web.xml       | 2 +-
 applications/content/webapp/content/WEB-INF/web.xml             | 2 +-
 applications/content/webapp/contentimages/WEB-INF/web.xml       | 2 +-
 applications/humanres/webapp/humanres/WEB-INF/web.xml           | 2 +-
 applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml | 2 +-
 applications/marketing/webapp/marketing/WEB-INF/web.xml         | 2 +-
 applications/marketing/webapp/sfa/WEB-INF/web.xml               | 2 +-
 applications/order/webapp/ordermgr/WEB-INF/web.xml              | 2 +-
 applications/party/webapp/partymgr/WEB-INF/web.xml              | 2 +-
 applications/product/webapp/catalog/WEB-INF/web.xml             | 2 +-
 applications/product/webapp/facility/WEB-INF/web.xml            | 2 +-
 applications/workeffort/webapp/ical/WEB-INF/web.xml             | 2 +-
 applications/workeffort/webapp/workeffort/WEB-INF/web.xml       | 2 +-
 framework/resources/templates/web.xml                           | 2 +-
 framework/webtools/webapp/webtools/WEB-INF/web.xml              | 2 +-
 themes/bluelight/webapp/bluelight/WEB-INF/web.xml               | 2 +-
 themes/common-theme/webapp/common/WEB-INF/web.xml               | 2 +-
 themes/common-theme/webapp/images/WEB-INF/web.xml               | 2 +-
 themes/flatgrey/webapp/flatgrey/WEB-INF/web.xml                 | 2 +-
 themes/rainbowstone/webapp/rainbowstone/WEB-INF/web.xml         | 2 +-
 themes/tomahawk/webapp/tomahawk/WEB-INF/web.xml                 | 2 +-
 25 files changed, 25 insertions(+), 25 deletions(-)

Reply | Threaded
Open this post in threaded view
|

[ofbiz-framework] 01/02: Fixed: add XML declaration in “web.xml” files (OFBIZ-6993)

mthl
This is an automated email from the ASF dual-hosted git repository.

mthl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit a93b1fcb7859a754ba84b810c4736e7ef6778689
Author: Samuel Trégouët <[hidden email]>
AuthorDate: Wed Nov 27 14:30:41 2019 +0100

    Fixed: add XML declaration in “web.xml” files (OFBIZ-6993)
   
    these declarations avoid SAXParseException traceback when parsing web.xml
    the first time in WebappUtil.parseWebXmlFile
---
 applications/accounting/webapp/accounting/WEB-INF/web.xml       | 2 +-
 applications/accounting/webapp/ap/WEB-INF/web.xml               | 2 +-
 applications/accounting/webapp/ar/WEB-INF/web.xml               | 2 +-
 applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml        | 2 +-
 applications/commonext/webapp/ordermgr-js/WEB-INF/web.xml       | 2 +-
 applications/content/webapp/content/WEB-INF/web.xml             | 2 +-
 applications/content/webapp/contentimages/WEB-INF/web.xml       | 2 +-
 applications/humanres/webapp/humanres/WEB-INF/web.xml           | 2 +-
 applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml | 2 +-
 applications/marketing/webapp/marketing/WEB-INF/web.xml         | 2 +-
 applications/marketing/webapp/sfa/WEB-INF/web.xml               | 2 +-
 applications/order/webapp/ordermgr/WEB-INF/web.xml              | 2 +-
 applications/party/webapp/partymgr/WEB-INF/web.xml              | 2 +-
 applications/product/webapp/catalog/WEB-INF/web.xml             | 2 +-
 applications/product/webapp/facility/WEB-INF/web.xml            | 2 +-
 applications/workeffort/webapp/ical/WEB-INF/web.xml             | 2 +-
 applications/workeffort/webapp/workeffort/WEB-INF/web.xml       | 2 +-
 framework/resources/templates/web.xml                           | 2 +-
 framework/webtools/webapp/webtools/WEB-INF/web.xml              | 2 +-
 themes/bluelight/webapp/bluelight/WEB-INF/web.xml               | 2 +-
 themes/common-theme/webapp/common/WEB-INF/web.xml               | 2 +-
 themes/common-theme/webapp/images/WEB-INF/web.xml               | 2 +-
 themes/flatgrey/webapp/flatgrey/WEB-INF/web.xml                 | 2 +-
 themes/rainbowstone/webapp/rainbowstone/WEB-INF/web.xml         | 2 +-
 themes/tomahawk/webapp/tomahawk/WEB-INF/web.xml                 | 2 +-
 25 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/applications/accounting/webapp/accounting/WEB-INF/web.xml b/applications/accounting/webapp/accounting/WEB-INF/web.xml
index b792337..1e9aba4 100644
--- a/applications/accounting/webapp/accounting/WEB-INF/web.xml
+++ b/applications/accounting/webapp/accounting/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0">
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
     <display-name>Apache OFBiz - Accounting Manager</display-name>
     <description>Accounting Manager Module of the Apache OFBiz Project</description>
 
diff --git a/applications/accounting/webapp/ap/WEB-INF/web.xml b/applications/accounting/webapp/ap/WEB-INF/web.xml
index 0f12f57..0d8c7fc 100644
--- a/applications/accounting/webapp/ap/WEB-INF/web.xml
+++ b/applications/accounting/webapp/ap/WEB-INF/web.xml
@@ -15,7 +15,7 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<web-app version="3.0">
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
     <display-name>Apache OFBiz - Account Payable</display-name>
     <description>Accounting Payable Module of the Apache OFBiz Project</description>
 
diff --git a/applications/accounting/webapp/ar/WEB-INF/web.xml b/applications/accounting/webapp/ar/WEB-INF/web.xml
index 23c89e6..f89ea17 100644
--- a/applications/accounting/webapp/ar/WEB-INF/web.xml
+++ b/applications/accounting/webapp/ar/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0">
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
     <display-name>Apache OFBiz - Account Receivable</display-name>
     <description>Accounting Receivable Module of the Apache OFBiz Project</description>
 
diff --git a/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml b/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml
index 9691cea..36b18b1 100644
--- a/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml
+++ b/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml
@@ -19,7 +19,7 @@
     under the License.
 -->
 
-<web-app version="3.0">
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
     <display-name>Apache OFBiz - Setup Manager</display-name>
     <description>Setup Manager Module of the Apache OFBiz Project</description>
     
diff --git a/applications/commonext/webapp/ordermgr-js/WEB-INF/web.xml b/applications/commonext/webapp/ordermgr-js/WEB-INF/web.xml
index 425ad2e..d99fc30 100644
--- a/applications/commonext/webapp/ordermgr-js/WEB-INF/web.xml
+++ b/applications/commonext/webapp/ordermgr-js/WEB-INF/web.xml
@@ -17,7 +17,7 @@
 -->
 
 
-<web-app version="3.0">
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
     <display-name>Empty placeholder</display-name>
     <description>Empty placeholder, see http://svn.apache.org/viewvc?view=revision&amp;revision=1612202 </description>
 </web-app>
diff --git a/applications/content/webapp/content/WEB-INF/web.xml b/applications/content/webapp/content/WEB-INF/web.xml
index d271674..4b81cf9 100644
--- a/applications/content/webapp/content/WEB-INF/web.xml
+++ b/applications/content/webapp/content/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0">
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
     <display-name>Apache OFBiz - Content Manager</display-name>
     <description>Content Manager Module of the Apache OFBiz Project</description>
 
diff --git a/applications/content/webapp/contentimages/WEB-INF/web.xml b/applications/content/webapp/contentimages/WEB-INF/web.xml
index 35196ca..a7136b9 100644
--- a/applications/content/webapp/contentimages/WEB-INF/web.xml
+++ b/applications/content/webapp/contentimages/WEB-INF/web.xml
@@ -17,7 +17,7 @@
 -->
 
 
-<web-app version="3.0">
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
     <display-name>Apache OFBiz - Content Empty placeholder</display-name>
     <description>Empty placeholder, see http://svn.apache.org/viewvc?view=revision&amp;revision=1658621 </description>
 </web-app>
diff --git a/applications/humanres/webapp/humanres/WEB-INF/web.xml b/applications/humanres/webapp/humanres/WEB-INF/web.xml
index d4d9e74..30586f9 100644
--- a/applications/humanres/webapp/humanres/WEB-INF/web.xml
+++ b/applications/humanres/webapp/humanres/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0">
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
     <display-name>Apache OFBiz - HumanRes Manager</display-name>
     <description>HumanRes Manager Module of the Apache OFBiz Project</description>
 
diff --git a/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml b/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml
index 25e6f15..6241223 100644
--- a/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml
+++ b/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0">
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
     <display-name>Apache OFBiz - Manufacturing Manager</display-name>
     <description>Manufacturing Manager Module by TAU Informatica srl</description>
 
diff --git a/applications/marketing/webapp/marketing/WEB-INF/web.xml b/applications/marketing/webapp/marketing/WEB-INF/web.xml
index 54ea1dc..6792e6d 100644
--- a/applications/marketing/webapp/marketing/WEB-INF/web.xml
+++ b/applications/marketing/webapp/marketing/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0">
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
   <display-name>Apache OFBiz - Marketing Manager</display-name>
   <description>Marketing Manager Module of the Apache OFBiz Project</description>
 
diff --git a/applications/marketing/webapp/sfa/WEB-INF/web.xml b/applications/marketing/webapp/sfa/WEB-INF/web.xml
index 638e06a..0fef037 100644
--- a/applications/marketing/webapp/sfa/WEB-INF/web.xml
+++ b/applications/marketing/webapp/sfa/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0">
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
     <display-name>Apache OFBiz - SFA Manager</display-name>
     <description>SFA Manager Module of the Apache OFBiz Project</description>
 
diff --git a/applications/order/webapp/ordermgr/WEB-INF/web.xml b/applications/order/webapp/ordermgr/WEB-INF/web.xml
index 41265cc..6ad5aa1 100644
--- a/applications/order/webapp/ordermgr/WEB-INF/web.xml
+++ b/applications/order/webapp/ordermgr/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0">
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
     <display-name>Apache OFBiz - Order Manager</display-name>
     <description>Order Manager Module of the Apache OFBiz Project</description>
 
diff --git a/applications/party/webapp/partymgr/WEB-INF/web.xml b/applications/party/webapp/partymgr/WEB-INF/web.xml
index 09653c4..9057e92 100644
--- a/applications/party/webapp/partymgr/WEB-INF/web.xml
+++ b/applications/party/webapp/partymgr/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0">
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
   <description>Party Manager Module of the Apache OFBiz Project</description>
   <display-name>Apache OFBiz - Party Manager</display-name>
 
diff --git a/applications/product/webapp/catalog/WEB-INF/web.xml b/applications/product/webapp/catalog/WEB-INF/web.xml
index a79e798..6d0f07d 100644
--- a/applications/product/webapp/catalog/WEB-INF/web.xml
+++ b/applications/product/webapp/catalog/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0">
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
     <display-name>Apache OFBiz - Catalog</display-name>
     <description>Catalog Module of the Apache OFBiz Project</description>
 
diff --git a/applications/product/webapp/facility/WEB-INF/web.xml b/applications/product/webapp/facility/WEB-INF/web.xml
index 0a3464f..6a27b81 100644
--- a/applications/product/webapp/facility/WEB-INF/web.xml
+++ b/applications/product/webapp/facility/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0">
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
     <display-name>Apache OFBiz - Facility Manager</display-name>
     <description>Facility Manager Module of the Apache OFBiz Project</description>
 
diff --git a/applications/workeffort/webapp/ical/WEB-INF/web.xml b/applications/workeffort/webapp/ical/WEB-INF/web.xml
index b890ca7..47ed142 100644
--- a/applications/workeffort/webapp/ical/WEB-INF/web.xml
+++ b/applications/workeffort/webapp/ical/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0">
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
     <display-name>Apache OFBiz - iCalendar Server</display-name>
     <description>iCalendar Server Module of the Apache OFBiz Project</description>
 
diff --git a/applications/workeffort/webapp/workeffort/WEB-INF/web.xml b/applications/workeffort/webapp/workeffort/WEB-INF/web.xml
index c8aeb25..2df2de0 100644
--- a/applications/workeffort/webapp/workeffort/WEB-INF/web.xml
+++ b/applications/workeffort/webapp/workeffort/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0">
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
     <display-name>Apache OFBiz - Work Manager</display-name>
     <description>Work Manager Module of the Apache OFBiz Project</description>
 
diff --git a/framework/resources/templates/web.xml b/framework/resources/templates/web.xml
index 2ca1b35..f64d878 100644
--- a/framework/resources/templates/web.xml
+++ b/framework/resources/templates/web.xml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0">
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
     <display-name>Apache OFBiz - @component-resource-name@ Component</display-name>
     <description>@component-resource-name@ Component of the Apache OFBiz Project</description>
 
diff --git a/framework/webtools/webapp/webtools/WEB-INF/web.xml b/framework/webtools/webapp/webtools/WEB-INF/web.xml
index 635897b..900ca0e 100644
--- a/framework/webtools/webapp/webtools/WEB-INF/web.xml
+++ b/framework/webtools/webapp/webtools/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0">
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
     <display-name>Apache OFBiz - Web Tools</display-name>
     <description>Common Application Components of the Apache OFBiz Project</description>
 
diff --git a/themes/bluelight/webapp/bluelight/WEB-INF/web.xml b/themes/bluelight/webapp/bluelight/WEB-INF/web.xml
index cf99ec9..eea454d 100644
--- a/themes/bluelight/webapp/bluelight/WEB-INF/web.xml
+++ b/themes/bluelight/webapp/bluelight/WEB-INF/web.xml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0">
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
   <display-name>Apache OFBiz - bluelight Visual Theme</display-name>
   <description>bluelight Visual Theme</description>
 
diff --git a/themes/common-theme/webapp/common/WEB-INF/web.xml b/themes/common-theme/webapp/common/WEB-INF/web.xml
index dd502c7..75ade0c 100644
--- a/themes/common-theme/webapp/common/WEB-INF/web.xml
+++ b/themes/common-theme/webapp/common/WEB-INF/web.xml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0">
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
   <display-name>Apache OFBiz - Common Theme</display-name>
   <description>Common Theme</description>
 
diff --git a/themes/common-theme/webapp/images/WEB-INF/web.xml b/themes/common-theme/webapp/images/WEB-INF/web.xml
index 54c7c31..593a5f2 100644
--- a/themes/common-theme/webapp/images/WEB-INF/web.xml
+++ b/themes/common-theme/webapp/images/WEB-INF/web.xml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0">
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
   <display-name>Apache OFBiz - demostore images</display-name>
   <description>Demo Store Images for the Apache OFBiz Project</description>
 
diff --git a/themes/flatgrey/webapp/flatgrey/WEB-INF/web.xml b/themes/flatgrey/webapp/flatgrey/WEB-INF/web.xml
index 9aedae5..0b061ec 100644
--- a/themes/flatgrey/webapp/flatgrey/WEB-INF/web.xml
+++ b/themes/flatgrey/webapp/flatgrey/WEB-INF/web.xml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0">
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
     <display-name>Apache OFBiz - Flat Grey Visual Theme</display-name>
     <description>Flat Grey Visual Theme</description>
     
diff --git a/themes/rainbowstone/webapp/rainbowstone/WEB-INF/web.xml b/themes/rainbowstone/webapp/rainbowstone/WEB-INF/web.xml
index 3aea413..4f5bea6 100644
--- a/themes/rainbowstone/webapp/rainbowstone/WEB-INF/web.xml
+++ b/themes/rainbowstone/webapp/rainbowstone/WEB-INF/web.xml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0">
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
     <display-name>Open For Business - Rainbowstone Visual Theme</display-name>
     <description>Rainbowstone Visual Theme</description>
     
diff --git a/themes/tomahawk/webapp/tomahawk/WEB-INF/web.xml b/themes/tomahawk/webapp/tomahawk/WEB-INF/web.xml
index 33cd723..8e16262 100644
--- a/themes/tomahawk/webapp/tomahawk/WEB-INF/web.xml
+++ b/themes/tomahawk/webapp/tomahawk/WEB-INF/web.xml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0">
+<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
   <display-name>Apache OFBiz - Tomahawk Visual Theme</display-name>
   <description>Tomahawk Visual Theme</description>
 

Reply | Threaded
Open this post in threaded view
|

[ofbiz-framework] 02/02: Improved: Update “web.xml” files version 3.0 → 4.0 (OFBIZ-6993)

mthl
In reply to this post by mthl
This is an automated email from the ASF dual-hosted git repository.

mthl pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-framework.git

commit 226e901981b68941bbcf3e1025d2208061d28db6
Author: Samuel Trégouët <[hidden email]>
AuthorDate: Wed Nov 27 16:04:30 2019 +0100

    Improved: Update “web.xml” files version 3.0 → 4.0 (OFBIZ-6993)
---
 applications/accounting/webapp/accounting/WEB-INF/web.xml       | 2 +-
 applications/accounting/webapp/ap/WEB-INF/web.xml               | 2 +-
 applications/accounting/webapp/ar/WEB-INF/web.xml               | 2 +-
 applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml        | 2 +-
 applications/commonext/webapp/ordermgr-js/WEB-INF/web.xml       | 2 +-
 applications/content/webapp/content/WEB-INF/web.xml             | 2 +-
 applications/content/webapp/contentimages/WEB-INF/web.xml       | 2 +-
 applications/humanres/webapp/humanres/WEB-INF/web.xml           | 2 +-
 applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml | 2 +-
 applications/marketing/webapp/marketing/WEB-INF/web.xml         | 2 +-
 applications/marketing/webapp/sfa/WEB-INF/web.xml               | 2 +-
 applications/order/webapp/ordermgr/WEB-INF/web.xml              | 2 +-
 applications/party/webapp/partymgr/WEB-INF/web.xml              | 2 +-
 applications/product/webapp/catalog/WEB-INF/web.xml             | 2 +-
 applications/product/webapp/facility/WEB-INF/web.xml            | 2 +-
 applications/workeffort/webapp/ical/WEB-INF/web.xml             | 2 +-
 applications/workeffort/webapp/workeffort/WEB-INF/web.xml       | 2 +-
 framework/resources/templates/web.xml                           | 2 +-
 framework/webtools/webapp/webtools/WEB-INF/web.xml              | 2 +-
 themes/bluelight/webapp/bluelight/WEB-INF/web.xml               | 2 +-
 themes/common-theme/webapp/common/WEB-INF/web.xml               | 2 +-
 themes/common-theme/webapp/images/WEB-INF/web.xml               | 2 +-
 themes/flatgrey/webapp/flatgrey/WEB-INF/web.xml                 | 2 +-
 themes/rainbowstone/webapp/rainbowstone/WEB-INF/web.xml         | 2 +-
 themes/tomahawk/webapp/tomahawk/WEB-INF/web.xml                 | 2 +-
 25 files changed, 25 insertions(+), 25 deletions(-)

diff --git a/applications/accounting/webapp/accounting/WEB-INF/web.xml b/applications/accounting/webapp/accounting/WEB-INF/web.xml
index 1e9aba4..958bf07 100644
--- a/applications/accounting/webapp/accounting/WEB-INF/web.xml
+++ b/applications/accounting/webapp/accounting/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
+<web-app version="4.0" 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_4_0.xsd">
     <display-name>Apache OFBiz - Accounting Manager</display-name>
     <description>Accounting Manager Module of the Apache OFBiz Project</description>
 
diff --git a/applications/accounting/webapp/ap/WEB-INF/web.xml b/applications/accounting/webapp/ap/WEB-INF/web.xml
index 0d8c7fc..83b385d 100644
--- a/applications/accounting/webapp/ap/WEB-INF/web.xml
+++ b/applications/accounting/webapp/ap/WEB-INF/web.xml
@@ -15,7 +15,7 @@ KIND, either express or implied.  See the License for the
 specific language governing permissions and limitations
 under the License.
 -->
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
+<web-app version="4.0" 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_4_0.xsd">
     <display-name>Apache OFBiz - Account Payable</display-name>
     <description>Accounting Payable Module of the Apache OFBiz Project</description>
 
diff --git a/applications/accounting/webapp/ar/WEB-INF/web.xml b/applications/accounting/webapp/ar/WEB-INF/web.xml
index f89ea17..c791dcf 100644
--- a/applications/accounting/webapp/ar/WEB-INF/web.xml
+++ b/applications/accounting/webapp/ar/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
+<web-app version="4.0" 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_4_0.xsd">
     <display-name>Apache OFBiz - Account Receivable</display-name>
     <description>Accounting Receivable Module of the Apache OFBiz Project</description>
 
diff --git a/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml b/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml
index 36b18b1..4a4a671 100644
--- a/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml
+++ b/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml
@@ -19,7 +19,7 @@
     under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
+<web-app version="4.0" 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_4_0.xsd">
     <display-name>Apache OFBiz - Setup Manager</display-name>
     <description>Setup Manager Module of the Apache OFBiz Project</description>
     
diff --git a/applications/commonext/webapp/ordermgr-js/WEB-INF/web.xml b/applications/commonext/webapp/ordermgr-js/WEB-INF/web.xml
index d99fc30..569bb6b 100644
--- a/applications/commonext/webapp/ordermgr-js/WEB-INF/web.xml
+++ b/applications/commonext/webapp/ordermgr-js/WEB-INF/web.xml
@@ -17,7 +17,7 @@
 -->
 
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
+<web-app version="4.0" 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_4_0.xsd">
     <display-name>Empty placeholder</display-name>
     <description>Empty placeholder, see http://svn.apache.org/viewvc?view=revision&amp;revision=1612202 </description>
 </web-app>
diff --git a/applications/content/webapp/content/WEB-INF/web.xml b/applications/content/webapp/content/WEB-INF/web.xml
index 4b81cf9..55c0ab7 100644
--- a/applications/content/webapp/content/WEB-INF/web.xml
+++ b/applications/content/webapp/content/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
+<web-app version="4.0" 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_4_0.xsd">
     <display-name>Apache OFBiz - Content Manager</display-name>
     <description>Content Manager Module of the Apache OFBiz Project</description>
 
diff --git a/applications/content/webapp/contentimages/WEB-INF/web.xml b/applications/content/webapp/contentimages/WEB-INF/web.xml
index a7136b9..6d5d1d3 100644
--- a/applications/content/webapp/contentimages/WEB-INF/web.xml
+++ b/applications/content/webapp/contentimages/WEB-INF/web.xml
@@ -17,7 +17,7 @@
 -->
 
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
+<web-app version="4.0" 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_4_0.xsd">
     <display-name>Apache OFBiz - Content Empty placeholder</display-name>
     <description>Empty placeholder, see http://svn.apache.org/viewvc?view=revision&amp;revision=1658621 </description>
 </web-app>
diff --git a/applications/humanres/webapp/humanres/WEB-INF/web.xml b/applications/humanres/webapp/humanres/WEB-INF/web.xml
index 30586f9..3bd35e7 100644
--- a/applications/humanres/webapp/humanres/WEB-INF/web.xml
+++ b/applications/humanres/webapp/humanres/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
+<web-app version="4.0" 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_4_0.xsd">
     <display-name>Apache OFBiz - HumanRes Manager</display-name>
     <description>HumanRes Manager Module of the Apache OFBiz Project</description>
 
diff --git a/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml b/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml
index 6241223..c34f385 100644
--- a/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml
+++ b/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
+<web-app version="4.0" 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_4_0.xsd">
     <display-name>Apache OFBiz - Manufacturing Manager</display-name>
     <description>Manufacturing Manager Module by TAU Informatica srl</description>
 
diff --git a/applications/marketing/webapp/marketing/WEB-INF/web.xml b/applications/marketing/webapp/marketing/WEB-INF/web.xml
index 6792e6d..312fced 100644
--- a/applications/marketing/webapp/marketing/WEB-INF/web.xml
+++ b/applications/marketing/webapp/marketing/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
+<web-app version="4.0" 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_4_0.xsd">
   <display-name>Apache OFBiz - Marketing Manager</display-name>
   <description>Marketing Manager Module of the Apache OFBiz Project</description>
 
diff --git a/applications/marketing/webapp/sfa/WEB-INF/web.xml b/applications/marketing/webapp/sfa/WEB-INF/web.xml
index 0fef037..af6880b 100644
--- a/applications/marketing/webapp/sfa/WEB-INF/web.xml
+++ b/applications/marketing/webapp/sfa/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
+<web-app version="4.0" 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_4_0.xsd">
     <display-name>Apache OFBiz - SFA Manager</display-name>
     <description>SFA Manager Module of the Apache OFBiz Project</description>
 
diff --git a/applications/order/webapp/ordermgr/WEB-INF/web.xml b/applications/order/webapp/ordermgr/WEB-INF/web.xml
index 6ad5aa1..26fc673 100644
--- a/applications/order/webapp/ordermgr/WEB-INF/web.xml
+++ b/applications/order/webapp/ordermgr/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
+<web-app version="4.0" 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_4_0.xsd">
     <display-name>Apache OFBiz - Order Manager</display-name>
     <description>Order Manager Module of the Apache OFBiz Project</description>
 
diff --git a/applications/party/webapp/partymgr/WEB-INF/web.xml b/applications/party/webapp/partymgr/WEB-INF/web.xml
index 9057e92..c9e91b4 100644
--- a/applications/party/webapp/partymgr/WEB-INF/web.xml
+++ b/applications/party/webapp/partymgr/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
+<web-app version="4.0" 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_4_0.xsd">
   <description>Party Manager Module of the Apache OFBiz Project</description>
   <display-name>Apache OFBiz - Party Manager</display-name>
 
diff --git a/applications/product/webapp/catalog/WEB-INF/web.xml b/applications/product/webapp/catalog/WEB-INF/web.xml
index 6d0f07d..4125e88 100644
--- a/applications/product/webapp/catalog/WEB-INF/web.xml
+++ b/applications/product/webapp/catalog/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
+<web-app version="4.0" 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_4_0.xsd">
     <display-name>Apache OFBiz - Catalog</display-name>
     <description>Catalog Module of the Apache OFBiz Project</description>
 
diff --git a/applications/product/webapp/facility/WEB-INF/web.xml b/applications/product/webapp/facility/WEB-INF/web.xml
index 6a27b81..ec7a0bc 100644
--- a/applications/product/webapp/facility/WEB-INF/web.xml
+++ b/applications/product/webapp/facility/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
+<web-app version="4.0" 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_4_0.xsd">
     <display-name>Apache OFBiz - Facility Manager</display-name>
     <description>Facility Manager Module of the Apache OFBiz Project</description>
 
diff --git a/applications/workeffort/webapp/ical/WEB-INF/web.xml b/applications/workeffort/webapp/ical/WEB-INF/web.xml
index 47ed142..c795300 100644
--- a/applications/workeffort/webapp/ical/WEB-INF/web.xml
+++ b/applications/workeffort/webapp/ical/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
+<web-app version="4.0" 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_4_0.xsd">
     <display-name>Apache OFBiz - iCalendar Server</display-name>
     <description>iCalendar Server Module of the Apache OFBiz Project</description>
 
diff --git a/applications/workeffort/webapp/workeffort/WEB-INF/web.xml b/applications/workeffort/webapp/workeffort/WEB-INF/web.xml
index 2df2de0..a403b05 100644
--- a/applications/workeffort/webapp/workeffort/WEB-INF/web.xml
+++ b/applications/workeffort/webapp/workeffort/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
+<web-app version="4.0" 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_4_0.xsd">
     <display-name>Apache OFBiz - Work Manager</display-name>
     <description>Work Manager Module of the Apache OFBiz Project</description>
 
diff --git a/framework/resources/templates/web.xml b/framework/resources/templates/web.xml
index f64d878..7009a1f 100644
--- a/framework/resources/templates/web.xml
+++ b/framework/resources/templates/web.xml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
+<web-app version="4.0" 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_4_0.xsd">
     <display-name>Apache OFBiz - @component-resource-name@ Component</display-name>
     <description>@component-resource-name@ Component of the Apache OFBiz Project</description>
 
diff --git a/framework/webtools/webapp/webtools/WEB-INF/web.xml b/framework/webtools/webapp/webtools/WEB-INF/web.xml
index 900ca0e..9604feb 100644
--- a/framework/webtools/webapp/webtools/WEB-INF/web.xml
+++ b/framework/webtools/webapp/webtools/WEB-INF/web.xml
@@ -19,7 +19,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
+<web-app version="4.0" 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_4_0.xsd">
     <display-name>Apache OFBiz - Web Tools</display-name>
     <description>Common Application Components of the Apache OFBiz Project</description>
 
diff --git a/themes/bluelight/webapp/bluelight/WEB-INF/web.xml b/themes/bluelight/webapp/bluelight/WEB-INF/web.xml
index eea454d..8e735a3 100644
--- a/themes/bluelight/webapp/bluelight/WEB-INF/web.xml
+++ b/themes/bluelight/webapp/bluelight/WEB-INF/web.xml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
+<web-app version="4.0" 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_4_0.xsd">
   <display-name>Apache OFBiz - bluelight Visual Theme</display-name>
   <description>bluelight Visual Theme</description>
 
diff --git a/themes/common-theme/webapp/common/WEB-INF/web.xml b/themes/common-theme/webapp/common/WEB-INF/web.xml
index 75ade0c..c04b8bf 100644
--- a/themes/common-theme/webapp/common/WEB-INF/web.xml
+++ b/themes/common-theme/webapp/common/WEB-INF/web.xml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
+<web-app version="4.0" 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_4_0.xsd">
   <display-name>Apache OFBiz - Common Theme</display-name>
   <description>Common Theme</description>
 
diff --git a/themes/common-theme/webapp/images/WEB-INF/web.xml b/themes/common-theme/webapp/images/WEB-INF/web.xml
index 593a5f2..c5a676c 100644
--- a/themes/common-theme/webapp/images/WEB-INF/web.xml
+++ b/themes/common-theme/webapp/images/WEB-INF/web.xml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
+<web-app version="4.0" 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_4_0.xsd">
   <display-name>Apache OFBiz - demostore images</display-name>
   <description>Demo Store Images for the Apache OFBiz Project</description>
 
diff --git a/themes/flatgrey/webapp/flatgrey/WEB-INF/web.xml b/themes/flatgrey/webapp/flatgrey/WEB-INF/web.xml
index 0b061ec..779f1c5 100644
--- a/themes/flatgrey/webapp/flatgrey/WEB-INF/web.xml
+++ b/themes/flatgrey/webapp/flatgrey/WEB-INF/web.xml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
+<web-app version="4.0" 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_4_0.xsd">
     <display-name>Apache OFBiz - Flat Grey Visual Theme</display-name>
     <description>Flat Grey Visual Theme</description>
     
diff --git a/themes/rainbowstone/webapp/rainbowstone/WEB-INF/web.xml b/themes/rainbowstone/webapp/rainbowstone/WEB-INF/web.xml
index 4f5bea6..fbd27e5 100644
--- a/themes/rainbowstone/webapp/rainbowstone/WEB-INF/web.xml
+++ b/themes/rainbowstone/webapp/rainbowstone/WEB-INF/web.xml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
+<web-app version="4.0" 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_4_0.xsd">
     <display-name>Open For Business - Rainbowstone Visual Theme</display-name>
     <description>Rainbowstone Visual Theme</description>
     
diff --git a/themes/tomahawk/webapp/tomahawk/WEB-INF/web.xml b/themes/tomahawk/webapp/tomahawk/WEB-INF/web.xml
index 8e16262..c2c30a4 100644
--- a/themes/tomahawk/webapp/tomahawk/WEB-INF/web.xml
+++ b/themes/tomahawk/webapp/tomahawk/WEB-INF/web.xml
@@ -18,7 +18,7 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0" xmlns="http://java.sun.com/xml/ns/javaee" 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_3_0.xsd">
+<web-app version="4.0" 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_4_0.xsd">
   <display-name>Apache OFBiz - Tomahawk Visual Theme</display-name>
   <description>Tomahawk Visual Theme</description>