This is an automated email from the ASF dual-hosted git repository.
jleroux pushed a commit to branch trunk
in repository https://gitbox.apache.org/repos/asf/ofbiz-plugins.git
The following commit(s) were added to refs/heads/trunk by this push:
new 6106277 Improved: Add global web.xml to simplify session timeout
configuration (OFBIZ-12255)
6106277 is described below
commit 6106277bb43bff141e36c4c6edf825f9777a7f2e
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Tue Jun 22 08:52:44 2021 +0200
Improved: Add global web.xml to simplify session timeout configuration
(OFBIZ-12255)
Currently, session timeout is configured in apps separately, but session is
shared globally, so the smallest one take effects, and it will not take
effect
separately for different apps.
Then it is both inconvenient and confusing to increase session timeout
value,
as all values in those files need to be updated.
A global web.xml is needed, to simplify session timeout configuration.
Thanks: Xin Wang
---
assetmaint/webapp/assetmaint/WEB-INF/web.xml | 4 ----
assetmaint/webapp/ismgr/WEB-INF/web.xml | 4 ----
bi/webapp/bi/WEB-INF/web.xml | 4 ----
birt/webapp/accounting/WEB-INF/web.xml | 4 ----
birt/webapp/birt/WEB-INF/web.xml | 4 ----
birt/webapp/facility/WEB-INF/web.xml | 4 ----
birt/webapp/ordermgr/WEB-INF/web.xml | 4 ----
cmssite/webapp/cmssite/WEB-INF/web.xml | 4 ----
ebay/webapp/ebay/WEB-INF/web.xml | 4 ----
ebaystore/webapp/ebaystore/WEB-INF/web.xml | 4 ----
ecommerce/webapp/ecommerce/WEB-INF/web.xml | 4 ----
ecommerce/webapp/ecomseo/WEB-INF/web.xml | 4 ----
example/webapp/example/WEB-INF/web.xml | 4 ----
exampleext/webapp/exampleext/WEB-INF/web.xml | 4 ----
firstdatapaymentgateway/webapp/firstdata/WEB-INF/web.xml | 4 ----
lucene/webapp/content/WEB-INF/web.xml | 4 ----
myportal/webapp/myportal/WEB-INF/web.xml | 4 ----
pricat/webapp/pricat/WEB-INF/web.xml | 4 ----
pricat/webapp/pricatdemo/WEB-INF/web.xml | 4 ----
projectmgr/webapp/projectmgr/WEB-INF/web.xml | 4 ----
scrum/webapp/demotest/WEB-INF/web.xml | 4 ----
scrum/webapp/scrum/WEB-INF/web.xml | 4 ----
solr/webapp/solr/WEB-INF/web.xml | 4 ----
webpos/webapp/webpos/WEB-INF/web.xml | 4 ----
24 files changed, 96 deletions(-)
diff --git a/assetmaint/webapp/assetmaint/WEB-INF/web.xml
b/assetmaint/webapp/assetmaint/WEB-INF/web.xml
index 72bd3b8..c54ffe4 100644
--- a/assetmaint/webapp/assetmaint/WEB-INF/web.xml
+++ b/assetmaint/webapp/assetmaint/WEB-INF/web.xml
@@ -112,10 +112,6 @@
<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/assetmaint/webapp/ismgr/WEB-INF/web.xml
b/assetmaint/webapp/ismgr/WEB-INF/web.xml
index fe14a40..6eae43d 100644
--- a/assetmaint/webapp/ismgr/WEB-INF/web.xml
+++ b/assetmaint/webapp/ismgr/WEB-INF/web.xml
@@ -107,10 +107,6 @@
<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/bi/webapp/bi/WEB-INF/web.xml b/bi/webapp/bi/WEB-INF/web.xml
index ab12741..71ca0ca 100644
--- a/bi/webapp/bi/WEB-INF/web.xml
+++ b/bi/webapp/bi/WEB-INF/web.xml
@@ -92,10 +92,6 @@
<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/birt/webapp/accounting/WEB-INF/web.xml
b/birt/webapp/accounting/WEB-INF/web.xml
index c45dbbf..ed23026 100644
--- a/birt/webapp/accounting/WEB-INF/web.xml
+++ b/birt/webapp/accounting/WEB-INF/web.xml
@@ -98,10 +98,6 @@ under the License.
<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/birt/webapp/birt/WEB-INF/web.xml b/birt/webapp/birt/WEB-INF/web.xml
index c06dae0..36848e9 100644
--- a/birt/webapp/birt/WEB-INF/web.xml
+++ b/birt/webapp/birt/WEB-INF/web.xml
@@ -141,10 +141,6 @@ under the License.
<url-pattern>/extract</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/birt/webapp/facility/WEB-INF/web.xml
b/birt/webapp/facility/WEB-INF/web.xml
index 1fd3f6e..6528980 100644
--- a/birt/webapp/facility/WEB-INF/web.xml
+++ b/birt/webapp/facility/WEB-INF/web.xml
@@ -109,10 +109,6 @@ under the License.
<url-pattern>/ShippingAPI.dll</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/birt/webapp/ordermgr/WEB-INF/web.xml
b/birt/webapp/ordermgr/WEB-INF/web.xml
index 10d1a1c..d0ea21b 100644
--- a/birt/webapp/ordermgr/WEB-INF/web.xml
+++ b/birt/webapp/ordermgr/WEB-INF/web.xml
@@ -105,10 +105,6 @@ under the License.
<url-pattern>/products/*</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/cmssite/webapp/cmssite/WEB-INF/web.xml
b/cmssite/webapp/cmssite/WEB-INF/web.xml
index 40f88c5..4c53343 100644
--- a/cmssite/webapp/cmssite/WEB-INF/web.xml
+++ b/cmssite/webapp/cmssite/WEB-INF/web.xml
@@ -75,10 +75,6 @@ under the License.
<url-pattern>/*</url-pattern>
</servlet-mapping>
- <session-config>
- <session-timeout>60</session-timeout><!-- in minutes -->
- </session-config>
-
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
diff --git a/ebay/webapp/ebay/WEB-INF/web.xml b/ebay/webapp/ebay/WEB-INF/web.xml
index 1f8c900..850f345 100644
--- a/ebay/webapp/ebay/WEB-INF/web.xml
+++ b/ebay/webapp/ebay/WEB-INF/web.xml
@@ -95,10 +95,6 @@ under the License.
<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/ebaystore/webapp/ebaystore/WEB-INF/web.xml
b/ebaystore/webapp/ebaystore/WEB-INF/web.xml
index 7c0f087..683abc2 100644
--- a/ebaystore/webapp/ebaystore/WEB-INF/web.xml
+++ b/ebaystore/webapp/ebaystore/WEB-INF/web.xml
@@ -95,10 +95,6 @@ under the License.
<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/ecommerce/webapp/ecommerce/WEB-INF/web.xml
b/ecommerce/webapp/ecommerce/WEB-INF/web.xml
index 4926d0e..7e8f30e 100644
--- a/ecommerce/webapp/ecommerce/WEB-INF/web.xml
+++ b/ecommerce/webapp/ecommerce/WEB-INF/web.xml
@@ -158,10 +158,6 @@ under the License.
<url-pattern>/products/*</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/ecommerce/webapp/ecomseo/WEB-INF/web.xml
b/ecommerce/webapp/ecomseo/WEB-INF/web.xml
index 17c74b8..4bdb638 100644
--- a/ecommerce/webapp/ecomseo/WEB-INF/web.xml
+++ b/ecommerce/webapp/ecomseo/WEB-INF/web.xml
@@ -151,10 +151,6 @@ under the License.
<url-pattern>/products/*</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/example/webapp/example/WEB-INF/web.xml
b/example/webapp/example/WEB-INF/web.xml
index 6417d05..a015cb9 100644
--- a/example/webapp/example/WEB-INF/web.xml
+++ b/example/webapp/example/WEB-INF/web.xml
@@ -92,10 +92,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/exampleext/webapp/exampleext/WEB-INF/web.xml
b/exampleext/webapp/exampleext/WEB-INF/web.xml
index 8b3edf8..4d8558d 100644
--- a/exampleext/webapp/exampleext/WEB-INF/web.xml
+++ b/exampleext/webapp/exampleext/WEB-INF/web.xml
@@ -87,10 +87,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/firstdatapaymentgateway/webapp/firstdata/WEB-INF/web.xml
b/firstdatapaymentgateway/webapp/firstdata/WEB-INF/web.xml
index 94554ae..db50d56 100644
--- a/firstdatapaymentgateway/webapp/firstdata/WEB-INF/web.xml
+++ b/firstdatapaymentgateway/webapp/firstdata/WEB-INF/web.xml
@@ -84,10 +84,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/lucene/webapp/content/WEB-INF/web.xml
b/lucene/webapp/content/WEB-INF/web.xml
index c7f6f5f..a0ce57d 100644
--- a/lucene/webapp/content/WEB-INF/web.xml
+++ b/lucene/webapp/content/WEB-INF/web.xml
@@ -102,10 +102,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/myportal/webapp/myportal/WEB-INF/web.xml
b/myportal/webapp/myportal/WEB-INF/web.xml
index 9e9e040..1ac2fbf 100644
--- a/myportal/webapp/myportal/WEB-INF/web.xml
+++ b/myportal/webapp/myportal/WEB-INF/web.xml
@@ -92,10 +92,6 @@
<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/pricat/webapp/pricat/WEB-INF/web.xml
b/pricat/webapp/pricat/WEB-INF/web.xml
index 22cd61d..7eed714 100644
--- a/pricat/webapp/pricat/WEB-INF/web.xml
+++ b/pricat/webapp/pricat/WEB-INF/web.xml
@@ -92,10 +92,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/pricat/webapp/pricatdemo/WEB-INF/web.xml
b/pricat/webapp/pricatdemo/WEB-INF/web.xml
index c4edfb3..2385153 100644
--- a/pricat/webapp/pricatdemo/WEB-INF/web.xml
+++ b/pricat/webapp/pricatdemo/WEB-INF/web.xml
@@ -92,10 +92,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/projectmgr/webapp/projectmgr/WEB-INF/web.xml
b/projectmgr/webapp/projectmgr/WEB-INF/web.xml
index 783d3f2..e22483f 100644
--- a/projectmgr/webapp/projectmgr/WEB-INF/web.xml
+++ b/projectmgr/webapp/projectmgr/WEB-INF/web.xml
@@ -91,10 +91,6 @@
<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/scrum/webapp/demotest/WEB-INF/web.xml
b/scrum/webapp/demotest/WEB-INF/web.xml
index 0b14b50..1c88922 100644
--- a/scrum/webapp/demotest/WEB-INF/web.xml
+++ b/scrum/webapp/demotest/WEB-INF/web.xml
@@ -108,10 +108,6 @@ under the License.
<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>
diff --git a/scrum/webapp/scrum/WEB-INF/web.xml
b/scrum/webapp/scrum/WEB-INF/web.xml
index 6f2ec6f..eb82825 100644
--- a/scrum/webapp/scrum/WEB-INF/web.xml
+++ b/scrum/webapp/scrum/WEB-INF/web.xml
@@ -85,10 +85,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/solr/webapp/solr/WEB-INF/web.xml b/solr/webapp/solr/WEB-INF/web.xml
index 03b436d..d911ceb 100644
--- a/solr/webapp/solr/WEB-INF/web.xml
+++ b/solr/webapp/solr/WEB-INF/web.xml
@@ -188,10 +188,6 @@
<mime-type>application/xslt+xml</mime-type>
</mime-mapping>
- <session-config>
- <session-timeout>60</session-timeout><!-- in minutes -->
- </session-config>
-
<welcome-file-list>
<welcome-file>admin.html</welcome-file>
</welcome-file-list>
diff --git a/webpos/webapp/webpos/WEB-INF/web.xml
b/webpos/webapp/webpos/WEB-INF/web.xml
index a2d4d15..9bceec6 100644
--- a/webpos/webapp/webpos/WEB-INF/web.xml
+++ b/webpos/webapp/webpos/WEB-INF/web.xml
@@ -111,10 +111,6 @@
<url-pattern>/products/*</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>
