OFBiz › OFBiz - Commits

[ofbiz-plugins] branch release18.12 updated: Fixed: Add XML declaration in “web.xml” files (OFBIZ-6993)

‹ Previous Topic Next Topic ›
 
classic Classic list List threaded Threaded
♦
♦
 1 message Options
jleroux@apache.org
Reply | Threaded
Open this post in threaded view
♦
♦
|

[ofbiz-plugins] branch release18.12 updated: Fixed: Add XML declaration in “web.xml” files (OFBIZ-6993)

jleroux@apache.org
This is an automated email from the ASF dual-hosted git repository.

jleroux pushed a commit to branch release18.12
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git


The following commit(s) were added to refs/heads/release18.12 by this push:
     new 20a82a9  Fixed: Add XML declaration in “web.xml” files (OFBIZ-6993)
20a82a9 is described below

commit 20a82a959808fef728caa93180427f50e03e238f
Author: Mathieu Lirzin <[hidden email]>
AuthorDate: Sat Dec 7 22:52:30 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
   
    A schema conformance issue has been fixed in ecommerce “web.xml”.
   
    (cherry picked from commit 1158664ba37264fa6b8429033bad768175ff10d5)
   
    # Conflicts handled by hand
    # msggateway/webapp/msggateway/WEB-INF/web.xml
---
 assetmaint/webapp/assetmaint/WEB-INF/web.xml       |  2 +-
 assetmaint/webapp/ismgr/WEB-INF/web.xml            |  2 +-
 bi/webapp/bi/WEB-INF/web.xml                       |  2 +-
 birt/webapp/accounting/WEB-INF/web.xml             |  2 +-
 birt/webapp/birt/WEB-INF/web.xml                   |  2 +-
 birt/webapp/facility/WEB-INF/web.xml               |  2 +-
 birt/webapp/ordermgr/WEB-INF/web.xml               |  2 +-
 cmssite/webapp/cmssite/WEB-INF/web.xml             |  2 +-
 ebay/webapp/ebay/WEB-INF/web.xml                   |  2 +-
 ebaystore/webapp/ebaystore/WEB-INF/web.xml         |  2 +-
 ecommerce/webapp/ecommerce/WEB-INF/web.xml         |  4 +--
 ecommerce/webapp/ecomseo/WEB-INF/web.xml           |  2 +-
 example/webapp/example/WEB-INF/web.xml             |  2 +-
 exampleext/webapp/exampleext/WEB-INF/web.xml       |  2 +-
 lucene/webapp/content/WEB-INF/web.xml              |  2 +-
 .../webapp/msggateway}/WEB-INF/web.xml             | 39 ++++++----------------
 multiflex/webapp/multiflex/WEB-INF/web.xml         |  2 +-
 myportal/webapp/myportal/WEB-INF/web.xml           |  2 +-
 passport/webapp/passport/WEB-INF/web.xml           |  2 +-
 pricat/webapp/pricat/WEB-INF/web.xml               |  2 +-
 pricat/webapp/pricatdemo/WEB-INF/web.xml           |  2 +-
 projectmgr/webapp/projectmgr/WEB-INF/web.xml       |  2 +-
 scrum/webapp/demotest/WEB-INF/web.xml              |  2 +-
 scrum/webapp/scrum/WEB-INF/web.xml                 |  2 +-
 solr/webapp/solr/WEB-INF/web.xml                   |  2 +-
 webpos/webapp/webpos/WEB-INF/web.xml               |  2 +-
 26 files changed, 36 insertions(+), 55 deletions(-)

diff --git a/assetmaint/webapp/assetmaint/WEB-INF/web.xml b/assetmaint/webapp/assetmaint/WEB-INF/web.xml
index 4954db3..b77dbfe 100644
--- a/assetmaint/webapp/assetmaint/WEB-INF/web.xml
+++ b/assetmaint/webapp/assetmaint/WEB-INF/web.xml
@@ -18,7 +18,7 @@
     under the License.
 -->
 
-<web-app version="3.0">
+<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 - Asset Maintenance</display-name>
     <description>Asset Management component of the Apache OFBiz Project</description>
diff --git a/assetmaint/webapp/ismgr/WEB-INF/web.xml b/assetmaint/webapp/ismgr/WEB-INF/web.xml
index 8ef59c1..2a2d462 100644
--- a/assetmaint/webapp/ismgr/WEB-INF/web.xml
+++ b/assetmaint/webapp/ismgr/WEB-INF/web.xml
@@ -18,7 +18,7 @@
     under the License.
 -->
 
-<web-app version="3.0">
+<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 - Information Systems</display-name>
     <description>Information Systems Management application of the Apache OFBiz Project</description>
diff --git a/bi/webapp/bi/WEB-INF/web.xml b/bi/webapp/bi/WEB-INF/web.xml
index a66166d..47f4646 100644
--- a/bi/webapp/bi/WEB-INF/web.xml
+++ b/bi/webapp/bi/WEB-INF/web.xml
@@ -18,7 +18,7 @@
     under the License.
 -->
 
-<web-app version="3.0">
+<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 - Business Intelligence</display-name>
     <description>Business Intelligence component of the Apache OFBiz Project</description>
diff --git a/birt/webapp/accounting/WEB-INF/web.xml b/birt/webapp/accounting/WEB-INF/web.xml
index e99c3ed..1f86b35 100644
--- a/birt/webapp/accounting/WEB-INF/web.xml
+++ b/birt/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="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/birt/webapp/birt/WEB-INF/web.xml b/birt/webapp/birt/WEB-INF/web.xml
index f59f777..1056ac3 100644
--- a/birt/webapp/birt/WEB-INF/web.xml
+++ b/birt/webapp/birt/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="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 - BIRT Component</display-name>
     <description>BIRT Component of the Apache OFBiz Project</description>
     
diff --git a/birt/webapp/facility/WEB-INF/web.xml b/birt/webapp/facility/WEB-INF/web.xml
index f5a8a6d..9f426bf 100644
--- a/birt/webapp/facility/WEB-INF/web.xml
+++ b/birt/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="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/birt/webapp/ordermgr/WEB-INF/web.xml b/birt/webapp/ordermgr/WEB-INF/web.xml
index 2be64af..60d9b58 100644
--- a/birt/webapp/ordermgr/WEB-INF/web.xml
+++ b/birt/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="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/cmssite/webapp/cmssite/WEB-INF/web.xml b/cmssite/webapp/cmssite/WEB-INF/web.xml
index aa62d0c..40f88c5 100644
--- a/cmssite/webapp/cmssite/WEB-INF/web.xml
+++ b/cmssite/webapp/cmssite/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="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 - CMS Site</display-name>
     <description>CMS Site for the Apache OFBiz Project</description>
 
diff --git a/ebay/webapp/ebay/WEB-INF/web.xml b/ebay/webapp/ebay/WEB-INF/web.xml
index b9d3647..13118e1 100644
--- a/ebay/webapp/ebay/WEB-INF/web.xml
+++ b/ebay/webapp/ebay/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="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 - Ebay</display-name>
     <description>eBay component of the Apache OFBiz Project</description>
diff --git a/ebaystore/webapp/ebaystore/WEB-INF/web.xml b/ebaystore/webapp/ebaystore/WEB-INF/web.xml
index aee3fce..ca2d340 100644
--- a/ebaystore/webapp/ebaystore/WEB-INF/web.xml
+++ b/ebaystore/webapp/ebaystore/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="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 - eBay Store</display-name>
     <description>eBay Store component of the Apache OFBiz Project</description>
diff --git a/ecommerce/webapp/ecommerce/WEB-INF/web.xml b/ecommerce/webapp/ecommerce/WEB-INF/web.xml
index 1b056a4..c299c6b 100644
--- a/ecommerce/webapp/ecommerce/WEB-INF/web.xml
+++ b/ecommerce/webapp/ecommerce/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="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</display-name>
     <description>Demo Store for the Apache OFBiz Project</description>
@@ -111,9 +111,9 @@ under the License.
     <listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
 
     <servlet>
+        <description>Main Control Servlet</description>
         <display-name>ControlServlet</display-name>
         <servlet-name>ControlServlet</servlet-name>
-        <description>Main Control Servlet</description>
         <servlet-class>org.apache.ofbiz.webapp.control.ControlServlet</servlet-class>
         <load-on-startup>1</load-on-startup>
     </servlet>
diff --git a/ecommerce/webapp/ecomseo/WEB-INF/web.xml b/ecommerce/webapp/ecomseo/WEB-INF/web.xml
index abf8de7..17c74b8 100644
--- a/ecommerce/webapp/ecomseo/WEB-INF/web.xml
+++ b/ecommerce/webapp/ecomseo/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="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</display-name>
     <description>Demo Store for the Apache OFBiz Project</description>
diff --git a/example/webapp/example/WEB-INF/web.xml b/example/webapp/example/WEB-INF/web.xml
index 71933e9..8acd303 100644
--- a/example/webapp/example/WEB-INF/web.xml
+++ b/example/webapp/example/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="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 - Example Application</display-name>
     <description>Example Application of the Apache OFBiz Project</description>
diff --git a/exampleext/webapp/exampleext/WEB-INF/web.xml b/exampleext/webapp/exampleext/WEB-INF/web.xml
index 673e7d4..eb72228 100644
--- a/exampleext/webapp/exampleext/WEB-INF/web.xml
+++ b/exampleext/webapp/exampleext/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="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 - Extended Example Application</display-name>
     <description>Extended Example Application of the Apache OFBiz Project</description>
diff --git a/lucene/webapp/content/WEB-INF/web.xml b/lucene/webapp/content/WEB-INF/web.xml
index bec428d..3408913 100644
--- a/lucene/webapp/content/WEB-INF/web.xml
+++ b/lucene/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="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 - Lucene Component</display-name>
     <description>Lucene Component of the Apache OFBiz Project</description>
 
diff --git a/lucene/webapp/content/WEB-INF/web.xml b/msggateway/webapp/msggateway/WEB-INF/web.xml
similarity index 75%
copy from lucene/webapp/content/WEB-INF/web.xml
copy to msggateway/webapp/msggateway/WEB-INF/web.xml
index bec428d..9066299 100644
--- a/lucene/webapp/content/WEB-INF/web.xml
+++ b/msggateway/webapp/msggateway/WEB-INF/web.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
-
 <!--
 Licensed to the Apache Software Foundation (ASF) under one
 or more contributor license agreements.  See the NOTICE file
@@ -19,18 +18,18 @@ specific language governing permissions and limitations
 under the License.
 -->
 
-<web-app version="3.0">
-    <display-name>Apache OFBiz - Lucene Component</display-name>
-    <description>Lucene Component of the Apache OFBiz Project</description>
+<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 - MsgGateway Component</display-name>
+    <description>MsgGateway Component of the Apache OFBiz Project</description>
 
     <!-- context-param>
         <param-name>webSiteId</param-name>
-        <param-value>luceneSite</param-value>
-        <description>A unique ID used to look up the WebSite entity</description>
+        <param-value>msggatewaySite</param-value>
+        <description>A unique ID used to look up the WebSite entity. Only for component using a WebSite entity, like ecommerce</description>
     </context-param-->
     <context-param>
         <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
-        <param-name>localDispatcherName</param-name><param-value>lucene</param-value>
+        <param-name>localDispatcherName</param-name><param-value>msggateway</param-value>
     </context-param>
     <context-param>
         <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
@@ -39,12 +38,7 @@ under the License.
     <context-param>
         <description>The location of the main-decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
         <param-name>mainDecoratorLocation</param-name>
-        <param-value>component://content/widget/CommonScreens.xml</param-value>
-    </context-param>
-    <context-param>
-        <description>The location of the cms decorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
-        <param-name>cmsDecoratorLocation</param-name>
-        <param-value>component://lucene/widget/LuceneScreens.xml</param-value>
+        <param-value>component://msggateway/widget/CommonScreens.xml</param-value>
     </context-param>
     <context-param>
         <description>Remove unnecessary whitespace from HTML output.</description>
@@ -60,24 +54,15 @@ under the License.
             <param-name>allowedPaths</param-name>
             <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images</param-value>
         </init-param>
-        <init-param>
-            <param-name>redirectPath</param-name>
-            <param-value>/control/main</param-value>
-        </init-param>
+        <init-param><param-name>redirectPath</param-name><param-value>/control/main</param-value></init-param>
     </filter>
     <filter>
         <display-name>ContextFilter</display-name>
         <filter-name>ContextFilter</filter-name>
         <filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class>
     </filter>
-    <filter-mapping>
-        <filter-name>ControlFilter</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
-    <filter-mapping>
-        <filter-name>ContextFilter</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
+    <filter-mapping><filter-name>ControlFilter</filter-name><url-pattern>/*</url-pattern></filter-mapping>
+    <filter-mapping><filter-name>ContextFilter</filter-name><url-pattern>/*</url-pattern></filter-mapping>
 
     <listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener>
     <listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
@@ -93,10 +78,6 @@ under the License.
     </servlet>
     <servlet-mapping><servlet-name>ControlServlet</servlet-name><url-pattern>/control/*</url-pattern></servlet-mapping>
 
-    <session-config>
-        <session-timeout>60</session-timeout><!-- in minutes -->
-    </session-config>
-
     <welcome-file-list>
         <welcome-file>index.jsp</welcome-file>
         <welcome-file>index.html</welcome-file>
diff --git a/multiflex/webapp/multiflex/WEB-INF/web.xml b/multiflex/webapp/multiflex/WEB-INF/web.xml
index dfcb64a..40caa19 100644
--- a/multiflex/webapp/multiflex/WEB-INF/web.xml
+++ b/multiflex/webapp/multiflex/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="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 - multiflex Ecommerce Visual Theme</display-name>
   <description>multiflex Ecommerce Visual Theme</description>
 
diff --git a/myportal/webapp/myportal/WEB-INF/web.xml b/myportal/webapp/myportal/WEB-INF/web.xml
index 460f112..f1480d5 100644
--- a/myportal/webapp/myportal/WEB-INF/web.xml
+++ b/myportal/webapp/myportal/WEB-INF/web.xml
@@ -19,7 +19,7 @@
     under the License.
 -->
 
-<web-app version="3.0">
+<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 - My Page</display-name>
     <description>My Portal component of the Apache OFBiz Project</description>
 
diff --git a/passport/webapp/passport/WEB-INF/web.xml b/passport/webapp/passport/WEB-INF/web.xml
index cad5e4b..f73e4d9 100644
--- a/passport/webapp/passport/WEB-INF/web.xml
+++ b/passport/webapp/passport/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="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 - Passport Component</display-name>
     <description>Passport Component of the Apache OFBiz Project</description>
 </web-app>
\ No newline at end of file
diff --git a/pricat/webapp/pricat/WEB-INF/web.xml b/pricat/webapp/pricat/WEB-INF/web.xml
index 8331605..29d64e9 100644
--- a/pricat/webapp/pricat/WEB-INF/web.xml
+++ b/pricat/webapp/pricat/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="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 - PriCat</display-name>
     <description>PriCat Application of the Apache OFBiz Project</description>
diff --git a/pricat/webapp/pricatdemo/WEB-INF/web.xml b/pricat/webapp/pricatdemo/WEB-INF/web.xml
index a928555..447883e 100644
--- a/pricat/webapp/pricatdemo/WEB-INF/web.xml
+++ b/pricat/webapp/pricatdemo/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="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 - PriCat Demo</display-name>
     <description>PriCat Demo Application of the Apache OFBiz Project</description>
diff --git a/projectmgr/webapp/projectmgr/WEB-INF/web.xml b/projectmgr/webapp/projectmgr/WEB-INF/web.xml
index 9898872..6cbf472 100644
--- a/projectmgr/webapp/projectmgr/WEB-INF/web.xml
+++ b/projectmgr/webapp/projectmgr/WEB-INF/web.xml
@@ -18,7 +18,7 @@
     under the License.
 -->
 
-<web-app version="3.0">
+<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 - Project Management</display-name>
     <description>Project Management component of the Apache OFBiz Project</description>
 
diff --git a/scrum/webapp/demotest/WEB-INF/web.xml b/scrum/webapp/demotest/WEB-INF/web.xml
index 259f07d..5c8b85d 100644
--- a/scrum/webapp/demotest/WEB-INF/web.xml
+++ b/scrum/webapp/demotest/WEB-INF/web.xml
@@ -17,7 +17,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="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 - scrum Component</display-name>
     <description>scrum Component of the Apache OFBiz Project
diff --git a/scrum/webapp/scrum/WEB-INF/web.xml b/scrum/webapp/scrum/WEB-INF/web.xml
index 866ce44..11d7000 100644
--- a/scrum/webapp/scrum/WEB-INF/web.xml
+++ b/scrum/webapp/scrum/WEB-INF/web.xml
@@ -17,7 +17,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="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 - scrum Component</display-name>
     <description>scrum Component of the Apache OFBiz Project</description>
 
diff --git a/solr/webapp/solr/WEB-INF/web.xml b/solr/webapp/solr/WEB-INF/web.xml
index 3f1f457..03b436d 100644
--- a/solr/webapp/solr/WEB-INF/web.xml
+++ b/solr/webapp/solr/WEB-INF/web.xml
@@ -15,7 +15,7 @@
  See the License for the specific language governing permissions and
  limitations under the License.
 -->
-<web-app version="3.0">
+<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 - Solr Component</display-name>
     <description>Solr Component of the Apache OFBiz Project</description>
diff --git a/webpos/webapp/webpos/WEB-INF/web.xml b/webpos/webapp/webpos/WEB-INF/web.xml
index a58fe47..1be2f7e 100644
--- a/webpos/webapp/webpos/WEB-INF/web.xml
+++ b/webpos/webapp/webpos/WEB-INF/web.xml
@@ -18,7 +18,7 @@
     under the License.
 -->
 
-<web-app version="3.0">
+<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 Pos</display-name>
     <description>Web Pos component of the Apache OFBiz Project</description>
 

Free forum by Nabble Edit this page