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-framework.git
The following commit(s) were added to refs/heads/trunk by this push:
new 6579bcb Improved: Add global web.xml to simplify session timeout
configuration (OFBIZ-12255)
6579bcb is described below
commit 6579bcbb9bcd6b6e221edcf28b02f2adf68f569c
Author: Jacques Le Roux <jacques.le.r...@les7arts.com>
AuthorDate: Tue Jun 22 18:24:21 2021 +0200
Improved: Add global web.xml to simplify session timeout configuration
(OFBIZ-12255)
Adds missing ASL2 header, uses the same root element than other web.xml
files
---
framework/catalina/config/web.xml | 25 ++++++++++++++++++++-----
1 file changed, 20 insertions(+), 5 deletions(-)
diff --git a/framework/catalina/config/web.xml
b/framework/catalina/config/web.xml
index d014070..7f07edf 100644
--- a/framework/catalina/config/web.xml
+++ b/framework/catalina/config/web.xml
@@ -1,9 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
-<web-app xmlns="http://xmlns.jcp.org/xml/ns/javaee";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee
- http://xmlns.jcp.org/xml/ns/javaee/web-app_4_0.xsd";
- version="4.0">
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+-->
+
+<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";>
<session-config>
<session-timeout>60</session-timeout><!-- in minutes -->
