You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by de...@apache.org on 2016/01/16 10:31:49 UTC
svn commit: r1724941 [1/2] - in /ofbiz/branches/release15.12: ./
specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/
specialpurpose/assetmaint/webapp/ismgr/WEB-INF/
specialpurpose/bi/webapp/bi/WEB-INF/
specialpurpose/birt/webapp/accounting/WEB-INF/ sp...
Author: deepak
Date: Sat Jan 16 09:31:49 2016
New Revision: 1724941
URL: http://svn.apache.org/viewvc?rev=1724941&view=rev
Log:
Applied fix from trunk for revision: 1724940
===
OFBIZ-(6655) Add session tracking mode and make cookie secure for all special purpose component. Also updated the web-app version for web.xml files.
Modified:
ofbiz/branches/release15.12/ (props changed)
ofbiz/branches/release15.12/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/web.xml
ofbiz/branches/release15.12/specialpurpose/assetmaint/webapp/ismgr/WEB-INF/web.xml
ofbiz/branches/release15.12/specialpurpose/bi/webapp/bi/WEB-INF/web.xml
ofbiz/branches/release15.12/specialpurpose/birt/webapp/accounting/WEB-INF/web.xml
ofbiz/branches/release15.12/specialpurpose/birt/webapp/birt/WEB-INF/web.xml
ofbiz/branches/release15.12/specialpurpose/birt/webapp/facility/WEB-INF/web.xml
ofbiz/branches/release15.12/specialpurpose/birt/webapp/ordermgr/WEB-INF/web.xml
ofbiz/branches/release15.12/specialpurpose/ebay/webapp/ebay/WEB-INF/web.xml
ofbiz/branches/release15.12/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/web.xml
ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecomclone/WEB-INF/web.xml
ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml
ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecomseo/WEB-INF/web.xml
ofbiz/branches/release15.12/specialpurpose/example/webapp/example/WEB-INF/web.xml
ofbiz/branches/release15.12/specialpurpose/exampleext/webapp/exampleext/WEB-INF/web.xml
ofbiz/branches/release15.12/specialpurpose/googlebase/webapp/googlebase/WEB-INF/web.xml
ofbiz/branches/release15.12/specialpurpose/googlecheckout/webapp/googlecheckout/WEB-INF/web.xml
ofbiz/branches/release15.12/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/web.xml
ofbiz/branches/release15.12/specialpurpose/myportal/webapp/myportal/WEB-INF/web.xml
ofbiz/branches/release15.12/specialpurpose/oagis/webapp/oagis/WEB-INF/web.xml
Propchange: ofbiz/branches/release15.12/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sat Jan 16 09:31:49 2016
@@ -9,4 +9,4 @@
/ofbiz/branches/json-integration-refactoring:1634077-1635900
/ofbiz/branches/multitenant20100310:921280-927264
/ofbiz/branches/release13.07:1547657
-/ofbiz/trunk:1722712,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930
+/ofbiz/trunk:1722712,1724402,1724411,1724566,1724689,1724763,1724916,1724918,1724925,1724930,1724940
Modified: ofbiz/branches/release15.12/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/web.xml?rev=1724941&r1=1724940&r2=1724941&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/web.xml (original)
+++ ofbiz/branches/release15.12/specialpurpose/assetmaint/webapp/assetmaint/WEB-INF/web.xml Sat Jan 16 09:31:49 2016
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,44 +18,49 @@
under the License.
-->
-<web-app>
+<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 - Asset Maintenance</display-name>
<description>Asset Management component of the Apache OFBiz Project</description>
<context-param>
+ <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
<param-name>entityDelegatorName</param-name>
<param-value>default</param-value>
- <description>The Name of the Entity Delegator to use, defined in entityengine.xml</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>assetmaint</param-value>
- <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
</context-param>
<context-param>
+ <description>The location of the main-decorator screen to use for this webapp.</description>
<param-name>mainDecoratorLocation</param-name>
<param-value>component://assetmaint/widget/CommonScreens.xml</param-value>
- <description>The location of the main-decorator screen to use for this webapp.</description>
</context-param>
<context-param>
+ <description>The location of the CommonFacilityDecorator screen to use for this webapp.</description>
<param-name>commonFacilityDecoratorLocation</param-name>
<param-value>component://assetmaint/widget/CommonScreens.xml</param-value>
- <description>The location of the CommonFacilityDecorator screen to use for this webapp.</description>
</context-param>
<context-param>
+ <description>The location of the CommonFixedAssetDecorator screen to use for this webapp.</description>
<param-name>fixedAssetDecoratorLocation</param-name>
<param-value>component://assetmaint/widget/CommonScreens.xml</param-value>
- <description>The location of the CommonFixedAssetDecorator screen to use for this webapp.</description>
</context-param>
<context-param>
+ <description>The location of the CommonFixedAssetMaintDecorator screen to use for this webapp.</description>
<param-name>fixedAssetMaintDecoratorLocation</param-name>
<param-value>component://assetmaint/widget/AssetmaintScreens.xml</param-value>
- <description>The location of the CommonFixedAssetMaintDecorator screen to use for this webapp.</description>
</context-param>
<filter>
- <filter-name>ContextFilter</filter-name>
<display-name>ContextFilter</display-name>
+ <filter-name>ContextFilter</filter-name>
<filter-class>org.ofbiz.webapp.control.ContextFilter</filter-class>
<init-param>
<param-name>disableContextSecurity</param-name>
@@ -86,9 +90,9 @@
<!-- <listener><listener-class>org.ofbiz.webapp.control.ControlActivationEventListener</listener-class></listener> -->
<servlet>
- <servlet-name>ControlServlet</servlet-name>
- <display-name>ControlServlet</display-name>
<description>Main Control Servlet</description>
+ <display-name>ControlServlet</display-name>
+ <servlet-name>ControlServlet</servlet-name>
<servlet-class>org.ofbiz.webapp.control.ControlServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
@@ -99,6 +103,11 @@
<session-config>
<session-timeout>60</session-timeout> <!-- in minutes -->
+ <cookie-config>
+ <http-only>true</http-only>
+ <secure>true</secure>
+ </cookie-config>
+ <tracking-mode>COOKIE</tracking-mode>
</session-config>
<welcome-file-list>
Modified: ofbiz/branches/release15.12/specialpurpose/assetmaint/webapp/ismgr/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/assetmaint/webapp/ismgr/WEB-INF/web.xml?rev=1724941&r1=1724940&r2=1724941&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/assetmaint/webapp/ismgr/WEB-INF/web.xml (original)
+++ ofbiz/branches/release15.12/specialpurpose/assetmaint/webapp/ismgr/WEB-INF/web.xml Sat Jan 16 09:31:49 2016
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,44 +18,49 @@
under the License.
-->
-<web-app>
+<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 - Information Systems</display-name>
<description>Information Systems Management application of the Apache OFBiz Project</description>
<context-param>
+ <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
<param-name>entityDelegatorName</param-name>
<param-value>default</param-value>
- <description>The Name of the Entity Delegator to use, defined in entityengine.xml</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>ismgr</param-value>
- <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
</context-param>
<context-param>
+ <description>The location of the main-decorator screen to use for this webapp.</description>
<param-name>mainDecoratorLocation</param-name>
<param-value>component://assetmaint/widget/ismgr/CommonScreens.xml</param-value>
- <description>The location of the main-decorator screen to use for this webapp.</description>
</context-param>
<context-param>
+ <description>The location of the CommonFacilityDecorator screen to use for this webapp.</description>
<param-name>commonFacilityDecoratorLocation</param-name>
<param-value>component://assetmaint/widget/ismgr/CommonScreens.xml</param-value>
- <description>The location of the CommonFacilityDecorator screen to use for this webapp.</description>
</context-param>
<context-param>
+ <description>The location of the CommonFixedAssetDecorator screen to use for this webapp.</description>
<param-name>fixedAssetDecoratorLocation</param-name>
<param-value>component://assetmaint/widget/ismgr/CommonScreens.xml</param-value>
- <description>The location of the CommonFixedAssetDecorator screen to use for this webapp.</description>
</context-param>
<context-param>
+ <description>The location of the CommonFixedAssetMaintDecorator screen to use for this webapp.</description>
<param-name>fixedAssetMaintDecoratorLocation</param-name>
<param-value>component://assetmaint/widget/ismgr/AssetmaintScreens.xml</param-value>
- <description>The location of the CommonFixedAssetMaintDecorator screen to use for this webapp.</description>
</context-param>
<filter>
- <filter-name>ContextFilter</filter-name>
<display-name>ContextFilter</display-name>
+ <filter-name>ContextFilter</filter-name>
<filter-class>org.ofbiz.webapp.control.ContextFilter</filter-class>
<init-param>
<param-name>disableContextSecurity</param-name>
@@ -86,9 +90,9 @@
<!-- <listener><listener-class>org.ofbiz.webapp.control.ControlActivationEventListener</listener-class></listener> -->
<servlet>
- <servlet-name>ControlServlet</servlet-name>
- <display-name>ControlServlet</display-name>
<description>Main Control Servlet</description>
+ <display-name>ControlServlet</display-name>
+ <servlet-name>ControlServlet</servlet-name>
<servlet-class>org.ofbiz.webapp.control.ControlServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
@@ -99,6 +103,11 @@
<session-config>
<session-timeout>60</session-timeout> <!-- in minutes -->
+ <cookie-config>
+ <http-only>true</http-only>
+ <secure>true</secure>
+ </cookie-config>
+ <tracking-mode>COOKIE</tracking-mode>
</session-config>
<welcome-file-list>
Modified: ofbiz/branches/release15.12/specialpurpose/bi/webapp/bi/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/bi/webapp/bi/WEB-INF/web.xml?rev=1724941&r1=1724940&r2=1724941&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/bi/webapp/bi/WEB-INF/web.xml (original)
+++ ofbiz/branches/release15.12/specialpurpose/bi/webapp/bi/WEB-INF/web.xml Sat Jan 16 09:31:49 2016
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,29 +18,34 @@
under the License.
-->
-<web-app>
+<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 - Business Intelligence</display-name>
<description>Business Intelligence component of the Apache OFBiz Project</description>
<context-param>
+ <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
<param-name>entityDelegatorName</param-name>
<param-value>default</param-value>
- <description>The Name of the Entity Delegator to use, defined in entityengine.xml</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>bi</param-value>
- <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
</context-param>
<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://bi/widget/BiScreens.xml</param-value>
- <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>
</context-param>
<filter>
- <filter-name>ContextFilter</filter-name>
<display-name>ContextFilter</display-name>
+ <filter-name>ContextFilter</filter-name>
<filter-class>org.ofbiz.webapp.control.ContextFilter</filter-class>
<init-param>
<param-name>disableContextSecurity</param-name>
@@ -71,9 +75,9 @@
<!-- <listener><listener-class>org.ofbiz.webapp.control.ControlActivationEventListener</listener-class></listener> -->
<servlet>
- <servlet-name>ControlServlet</servlet-name>
- <display-name>ControlServlet</display-name>
<description>Main Control Servlet</description>
+ <display-name>ControlServlet</display-name>
+ <servlet-name>ControlServlet</servlet-name>
<servlet-class>org.ofbiz.webapp.control.ControlServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
@@ -84,6 +88,11 @@
<session-config>
<session-timeout>60</session-timeout> <!-- in minutes -->
+ <cookie-config>
+ <http-only>true</http-only>
+ <secure>true</secure>
+ </cookie-config>
+ <tracking-mode>COOKIE</tracking-mode>
</session-config>
<welcome-file-list>
Modified: ofbiz/branches/release15.12/specialpurpose/birt/webapp/accounting/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/birt/webapp/accounting/WEB-INF/web.xml?rev=1724941&r1=1724940&r2=1724941&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/birt/webapp/accounting/WEB-INF/web.xml (original)
+++ ofbiz/branches/release15.12/specialpurpose/birt/webapp/accounting/WEB-INF/web.xml Sat Jan 16 09:31:49 2016
@@ -1,5 +1,4 @@
<?xml version="1.0"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one
@@ -20,34 +19,39 @@ specific language governing permissions
under the License.
-->
-<web-app>
+<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>
<context-param>
+ <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
<param-name>entityDelegatorName</param-name>
<param-value>default</param-value>
- <description>The Name of the Entity Delegator to use, defined in entityengine.xml</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>accounting</param-value>
- <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
</context-param>
<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://accounting/widget/CommonScreens.xml</param-value>
- <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>
</context-param>
<context-param>
+ <description>The location of the CommonPartyDecorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
<param-name>partyDecoratorLocation</param-name>
<param-value>component://accounting/widget/CommonScreens.xml</param-value>
- <description>The location of the CommonPartyDecorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
</context-param>
<filter>
- <filter-name>ContextFilter</filter-name>
<display-name>ContextFilter</display-name>
+ <filter-name>ContextFilter</filter-name>
<filter-class>org.ofbiz.webapp.control.ContextFilter</filter-class>
<init-param>
<param-name>disableContextSecurity</param-name>
@@ -77,9 +81,9 @@ under the License.
<!-- <listener><listener-class>org.ofbiz.webapp.control.ControlActivationEventListener</listener-class></listener> -->
<servlet>
- <servlet-name>ControlServlet</servlet-name>
- <display-name>ControlServlet</display-name>
<description>Main Control Servlet</description>
+ <display-name>ControlServlet</display-name>
+ <servlet-name>ControlServlet</servlet-name>
<servlet-class>org.ofbiz.webapp.control.ControlServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
@@ -90,6 +94,11 @@ under the License.
<session-config>
<session-timeout>60</session-timeout> <!-- in minutes -->
+ <cookie-config>
+ <http-only>true</http-only>
+ <secure>true</secure>
+ </cookie-config>
+ <tracking-mode>COOKIE</tracking-mode>
</session-config>
<welcome-file-list>
Modified: ofbiz/branches/release15.12/specialpurpose/birt/webapp/birt/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/birt/webapp/birt/WEB-INF/web.xml?rev=1724941&r1=1724940&r2=1724941&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/birt/webapp/birt/WEB-INF/web.xml (original)
+++ ofbiz/branches/release15.12/specialpurpose/birt/webapp/birt/WEB-INF/web.xml Sat Jan 16 09:31:49 2016
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,32 +18,36 @@ specific language governing permissions
under the License.
-->
-<web-app>
+<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 - BIRT Component</display-name>
<description>BIRT Component of the Apache OFBiz Project</description>
<context-param>
- <param-name>localDispatcherName</param-name><param-value>birt</param-value>
<description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
+ <param-name>localDispatcherName</param-name><param-value>birt</param-value>
</context-param>
<context-param>
- <param-name>entityDelegatorName</param-name><param-value>default</param-value>
<description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
+ <param-name>entityDelegatorName</param-name><param-value>default</param-value>
</context-param>
<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://birt/widget/birt/BirtScreens.xml</param-value>
- <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>
</context-param>
<context-param>
+ <description>Enable widget boundary comments. See org.ofbiz.widget.model.ModelWidget.widgetBoundaryCommentsEnabled().</description>
<param-name>widgetVerbose</param-name>
<param-value>false</param-value>
- <description>Enable widget boundary comments. See org.ofbiz.widget.model.ModelWidget.widgetBoundaryCommentsEnabled().</description>
</context-param>
<context-param>
+ <description>Remove unnecessary whitespace from HTML output.</description>
<param-name>compressHTML</param-name>
<param-value>false</param-value>
- <description>Remove unnecessary whitespace from HTML output.</description>
</context-param>
<!-- Default locale setting.-->
@@ -180,8 +183,8 @@ under the License.
</context-param>
<filter>
- <filter-name>ContextFilter</filter-name>
<display-name>ContextFilter</display-name>
+ <filter-name>ContextFilter</filter-name>
<filter-class>org.ofbiz.webapp.control.ContextFilter</filter-class>
<init-param><param-name>disableContextSecurity</param-name><param-value>N</param-value></init-param>
<init-param>
@@ -220,9 +223,9 @@ under the License.
</listener>
<servlet>
- <servlet-name>ControlServlet</servlet-name>
- <display-name>ControlServlet</display-name>
<description>Main Control Servlet</description>
+ <display-name>ControlServlet</display-name>
+ <servlet-name>ControlServlet</servlet-name>
<servlet-class>org.ofbiz.webapp.control.ControlServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
@@ -278,7 +281,14 @@ under the License.
<url-pattern>/extract</url-pattern>
</servlet-mapping>
- <session-config><session-timeout>60</session-timeout><!-- in minutes --></session-config>
+ <session-config>
+ <session-timeout>60</session-timeout><!-- in minutes -->
+ <cookie-config>
+ <http-only>true</http-only>
+ <secure>true</secure>
+ </cookie-config>
+ <tracking-mode>COOKIE</tracking-mode>
+ </session-config>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
Modified: ofbiz/branches/release15.12/specialpurpose/birt/webapp/facility/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/birt/webapp/facility/WEB-INF/web.xml?rev=1724941&r1=1724940&r2=1724941&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/birt/webapp/facility/WEB-INF/web.xml (original)
+++ ofbiz/branches/release15.12/specialpurpose/birt/webapp/facility/WEB-INF/web.xml Sat Jan 16 09:31:49 2016
@@ -1,5 +1,4 @@
<?xml version="1.0"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one
@@ -20,34 +19,39 @@ specific language governing permissions
under the License.
-->
-<web-app>
+<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>
<context-param>
+ <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
<param-name>entityDelegatorName</param-name>
<param-value>default</param-value>
- <description>The Name of the Entity Delegator to use, defined in entityengine.xml</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>facility</param-value>
- <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
</context-param>
<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://product/widget/facility/CommonScreens.xml</param-value>
- <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>
</context-param>
<context-param>
+ <description>The location of the CommonFacilityDecorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
<param-name>commonFacilityDecoratorLocation</param-name>
<param-value>component://product/widget/facility/CommonScreens.xml</param-value>
- <description>The location of the CommonFacilityDecorator screen to use for this webapp; referred to as a context variable in screen def XML files.</description>
</context-param>
<filter>
- <filter-name>ContextFilter</filter-name>
<display-name>ContextFilter</display-name>
+ <filter-name>ContextFilter</filter-name>
<filter-class>org.ofbiz.webapp.control.ContextFilter</filter-class>
<init-param>
<param-name>disableContextSecurity</param-name>
@@ -77,16 +81,16 @@ under the License.
<!-- <listener><listener-class>org.ofbiz.webapp.control.ControlActivationEventListener</listener-class></listener> -->
<servlet>
- <servlet-name>ControlServlet</servlet-name>
- <display-name>ControlServlet</display-name>
<description>Main Control Servlet</description>
+ <display-name>ControlServlet</display-name>
+ <servlet-name>ControlServlet</servlet-name>
<servlet-class>org.ofbiz.webapp.control.ControlServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet>
- <servlet-name>ShippingAPI</servlet-name>
- <display-name>ShippingAPI</display-name>
<description>Mock USPS Webtools API Servlet</description>
+ <display-name>ShippingAPI</display-name>
+ <servlet-name>ShippingAPI</servlet-name>
<servlet-class>org.ofbiz.shipment.thirdparty.usps.UspsMockApiServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
@@ -101,6 +105,11 @@ under the License.
<session-config>
<session-timeout>60</session-timeout> <!-- in minutes -->
+ <cookie-config>
+ <http-only>true</http-only>
+ <secure>true</secure>
+ </cookie-config>
+ <tracking-mode>COOKIE</tracking-mode>
</session-config>
<welcome-file-list>
Modified: ofbiz/branches/release15.12/specialpurpose/birt/webapp/ordermgr/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/birt/webapp/ordermgr/WEB-INF/web.xml?rev=1724941&r1=1724940&r2=1724941&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/birt/webapp/ordermgr/WEB-INF/web.xml (original)
+++ ofbiz/branches/release15.12/specialpurpose/birt/webapp/ordermgr/WEB-INF/web.xml Sat Jan 16 09:31:49 2016
@@ -1,5 +1,4 @@
<?xml version="1.0"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one
@@ -20,29 +19,34 @@ specific language governing permissions
under the License.
-->
-<web-app>
+<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>
<context-param>
+ <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
<param-name>entityDelegatorName</param-name>
<param-value>default</param-value>
- <description>The Name of the Entity Delegator to use, defined in entityengine.xml</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>order</param-value>
- <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
</context-param>
<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://order/widget/ordermgr/CommonScreens.xml</param-value>
- <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>
</context-param>
<filter>
- <filter-name>ContextFilter</filter-name>
<display-name>ContextFilter</display-name>
+ <filter-name>ContextFilter</filter-name>
<filter-class>org.ofbiz.webapp.control.ContextFilter</filter-class>
<init-param>
<param-name>disableContextSecurity</param-name>
@@ -72,16 +76,16 @@ under the License.
<!-- <listener><listener-class>org.ofbiz.webapp.control.ControlActivationEventListener</listener-class></listener> -->
<servlet>
- <servlet-name>ControlServlet</servlet-name>
- <display-name>ControlServlet</display-name>
<description>Main Control Servlet</description>
+ <display-name>ControlServlet</display-name>
+ <servlet-name>ControlServlet</servlet-name>
<servlet-class>org.ofbiz.webapp.control.ControlServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet>
- <servlet-name>CatalogUrlServlet</servlet-name>
- <display-name>CatalogUrlServlet</display-name>
<description>Catalog (Category/Product) URL Servlet</description>
+ <display-name>CatalogUrlServlet</display-name>
+ <servlet-name>CatalogUrlServlet</servlet-name>
<servlet-class>org.ofbiz.product.category.CatalogUrlServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
@@ -97,6 +101,11 @@ under the License.
<session-config>
<session-timeout>60</session-timeout> <!-- in minutes -->
+ <cookie-config>
+ <http-only>true</http-only>
+ <secure>true</secure>
+ </cookie-config>
+ <tracking-mode>COOKIE</tracking-mode>
</session-config>
<welcome-file-list>
Modified: ofbiz/branches/release15.12/specialpurpose/ebay/webapp/ebay/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/ebay/webapp/ebay/WEB-INF/web.xml?rev=1724941&r1=1724940&r2=1724941&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/ebay/webapp/ebay/WEB-INF/web.xml (original)
+++ ofbiz/branches/release15.12/specialpurpose/ebay/webapp/ebay/WEB-INF/web.xml Sat Jan 16 09:31:49 2016
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,34 +18,39 @@ specific language governing permissions
under the License.
-->
-<web-app>
+<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 - Ebay</display-name>
<description>eBay component of the Apache OFBiz Project</description>
<context-param>
+ <description>A unique ID used to look up the WebSite entity</description>
<param-name>webSiteId</param-name>
<param-value>EBAY</param-value>
- <description>A unique ID used to look up the WebSite entity</description>
</context-param>
<context-param>
+ <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
<param-name>entityDelegatorName</param-name>
<param-value>default</param-value>
- <description>The Name of the Entity Delegator to use, defined in entityengine.xml</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>ebay</param-value>
- <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
</context-param>
<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://ebay/widget/CommonScreens.xml</param-value>
- <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>
</context-param>
<filter>
- <filter-name>ContextFilter</filter-name>
<display-name>ContextFilter</display-name>
+ <filter-name>ContextFilter</filter-name>
<filter-class>org.ofbiz.webapp.control.ContextFilter</filter-class>
<init-param>
<param-name>disableContextSecurity</param-name>
@@ -74,9 +78,9 @@ under the License.
<listener><listener-class>org.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
<servlet>
- <servlet-name>ControlServlet</servlet-name>
- <display-name>ControlServlet</display-name>
<description>Main Control Servlet</description>
+ <display-name>ControlServlet</display-name>
+ <servlet-name>ControlServlet</servlet-name>
<servlet-class>org.ofbiz.webapp.control.ControlServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
@@ -87,6 +91,11 @@ under the License.
<session-config>
<session-timeout>60</session-timeout> <!-- in minutes -->
+ <cookie-config>
+ <http-only>true</http-only>
+ <secure>true</secure>
+ </cookie-config>
+ <tracking-mode>COOKIE</tracking-mode>
</session-config>
<welcome-file-list>
Modified: ofbiz/branches/release15.12/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/web.xml?rev=1724941&r1=1724940&r2=1724941&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/web.xml (original)
+++ ofbiz/branches/release15.12/specialpurpose/ebaystore/webapp/ebaystore/WEB-INF/web.xml Sat Jan 16 09:31:49 2016
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,34 +18,39 @@ specific language governing permissions
under the License.
-->
-<web-app>
+<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 - eBay Store</display-name>
<description>eBay Store component of the Apache OFBiz Project</description>
<context-param>
+ <description>A unique ID used to look up the WebSite entity</description>
<param-name>webSiteId</param-name>
<param-value>EBAY_STORE</param-value>
- <description>A unique ID used to look up the WebSite entity</description>
</context-param>
<context-param>
+ <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
<param-name>entityDelegatorName</param-name>
<param-value>default</param-value>
- <description>The Name of the Entity Delegator to use, defined in entityengine.xml</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>ebaystore</param-value>
- <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
</context-param>
<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://ebaystore/widget/CommonScreens.xml</param-value>
- <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>
</context-param>
<filter>
- <filter-name>ContextFilter</filter-name>
<display-name>ContextFilter</display-name>
+ <filter-name>ContextFilter</filter-name>
<filter-class>org.ofbiz.webapp.control.ContextFilter</filter-class>
<init-param>
<param-name>disableContextSecurity</param-name>
@@ -74,9 +78,9 @@ under the License.
<listener><listener-class>org.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
<servlet>
- <servlet-name>ControlServlet</servlet-name>
- <display-name>ControlServlet</display-name>
<description>Main Control Servlet</description>
+ <display-name>ControlServlet</display-name>
+ <servlet-name>ControlServlet</servlet-name>
<servlet-class>org.ofbiz.webapp.control.ControlServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
@@ -87,6 +91,11 @@ under the License.
<session-config>
<session-timeout>60</session-timeout> <!-- in minutes -->
+ <cookie-config>
+ <http-only>true</http-only>
+ <secure>true</secure>
+ </cookie-config>
+ <tracking-mode>COOKIE</tracking-mode>
</session-config>
<welcome-file-list>
Modified: ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecomclone/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecomclone/WEB-INF/web.xml?rev=1724941&r1=1724940&r2=1724941&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecomclone/WEB-INF/web.xml (original)
+++ ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecomclone/WEB-INF/web.xml Sat Jan 16 09:31:49 2016
@@ -1,5 +1,4 @@
<?xml version="1.0"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one
@@ -20,41 +19,46 @@ specific language governing permissions
under the License.
-->
-<web-app>
+<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</display-name>
<description>Cloned Demo Store for the Apache OFBiz Project</description>
<context-param>
+ <description>A unique ID used to look up the WebSite entity</description>
<param-name>webSiteId</param-name>
<param-value>WebStoreClone</param-value>
- <description>A unique ID used to look up the WebSite entity</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>ecommerce</param-value>
- <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
</context-param>
<context-param>
+ <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
<param-name>entityDelegatorName</param-name>
<param-value>default</param-value>
- <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
</context-param>
<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://ecommerce/widget/CommonScreens.xml</param-value>
- <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>
</context-param>
<filter>
- <filter-name>CatalogUrlFilter</filter-name>
<display-name>CatalogUrlFilter</display-name>
+ <filter-name>CatalogUrlFilter</filter-name>
<filter-class>org.ofbiz.product.category.CatalogUrlFilter</filter-class>
<init-param><param-name>defaultLocaleString</param-name><param-value>en_US</param-value></init-param>
<init-param><param-name>redirectUrl</param-name><param-value>/control/main</param-value></init-param>
</filter>
<filter>
- <filter-name>ContextFilter</filter-name>
<display-name>ContextFilter</display-name>
+ <filter-name>ContextFilter</filter-name>
<filter-class>org.ofbiz.webapp.control.ContextFilter</filter-class>
<init-param>
<param-name>disableContextSecurity</param-name>
@@ -92,25 +96,25 @@ under the License.
<listener><listener-class>org.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
<servlet>
- <servlet-name>ControlServlet</servlet-name>
- <display-name>ControlServlet</display-name>
<description>Main Control Servlet</description>
+ <display-name>ControlServlet</display-name>
+ <servlet-name>ControlServlet</servlet-name>
<servlet-class>org.ofbiz.webapp.control.ControlServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<!-- un-comment for Worldpay
<servlet>
- <servlet-name>select</servlet-name>
- <display-name>SelectHandler</display-name>
<description>WorldPay Select Handler Service</description>
+ <display-name>SelectHandler</display-name>
+ <servlet-name>select</servlet-name>
<servlet-class>com.worldpay.select.merchant.SelectHandler</servlet-class>
<load-on-startup>5</load-on-startup>
</servlet>
-->
<servlet>
- <servlet-name>CatalogUrlServlet</servlet-name>
- <display-name>CatalogUrlServlet</display-name>
<description>Catalog (Category/Product) URL Servlet</description>
+ <display-name>CatalogUrlServlet</display-name>
+ <servlet-name>CatalogUrlServlet</servlet-name>
<servlet-class>org.ofbiz.product.category.CatalogUrlServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
@@ -132,6 +136,11 @@ under the License.
<session-config>
<session-timeout>60</session-timeout>
+ <cookie-config>
+ <http-only>true</http-only>
+ <secure>true</secure>
+ </cookie-config>
+ <tracking-mode>COOKIE</tracking-mode>
</session-config>
<welcome-file-list>
Modified: ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml?rev=1724941&r1=1724940&r2=1724941&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml (original)
+++ ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml Sat Jan 16 09:31:49 2016
@@ -1,5 +1,4 @@
<?xml version="1.0"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one
@@ -20,48 +19,53 @@ specific language governing permissions
under the License.
-->
-<web-app>
+<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</display-name>
<description>Demo Store for the Apache OFBiz Project</description>
<context-param>
+ <description>A unique ID used to look up the WebSite entity</description>
<param-name>webSiteId</param-name>
<param-value>WebStore</param-value>
- <description>A unique ID used to look up the WebSite entity</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>ecommerce</param-value>
- <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
</context-param>
<context-param>
+ <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
<param-name>entityDelegatorName</param-name>
<param-value>default</param-value>
- <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
</context-param>
<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://ecommerce/widget/CommonScreens.xml</param-value>
- <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>
</context-param>
<context-param>
- <param-name>forceHttpSession</param-name>
- <param-value>true</param-value>
<description>
Forces the JSESSIONID cookie to be sent via http rather https, helps prevent lost sessions in web apps that
frequently switch between http and https.
</description>
+ <param-name>forceHttpSession</param-name>
+ <param-value>true</param-value>
</context-param>
<filter>
- <filter-name>CatalogUrlFilter</filter-name>
<display-name>CatalogUrlFilter</display-name>
+ <filter-name>CatalogUrlFilter</filter-name>
<filter-class>org.ofbiz.product.category.CatalogUrlFilter</filter-class>
<init-param><param-name>defaultLocaleString</param-name><param-value>en_US</param-value></init-param>
</filter>
<filter>
- <filter-name>ContentUrlFilter</filter-name>
<display-name>ContentUrlFilter</display-name>
+ <filter-name>ContentUrlFilter</filter-name>
<filter-class>org.ofbiz.content.content.ContentUrlFilter</filter-class>
<init-param>
<param-name>defaultLocaleString</param-name>
@@ -70,8 +74,8 @@ under the License.
<init-param><param-name>viewRequest</param-name><param-value>ViewBlogArticle</param-value></init-param>
</filter>
<filter>
- <filter-name>ContextFilter</filter-name>
<display-name>ContextFilter</display-name>
+ <filter-name>ContextFilter</filter-name>
<filter-class>org.ofbiz.webapp.control.ContextFilter</filter-class>
<init-param>
<param-name>disableContextSecurity</param-name>
@@ -105,25 +109,25 @@ under the License.
<listener><listener-class>org.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
<servlet>
- <servlet-name>ControlServlet</servlet-name>
<display-name>ControlServlet</display-name>
+ <servlet-name>ControlServlet</servlet-name>
<description>Main Control Servlet</description>
<servlet-class>org.ofbiz.webapp.control.ControlServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<!-- un-comment for Worldpay
<servlet>
- <servlet-name>select</servlet-name>
- <display-name>SelectHandler</display-name>
<description>WorldPay Select Handler Service</description>
+ <display-name>SelectHandler</display-name>
+ <servlet-name>select</servlet-name>
<servlet-class>com.worldpay.select.merchant.SelectHandler</servlet-class>
<load-on-startup>5</load-on-startup>
</servlet>
-->
<servlet>
- <servlet-name>CatalogUrlServlet</servlet-name>
- <display-name>CatalogUrlServlet</display-name>
<description>Catalog (Category/Product) URL Servlet</description>
+ <display-name>CatalogUrlServlet</display-name>
+ <servlet-name>CatalogUrlServlet</servlet-name>
<servlet-class>org.ofbiz.product.category.CatalogUrlServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
@@ -145,6 +149,11 @@ under the License.
<session-config>
<session-timeout>60</session-timeout>
+ <cookie-config>
+ <http-only>true</http-only>
+ <secure>true</secure>
+ </cookie-config>
+ <tracking-mode>COOKIE</tracking-mode>
</session-config>
<welcome-file-list>
Modified: ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecomseo/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecomseo/WEB-INF/web.xml?rev=1724941&r1=1724940&r2=1724941&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecomseo/WEB-INF/web.xml (original)
+++ ofbiz/branches/release15.12/specialpurpose/ecommerce/webapp/ecomseo/WEB-INF/web.xml Sat Jan 16 09:31:49 2016
@@ -1,5 +1,4 @@
<?xml version="1.0"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one
@@ -20,54 +19,58 @@ specific language governing permissions
under the License.
-->
-<web-app>
+<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</display-name>
<description>Demo Store for the Apache OFBiz Project</description>
<context-param>
+ <description>A unique ID used to look up the WebSite entity</description>
<param-name>webSiteId</param-name>
<param-value>WebStore</param-value>
- <description>A unique ID used to look up the WebSite entity</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>ecommerce</param-value>
- <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
</context-param>
<context-param>
+ <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
<param-name>entityDelegatorName</param-name>
<param-value>default</param-value>
- <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
</context-param>
<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://ecommerce/widget/CommonScreens.xml</param-value>
- <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>
</context-param>
<context-param>
- <param-name>forceHttpSession</param-name>
- <param-value>true</param-value>
<description>
Forces the JSESSIONID cookie to be sent via http rather https, helps prevent lost sessions in web apps that
frequently switch between http and https.
</description>
+ <param-name>forceHttpSession</param-name>
+ <param-value>true</param-value>
</context-param>
<context-param>
+ <description>Default page uri. Important: please DO add or remove /control to match url-pattern of SeoControlServlet.</description>
<param-name>defaultPage</param-name>
<param-value>/main</param-value>
- <description>Default page uri. Important: please DO add or remove /control to match url-pattern of SeoControlServlet.
- </description>
</context-param>
<filter>
- <filter-name>SeoCatalogUrlFilter</filter-name>
<display-name>SeoCatalogUrlFilter</display-name>
+ <filter-name>SeoCatalogUrlFilter</filter-name>
<filter-class>org.ofbiz.product.category.CatalogUrlSeoFilter</filter-class>
<init-param><param-name>defaultLocaleString</param-name><param-value>en_US</param-value></init-param>
</filter>
<filter>
- <filter-name>SeoContentUrlFilter</filter-name>
<display-name>SeoContentUrlFilter</display-name>
+ <filter-name>SeoContentUrlFilter</filter-name>
<filter-class>org.ofbiz.product.category.SeoContentUrlFilter</filter-class>
<init-param>
<param-name>defaultLocaleString</param-name>
@@ -76,8 +79,8 @@ under the License.
<init-param><param-name>viewRequest</param-name><param-value>ViewBlogArticle</param-value></init-param>
</filter>
<filter>
- <filter-name>SeoContextFilter</filter-name>
<display-name>SeoContextFilter</display-name>
+ <filter-name>SeoContextFilter</filter-name>
<filter-class>org.ofbiz.product.category.SeoContextFilter</filter-class>
<init-param>
<param-name>disableContextSecurity</param-name>
@@ -111,9 +114,9 @@ under the License.
<listener><listener-class>org.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
<servlet>
- <servlet-name>SeoControlServlet</servlet-name>
- <display-name>SeoControlServlet</display-name>
<description>Main SEO Control Servlet</description>
+ <display-name>SeoControlServlet</display-name>
+ <servlet-name>SeoControlServlet</servlet-name>
<servlet-class>org.ofbiz.product.category.SeoControlServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
@@ -127,9 +130,9 @@ under the License.
</servlet>
-->
<servlet>
- <servlet-name>SeoCatalogUrlServlet</servlet-name>
- <display-name>SeoCatalogUrlServlet</display-name>
<description>SEO Catalog (Category/Product) URL Servlet</description>
+ <display-name>SeoCatalogUrlServlet</display-name>
+ <servlet-name>SeoCatalogUrlServlet</servlet-name>
<servlet-class>org.ofbiz.product.category.SeoCatalogUrlServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
@@ -151,6 +154,11 @@ under the License.
<session-config>
<session-timeout>60</session-timeout>
+ <cookie-config>
+ <http-only>true</http-only>
+ <secure>true</secure>
+ </cookie-config>
+ <tracking-mode>COOKIE</tracking-mode>
</session-config>
<welcome-file-list>
Modified: ofbiz/branches/release15.12/specialpurpose/example/webapp/example/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/example/webapp/example/WEB-INF/web.xml?rev=1724941&r1=1724940&r2=1724941&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/example/webapp/example/WEB-INF/web.xml (original)
+++ ofbiz/branches/release15.12/specialpurpose/example/webapp/example/WEB-INF/web.xml Sat Jan 16 09:31:49 2016
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,32 +18,37 @@ specific language governing permissions
under the License.
-->
-<web-app>
+<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 - Example Application</display-name>
<description>Example Application of the Apache OFBiz Project</description>
<context-param>
- <param-name>localDispatcherName</param-name><param-value>example</param-value>
<description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
+ <param-name>localDispatcherName</param-name><param-value>example</param-value>
</context-param>
<context-param>
- <param-name>entityDelegatorName</param-name><param-value>default</param-value>
<description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
+ <param-name>entityDelegatorName</param-name><param-value>default</param-value>
</context-param>
<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://example/widget/example/CommonScreens.xml</param-value>
- <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>
</context-param>
<context-param>
+ <description>Remove unnecessary whitespace from HTML output.</description>
<param-name>compressHTML</param-name>
<param-value>false</param-value>
- <description>Remove unnecessary whitespace from HTML output.</description>
</context-param>
<filter>
- <filter-name>ContextFilter</filter-name>
<display-name>ContextFilter</display-name>
+ <filter-name>ContextFilter</filter-name>
<filter-class>org.ofbiz.webapp.control.ContextFilter</filter-class>
<init-param><param-name>disableContextSecurity</param-name><param-value>N</param-value></init-param>
<init-param>
@@ -62,15 +66,22 @@ under the License.
<!-- <listener><listener-class>org.ofbiz.webapp.control.ControlActivationEventListener</listener-class></listener> -->
<servlet>
- <servlet-name>ControlServlet</servlet-name>
- <display-name>ControlServlet</display-name>
<description>Main Control Servlet</description>
+ <display-name>ControlServlet</display-name>
+ <servlet-name>ControlServlet</servlet-name>
<servlet-class>org.ofbiz.webapp.control.ControlServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</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>
+ <session-config>
+ <session-timeout>60</session-timeout><!-- in minutes -->
+ <cookie-config>
+ <http-only>true</http-only>
+ <secure>true</secure>
+ </cookie-config>
+ <tracking-mode>COOKIE</tracking-mode>
+ </session-config>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
Modified: ofbiz/branches/release15.12/specialpurpose/exampleext/webapp/exampleext/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/exampleext/webapp/exampleext/WEB-INF/web.xml?rev=1724941&r1=1724940&r2=1724941&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/exampleext/webapp/exampleext/WEB-INF/web.xml (original)
+++ ofbiz/branches/release15.12/specialpurpose/exampleext/webapp/exampleext/WEB-INF/web.xml Sat Jan 16 09:31:49 2016
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,27 +18,32 @@ specific language governing permissions
under the License.
-->
-<web-app>
+<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 - Extended Example Application</display-name>
<description>Extended Example Application of the Apache OFBiz Project</description>
<context-param>
- <param-name>localDispatcherName</param-name><param-value>exampleext</param-value>
<description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
+ <param-name>localDispatcherName</param-name><param-value>exampleext</param-value>
</context-param>
<context-param>
- <param-name>entityDelegatorName</param-name><param-value>default</param-value>
<description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
+ <param-name>entityDelegatorName</param-name><param-value>default</param-value>
</context-param>
<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://exampleext/widget/example/CommonScreens.xml</param-value>
- <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>
</context-param>
<filter>
- <filter-name>ContextFilter</filter-name>
<display-name>ContextFilter</display-name>
+ <filter-name>ContextFilter</filter-name>
<filter-class>org.ofbiz.webapp.control.ContextFilter</filter-class>
<init-param><param-name>disableContextSecurity</param-name><param-value>N</param-value></init-param>
<init-param>
@@ -57,15 +61,22 @@ under the License.
<!-- <listener><listener-class>org.ofbiz.webapp.control.ControlActivationEventListener</listener-class></listener> -->
<servlet>
- <servlet-name>ControlServlet</servlet-name>
- <display-name>ControlServlet</display-name>
<description>Main Control Servlet</description>
+ <display-name>ControlServlet</display-name>
+ <servlet-name>ControlServlet</servlet-name>
<servlet-class>org.ofbiz.webapp.control.ControlServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</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>
+ <session-config>
+ <session-timeout>60</session-timeout><!-- in minutes -->
+ <cookie-config>
+ <http-only>true</http-only>
+ <secure>true</secure>
+ </cookie-config>
+ <tracking-mode>COOKIE</tracking-mode>
+ </session-config>
<welcome-file-list>
<welcome-file>index.jsp</welcome-file>
Modified: ofbiz/branches/release15.12/specialpurpose/googlebase/webapp/googlebase/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/googlebase/webapp/googlebase/WEB-INF/web.xml?rev=1724941&r1=1724940&r2=1724941&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/googlebase/webapp/googlebase/WEB-INF/web.xml (original)
+++ ofbiz/branches/release15.12/specialpurpose/googlebase/webapp/googlebase/WEB-INF/web.xml Sat Jan 16 09:31:49 2016
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,29 +18,34 @@ specific language governing permissions
under the License.
-->
-<web-app>
+<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 - Google Base</display-name>
<description>Google Base component of the Apache OFBiz Project</description>
<context-param>
+ <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
<param-name>entityDelegatorName</param-name>
<param-value>default</param-value>
- <description>The Name of the Entity Delegator to use, defined in entityengine.xml</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>googlebase</param-value>
- <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
</context-param>
<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://googlebase/widget/CommonScreens.xml</param-value>
- <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>
</context-param>
<filter>
- <filter-name>ContextFilter</filter-name>
<display-name>ContextFilter</display-name>
+ <filter-name>ContextFilter</filter-name>
<filter-class>org.ofbiz.webapp.control.ContextFilter</filter-class>
<init-param>
<param-name>disableContextSecurity</param-name>
@@ -69,9 +73,9 @@ under the License.
<listener><listener-class>org.ofbiz.webapp.control.LoginEventListener</listener-class></listener>
<servlet>
- <servlet-name>ControlServlet</servlet-name>
- <display-name>ControlServlet</display-name>
<description>Main Control Servlet</description>
+ <display-name>ControlServlet</display-name>
+ <servlet-name>ControlServlet</servlet-name>
<servlet-class>org.ofbiz.webapp.control.ControlServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
@@ -82,6 +86,11 @@ under the License.
<session-config>
<session-timeout>60</session-timeout> <!-- in minutes -->
+ <cookie-config>
+ <http-only>true</http-only>
+ <secure>true</secure>
+ </cookie-config>
+ <tracking-mode>COOKIE</tracking-mode>
</session-config>
<welcome-file-list>
Modified: ofbiz/branches/release15.12/specialpurpose/googlecheckout/webapp/googlecheckout/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/googlecheckout/webapp/googlecheckout/WEB-INF/web.xml?rev=1724941&r1=1724940&r2=1724941&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/googlecheckout/webapp/googlecheckout/WEB-INF/web.xml (original)
+++ ofbiz/branches/release15.12/specialpurpose/googlecheckout/webapp/googlecheckout/WEB-INF/web.xml Sat Jan 16 09:31:49 2016
@@ -1,5 +1,4 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,44 +18,49 @@
under the License.
-->
-<web-app>
+<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 - Google Checkout</display-name>
<description>Google Checkout component of the Apache OFBiz Project</description>
<context-param>
+ <description>A unique ID used to look up the WebSite entity</description>
<param-name>webSiteId</param-name>
<param-value>GOOGLECHECKOUT</param-value>
- <description>A unique ID used to look up the WebSite entity</description>
</context-param>
<context-param>
+ <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
<param-name>entityDelegatorName</param-name>
<param-value>default</param-value>
- <description>The Name of the Entity Delegator to use, defined in entityengine.xml</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>googlecheckout</param-value>
- <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
</context-param>
<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://googlecheckout/widget/CommonScreens.xml</param-value>
- <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>
</context-param>
<context-param>
+ <description>Enable widget boundary comments. See org.ofbiz.widget.model.ModelWidget.widgetBoundaryCommentsEnabled().</description>
<param-name>widgetVerbose</param-name>
<param-value>false</param-value>
- <description>Enable widget boundary comments. See org.ofbiz.widget.model.ModelWidget.widgetBoundaryCommentsEnabled().</description>
</context-param>
<context-param>
+ <description>Remove unnecessary whitespace from HTML output.</description>
<param-name>compressHTML</param-name>
<param-value>false</param-value>
- <description>Remove unnecessary whitespace from HTML output.</description>
</context-param>
<filter>
- <filter-name>ContextFilter</filter-name>
<display-name>ContextFilter</display-name>
+ <filter-name>ContextFilter</filter-name>
<filter-class>org.ofbiz.webapp.control.ContextFilter</filter-class>
<init-param>
<param-name>disableContextSecurity</param-name>
@@ -86,9 +90,9 @@
<!-- <listener><listener-class>org.ofbiz.webapp.control.ControlActivationEventListener</listener-class></listener> -->
<servlet>
- <servlet-name>ControlServlet</servlet-name>
- <display-name>ControlServlet</display-name>
<description>Main Control Servlet</description>
+ <display-name>ControlServlet</display-name>
+ <servlet-name>ControlServlet</servlet-name>
<servlet-class>org.ofbiz.webapp.control.ControlServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
@@ -99,6 +103,11 @@
<session-config>
<session-timeout>60</session-timeout> <!-- in minutes -->
+ <cookie-config>
+ <http-only>true</http-only>
+ <secure>true</secure>
+ </cookie-config>
+ <tracking-mode>COOKIE</tracking-mode>
</session-config>
<welcome-file-list>
Modified: ofbiz/branches/release15.12/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/web.xml?rev=1724941&r1=1724940&r2=1724941&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/web.xml (original)
+++ ofbiz/branches/release15.12/specialpurpose/hhfacility/webapp/hhfacility/WEB-INF/web.xml Sat Jan 16 09:31:49 2016
@@ -1,5 +1,4 @@
<?xml version="1.0"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,36 +18,40 @@ specific language governing permissions
under the License.
-->
-<web-app>
+<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>Facility Handheld Application</display-name>
<description>Facility Handheld Application</description>
<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>hhfacility</param-value>
- <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
</context-param>
<context-param>
+ <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
<param-name>entityDelegatorName</param-name>
<param-value>default</param-value>
- <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
</context-param>
<!-- This parameter should be set to true for production. -->
<context-param>
+ <description>Remove unnecessary whitespace from HTML output.</description>
<param-name>compressHTML</param-name>
<param-value>false</param-value>
- <description>Remove unnecessary whitespace from HTML output.</description>
</context-param>
<!-- This parameter should be set to false for production. -->
<context-param>
+ <description>Enable widget boundary comments.</description>
<param-name>widgetVerbose</param-name>
<param-value>true</param-value>
- <description>Enable widget boundary comments.</description>
</context-param>
<filter>
- <filter-name>ContextFilter</filter-name>
<display-name>ContextFilter</display-name>
+ <filter-name>ContextFilter</filter-name>
<filter-class>org.ofbiz.webapp.control.ContextFilter</filter-class>
<init-param>
<param-name>disableContextSecurity</param-name>
@@ -78,9 +81,9 @@ under the License.
<!-- <listener><listener-class>org.ofbiz.webapp.control.ControlActivationEventListener</listener-class></listener> -->
<servlet>
- <servlet-name>ControlServlet</servlet-name>
- <display-name>ControlServlet</display-name>
<description>Main Control Servlet</description>
+ <display-name>ControlServlet</display-name>
+ <servlet-name>ControlServlet</servlet-name>
<servlet-class>org.ofbiz.webapp.control.ControlServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
@@ -91,6 +94,11 @@ under the License.
<session-config>
<session-timeout>60</session-timeout> <!-- in minutes -->
+ <cookie-config>
+ <http-only>true</http-only>
+ <secure>true</secure>
+ </cookie-config>
+ <tracking-mode>COOKIE</tracking-mode>
</session-config>
<welcome-file-list>
Modified: ofbiz/branches/release15.12/specialpurpose/myportal/webapp/myportal/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/release15.12/specialpurpose/myportal/webapp/myportal/WEB-INF/web.xml?rev=1724941&r1=1724940&r2=1724941&view=diff
==============================================================================
--- ofbiz/branches/release15.12/specialpurpose/myportal/webapp/myportal/WEB-INF/web.xml (original)
+++ ofbiz/branches/release15.12/specialpurpose/myportal/webapp/myportal/WEB-INF/web.xml Sat Jan 16 09:31:49 2016
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+
<!--
Licensed to the Apache Software Foundation (ASF) under one
or more contributor license agreements. See the NOTICE file
@@ -19,29 +19,33 @@
under the License.
-->
-<web-app>
+<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 - My Page</display-name>
<description>My Portal component of the Apache OFBiz Project</description>
<context-param>
+ <description>The Name of the Entity Delegator to use, defined in entityengine.xml</description>
<param-name>entityDelegatorName</param-name>
<param-value>default</param-value>
- <description>The Name of the Entity Delegator to use, defined in entityengine.xml</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>myportal</param-value>
- <description>A unique name used to identify/recognize the local dispatcher for the Service Engine</description>
</context-param>
<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://myportal/widget/CommonScreens.xml</param-value>
- <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>
</context-param>
<filter>
- <filter-name>ContextFilter</filter-name>
<display-name>ContextFilter</display-name>
+ <filter-name>ContextFilter</filter-name>
<filter-class>org.ofbiz.webapp.control.ContextFilter</filter-class>
<init-param>
<param-name>disableContextSecurity</param-name>
@@ -71,9 +75,9 @@
<!-- <listener><listener-class>org.ofbiz.webapp.control.ControlActivationEventListener</listener-class></listener> -->
<servlet>
- <servlet-name>ControlServlet</servlet-name>
- <display-name>ControlServlet</display-name>
<description>Main Control Servlet</description>
+ <display-name>ControlServlet</display-name>
+ <servlet-name>ControlServlet</servlet-name>
<servlet-class>org.ofbiz.webapp.control.ControlServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
@@ -84,6 +88,11 @@
<session-config>
<session-timeout>60</session-timeout> <!-- in minutes -->
+ <cookie-config>
+ <http-only>true</http-only>
+ <secure>true</secure>
+ </cookie-config>
+ <tracking-mode>COOKIE</tracking-mode>
</session-config>
<welcome-file-list>