svn commit: r1811041 - in /ofbiz: ofbiz-framework/trunk/applicat
Locked
svn commit: r1811041 - in /ofbiz: ofbiz-framework/trunk/applicat
 
|
Author: jleroux
Date: Wed Oct 4 07:12:57 2017 New Revision: 1811041 URL: http://svn.apache.org/viewvc?rev=1811041&view=rev Log: Improved: Add session tracking mode and make cookie secure (OFBIZ-6655) Programmatically replaces the web.xml <session-config> declarations and uses the @WebListener annotation to start the process. This avoid to duplicates things everywhere in web.xml files. Since the web.xml files have precedence on annotations, the setting can be easily overridden when necessary. Now that we also use HTTPS in ecommerce the ecommerce session cookie is also secured. I also noted that we had 8 weird <session-timeout> declarations: in solr component: <session-timeout>2</session-timeout> in themes: <session-timeout>1</session-timeout> Also in Rainbowstone we lacked the <cookie-config> and <tracking-mode> declarations. I think it's not good. I resolve these points by simply removing the <session-config> in web.xml files of themes and Solr. Thanks: Pradhan Yash Sharma for review Added: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/WebAppServletContextListener.java (with props) Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/webapp/accounting/WEB-INF/web.xml ofbiz/ofbiz-framework/trunk/applications/accounting/webapp/ap/WEB-INF/web.xml ofbiz/ofbiz-framework/trunk/applications/accounting/webapp/ar/WEB-INF/web.xml ofbiz/ofbiz-framework/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml ofbiz/ofbiz-framework/trunk/applications/commonext/webapp/ordermgr-js/WEB-INF/web.xml ofbiz/ofbiz-framework/trunk/applications/content/webapp/content/WEB-INF/web.xml ofbiz/ofbiz-framework/trunk/applications/content/webapp/contentimages/WEB-INF/web.xml ofbiz/ofbiz-framework/trunk/applications/humanres/webapp/humanres/WEB-INF/web.xml ofbiz/ofbiz-framework/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml ofbiz/ofbiz-framework/trunk/applications/marketing/webapp/marketing/WEB-INF/web.xml ofbiz/ofbiz-framework/trunk/applications/marketing/webapp/sfa/WEB-INF/web.xml ofbiz/ofbiz-framework/trunk/applications/order/webapp/ordermgr/WEB-INF/web.xml ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/web.xml ofbiz/ofbiz-framework/trunk/applications/product/webapp/catalog/WEB-INF/web.xml ofbiz/ofbiz-framework/trunk/applications/product/webapp/facility/WEB-INF/web.xml ofbiz/ofbiz-framework/trunk/applications/workeffort/webapp/ical/WEB-INF/web.xml ofbiz/ofbiz-framework/trunk/applications/workeffort/webapp/workeffort/WEB-INF/web.xml ofbiz/ofbiz-framework/trunk/framework/resources/templates/web.xml ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java ofbiz/ofbiz-framework/trunk/framework/webtools/webapp/webtools/WEB-INF/web.xml ofbiz/ofbiz-framework/trunk/themes/bluelight/webapp/bluelight/WEB-INF/web.xml ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/WEB-INF/web.xml ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/WEB-INF/web.xml ofbiz/ofbiz-framework/trunk/themes/flatgrey/webapp/flatgrey/WEB-INF/web.xml ofbiz/ofbiz-framework/trunk/themes/multiflex/webapp/multiflex/WEB-INF/web.xml ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/WEB-INF/web.xml ofbiz/ofbiz-framework/trunk/themes/tomahawk/webapp/tomahawk/WEB-INF/web.xml ofbiz/ofbiz-plugins/trunk/assetmaint/webapp/assetmaint/WEB-INF/web.xml ofbiz/ofbiz-plugins/trunk/assetmaint/webapp/ismgr/WEB-INF/web.xml ofbiz/ofbiz-plugins/trunk/bi/webapp/bi/WEB-INF/web.xml ofbiz/ofbiz-plugins/trunk/birt/webapp/accounting/WEB-INF/web.xml ofbiz/ofbiz-plugins/trunk/birt/webapp/birt/WEB-INF/web.xml ofbiz/ofbiz-plugins/trunk/birt/webapp/facility/WEB-INF/web.xml ofbiz/ofbiz-plugins/trunk/birt/webapp/ordermgr/WEB-INF/web.xml ofbiz/ofbiz-plugins/trunk/cmssite/webapp/cmssite/WEB-INF/web.xml ofbiz/ofbiz-plugins/trunk/ebay/webapp/ebay/WEB-INF/web.xml ofbiz/ofbiz-plugins/trunk/ebaystore/webapp/ebaystore/WEB-INF/web.xml ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/WEB-INF/web.xml ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecomseo/WEB-INF/web.xml ofbiz/ofbiz-plugins/trunk/example/entitydef/entitymodel_view.xml ofbiz/ofbiz-plugins/trunk/example/webapp/example/WEB-INF/web.xml ofbiz/ofbiz-plugins/trunk/exampleext/webapp/exampleext/WEB-INF/web.xml ofbiz/ofbiz-plugins/trunk/hhfacility/webapp/hhfacility/WEB-INF/web.xml ofbiz/ofbiz-plugins/trunk/lucene/webapp/content/WEB-INF/web.xml ofbiz/ofbiz-plugins/trunk/myportal/webapp/myportal/WEB-INF/web.xml ofbiz/ofbiz-plugins/trunk/pricat/webapp/pricat/WEB-INF/web.xml ofbiz/ofbiz-plugins/trunk/pricat/webapp/pricatdemo/WEB-INF/web.xml ofbiz/ofbiz-plugins/trunk/projectmgr/webapp/projectmgr/WEB-INF/web.xml ofbiz/ofbiz-plugins/trunk/scrum/webapp/demotest/WEB-INF/web.xml ofbiz/ofbiz-plugins/trunk/scrum/webapp/scrum/WEB-INF/web.xml ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/WEB-INF/web.xml ofbiz/ofbiz-plugins/trunk/webpos/webapp/webpos/WEB-INF/web.xml Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/webapp/accounting/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/webapp/accounting/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/webapp/accounting/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/webapp/accounting/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -88,14 +88,6 @@ under the License. <url-pattern>/control/*</url-pattern> </servlet-mapping> - <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/ofbiz-framework/trunk/applications/accounting/webapp/ap/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/webapp/ap/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/webapp/ap/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/webapp/ap/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -81,14 +81,6 @@ under the License. <servlet-name>ControlServlet</servlet-name> <url-pattern>/control/*</url-pattern> </servlet-mapping> - <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> <welcome-file>index.html</welcome-file> Modified: ofbiz/ofbiz-framework/trunk/applications/accounting/webapp/ar/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/accounting/webapp/ar/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/accounting/webapp/ar/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/accounting/webapp/ar/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -88,14 +88,6 @@ under the License. <url-pattern>/control/*</url-pattern> </servlet-mapping> - <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/ofbiz-framework/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/commonext/webapp/ofbizsetup/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -81,14 +81,6 @@ <url-pattern>/control/*</url-pattern> </servlet-mapping> - <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/ofbiz-framework/trunk/applications/commonext/webapp/ordermgr-js/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/commonext/webapp/ordermgr-js/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/commonext/webapp/ordermgr-js/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/commonext/webapp/ordermgr-js/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -20,12 +20,4 @@ <web-app version="3.0"> <display-name>Empty placeholder</display-name> <description>Empty placeholder, see http://svn.apache.org/viewvc?view=revision&revision=1612202 </description> - <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> </web-app> Modified: ofbiz/ofbiz-framework/trunk/applications/content/webapp/content/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/webapp/content/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/webapp/content/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/webapp/content/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -88,14 +88,6 @@ under the License. <url-pattern>/control/*</url-pattern> </servlet-mapping> - <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/ofbiz-framework/trunk/applications/content/webapp/contentimages/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/content/webapp/contentimages/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/content/webapp/contentimages/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/content/webapp/contentimages/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -20,12 +20,4 @@ <web-app version="3.0"> <display-name>Apache OFBiz - Content Empty placeholder</display-name> <description>Empty placeholder, see http://svn.apache.org/viewvc?view=revision&revision=1658621 </description> - <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> </web-app> Modified: ofbiz/ofbiz-framework/trunk/applications/humanres/webapp/humanres/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/humanres/webapp/humanres/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/humanres/webapp/humanres/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/humanres/webapp/humanres/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -83,14 +83,6 @@ under the License. <url-pattern>/control/*</url-pattern> </servlet-mapping> - <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/ofbiz-framework/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/manufacturing/webapp/manufacturing/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -88,14 +88,6 @@ under the License. <url-pattern>/control/*</url-pattern> </servlet-mapping> - <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/ofbiz-framework/trunk/applications/marketing/webapp/marketing/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/webapp/marketing/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/marketing/webapp/marketing/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/marketing/webapp/marketing/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -83,15 +83,6 @@ under the License. <url-pattern>/control/*</url-pattern> </servlet-mapping> - <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> </welcome-file-list> Modified: ofbiz/ofbiz-framework/trunk/applications/marketing/webapp/sfa/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/marketing/webapp/sfa/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/marketing/webapp/sfa/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/marketing/webapp/sfa/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -83,14 +83,6 @@ under the License. <url-pattern>/control/*</url-pattern> </servlet-mapping> - <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/ofbiz-framework/trunk/applications/order/webapp/ordermgr/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/order/webapp/ordermgr/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/order/webapp/ordermgr/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/order/webapp/ordermgr/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -95,14 +95,6 @@ under the License. <url-pattern>/products/*</url-pattern> </servlet-mapping> - <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/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/party/webapp/partymgr/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -83,15 +83,6 @@ under the License. <url-pattern>/control/*</url-pattern> </servlet-mapping> - <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> </welcome-file-list> Modified: ofbiz/ofbiz-framework/trunk/applications/product/webapp/catalog/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/webapp/catalog/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/webapp/catalog/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/webapp/catalog/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -97,15 +97,6 @@ under the License. <url-pattern>/images/*</url-pattern> </servlet-mapping> - <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> <welcome-file>index.html</welcome-file> Modified: ofbiz/ofbiz-framework/trunk/applications/product/webapp/facility/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/webapp/facility/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/webapp/facility/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/product/webapp/facility/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -99,14 +99,6 @@ under the License. <url-pattern>/ShippingAPI.dll</url-pattern> </servlet-mapping> - <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/ofbiz-framework/trunk/applications/workeffort/webapp/ical/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/webapp/ical/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/workeffort/webapp/ical/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/workeffort/webapp/ical/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -86,16 +86,6 @@ under the License. <url-pattern>/*</url-pattern> </servlet-mapping> - <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> </welcome-file-list> Modified: ofbiz/ofbiz-framework/trunk/applications/workeffort/webapp/workeffort/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/workeffort/webapp/workeffort/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/workeffort/webapp/workeffort/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-framework/trunk/applications/workeffort/webapp/workeffort/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -89,16 +89,6 @@ under the License. <url-pattern>/control/*</url-pattern> </servlet-mapping> - <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> </welcome-file-list> Modified: ofbiz/ofbiz-framework/trunk/framework/resources/templates/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/resources/templates/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/resources/templates/web.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/resources/templates/web.xml Wed Oct 4 07:12:57 2017 @@ -59,15 +59,6 @@ </servlet> <servlet-mapping><servlet-name>ControlServlet</servlet-name><url-pattern>/control/*</url-pattern></servlet-mapping> - <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> <welcome-file>index.html</welcome-file> Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/ControlEventListener.java Wed Oct 4 07:12:57 2017 @@ -52,6 +52,7 @@ public class ControlEventListener implem public void sessionCreated(HttpSessionEvent event) { HttpSession session = event.getSession(); + session.setMaxInactiveInterval(60*60); //in seconds // get/create the visit // NOTE: don't create the visit here, just let the control servlet do it; GenericValue visit = VisitHandler.getVisit(session); Added: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/WebAppServletContextListener.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/WebAppServletContextListener.java?rev=1811041&view=auto ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/WebAppServletContextListener.java (added) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/WebAppServletContextListener.java Wed Oct 4 07:12:57 2017 @@ -0,0 +1,53 @@ +/******************************************************************************* + * 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. + *******************************************************************************/ +package org.apache.ofbiz.webapp.control; + +import java.util.EnumSet; + +import javax.servlet.ServletContext; +import javax.servlet.ServletContextEvent; +import javax.servlet.ServletContextListener; +import javax.servlet.SessionCookieConfig; +import javax.servlet.SessionTrackingMode; +import javax.servlet.annotation.WebListener; + +@WebListener +public class WebAppServletContextListener implements ServletContextListener { + + /* (non-Javadoc) + * @see javax.servlet.ServletContextListener#contextInitialized(javax.servlet.ServletContextEvent) + */ + @Override + public void contextInitialized(ServletContextEvent sce) { + ServletContext servletContext = sce.getServletContext(); + servletContext.setSessionTrackingModes(EnumSet.of(SessionTrackingMode.COOKIE)); + SessionCookieConfig sessionCookieConfig = servletContext.getSessionCookieConfig(); + sessionCookieConfig.setHttpOnly(true); + sessionCookieConfig.setSecure(true); + } + + /* (non-Javadoc) + * @see javax.servlet.ServletContextListener#contextDestroyed(javax.servlet.ServletContextEvent) + */ + @Override + public void contextDestroyed(ServletContextEvent sce) { + // TODO For now we don't need anything here + } + +} Propchange: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/WebAppServletContextListener.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/WebAppServletContextListener.java ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/control/WebAppServletContextListener.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/webapp/webtools/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/webapp/webtools/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webtools/webapp/webtools/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/webtools/webapp/webtools/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -93,16 +93,6 @@ under the License. <url-pattern>/control/*</url-pattern> </servlet-mapping> - <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> </welcome-file-list> Modified: ofbiz/ofbiz-framework/trunk/themes/bluelight/webapp/bluelight/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/bluelight/webapp/bluelight/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/themes/bluelight/webapp/bluelight/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-framework/trunk/themes/bluelight/webapp/bluelight/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -22,15 +22,6 @@ under the License. <display-name>Apache OFBiz - bluelight Visual Theme</display-name> <description>bluelight Visual Theme</description> - <session-config> - <session-timeout>1</session-timeout> - <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> <welcome-file>main.jsp</welcome-file> Modified: ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-framework/trunk/themes/common/webapp/common/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -22,15 +22,6 @@ under the License. <display-name>Apache OFBiz - Common Theme</display-name> <description>Common Theme</description> - <session-config> - <session-timeout>1</session-timeout> - <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> <welcome-file>main.jsp</welcome-file> Modified: ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-framework/trunk/themes/common/webapp/images/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -22,15 +22,6 @@ under the License. <display-name>Apache OFBiz - demostore images</display-name> <description>Demo Store Images for the Apache OFBiz Project</description> - <session-config> - <session-timeout>1</session-timeout> - <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> <welcome-file>main.jsp</welcome-file> Modified: ofbiz/ofbiz-framework/trunk/themes/flatgrey/webapp/flatgrey/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/flatgrey/webapp/flatgrey/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/themes/flatgrey/webapp/flatgrey/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-framework/trunk/themes/flatgrey/webapp/flatgrey/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -22,15 +22,6 @@ under the License. <display-name>Apache OFBiz - Flat Grey Visual Theme</display-name> <description>Flat Grey Visual Theme</description> - <session-config> - <session-timeout>1</session-timeout> - <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> <welcome-file>main.jsp</welcome-file> Modified: ofbiz/ofbiz-framework/trunk/themes/multiflex/webapp/multiflex/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/multiflex/webapp/multiflex/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/themes/multiflex/webapp/multiflex/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-framework/trunk/themes/multiflex/webapp/multiflex/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -22,15 +22,6 @@ under the License. <display-name>Apache OFBiz - multiflex Ecommerce Visual Theme</display-name> <description>multiflex Ecommerce Visual Theme</description> - <session-config> - <session-timeout>1</session-timeout> - <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> <welcome-file>main.jsp</welcome-file> Modified: ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-framework/trunk/themes/rainbowstone/webapp/rainbowstone/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -22,10 +22,6 @@ under the License. <display-name>Open For Business - Rainbowstone Visual Theme</display-name> <description>Rainbowstone Visual Theme</description> - <session-config> - <session-timeout>1</session-timeout> - </session-config> - <welcome-file-list> <welcome-file>index.jsp</welcome-file> <welcome-file>main.jsp</welcome-file> Modified: ofbiz/ofbiz-framework/trunk/themes/tomahawk/webapp/tomahawk/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/themes/tomahawk/webapp/tomahawk/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/themes/tomahawk/webapp/tomahawk/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-framework/trunk/themes/tomahawk/webapp/tomahawk/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -22,15 +22,6 @@ under the License. <display-name>Apache OFBiz - Tomahawk Visual Theme</display-name> <description>Tomahawk Visual Theme</description> - <session-config> - <session-timeout>1</session-timeout> - <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> <welcome-file>main.jsp</welcome-file> Modified: ofbiz/ofbiz-plugins/trunk/assetmaint/webapp/assetmaint/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/assetmaint/webapp/assetmaint/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/assetmaint/webapp/assetmaint/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-plugins/trunk/assetmaint/webapp/assetmaint/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -103,15 +103,6 @@ <url-pattern>/control/*</url-pattern> </servlet-mapping> - <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> <welcome-file>index.html</welcome-file> Modified: ofbiz/ofbiz-plugins/trunk/assetmaint/webapp/ismgr/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/assetmaint/webapp/ismgr/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/assetmaint/webapp/ismgr/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-plugins/trunk/assetmaint/webapp/ismgr/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -98,15 +98,6 @@ <url-pattern>/control/*</url-pattern> </servlet-mapping> - <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> <welcome-file>index.html</welcome-file> Modified: ofbiz/ofbiz-plugins/trunk/bi/webapp/bi/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/bi/webapp/bi/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/bi/webapp/bi/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-plugins/trunk/bi/webapp/bi/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -83,15 +83,6 @@ <url-pattern>/control/*</url-pattern> </servlet-mapping> - <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> <welcome-file>index.html</welcome-file> Modified: ofbiz/ofbiz-plugins/trunk/birt/webapp/accounting/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/birt/webapp/accounting/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/birt/webapp/accounting/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-plugins/trunk/birt/webapp/accounting/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -89,15 +89,6 @@ under the License. <url-pattern>/control/*</url-pattern> </servlet-mapping> - <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> <welcome-file>index.html</welcome-file> Modified: ofbiz/ofbiz-plugins/trunk/birt/webapp/birt/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/birt/webapp/birt/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/birt/webapp/birt/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-plugins/trunk/birt/webapp/birt/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -142,14 +142,6 @@ under the License. <url-pattern>/extract</url-pattern> </servlet-mapping> - <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/ofbiz-plugins/trunk/birt/webapp/facility/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/birt/webapp/facility/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/birt/webapp/facility/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-plugins/trunk/birt/webapp/facility/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -100,15 +100,6 @@ under the License. <url-pattern>/ShippingAPI.dll</url-pattern> </servlet-mapping> - <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> <welcome-file>index.html</welcome-file> Modified: ofbiz/ofbiz-plugins/trunk/birt/webapp/ordermgr/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/birt/webapp/ordermgr/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/birt/webapp/ordermgr/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-plugins/trunk/birt/webapp/ordermgr/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -96,15 +96,6 @@ under the License. <url-pattern>/products/*</url-pattern> </servlet-mapping> - <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> <welcome-file>index.html</welcome-file> Modified: ofbiz/ofbiz-plugins/trunk/cmssite/webapp/cmssite/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/cmssite/webapp/cmssite/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/cmssite/webapp/cmssite/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-plugins/trunk/cmssite/webapp/cmssite/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -75,13 +75,6 @@ under the License. <url-pattern>/*</url-pattern> </servlet-mapping> - <session-config> - <session-timeout>60</session-timeout> - <cookie-config> - <http-only>true</http-only> - <secure>true</secure> - </cookie-config> - </session-config> <welcome-file-list> <welcome-file>index.jsp</welcome-file> Modified: ofbiz/ofbiz-plugins/trunk/ebay/webapp/ebay/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ebay/webapp/ebay/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/ebay/webapp/ebay/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-plugins/trunk/ebay/webapp/ebay/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -86,15 +86,6 @@ under the License. <url-pattern>/control/*</url-pattern> </servlet-mapping> - <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> <welcome-file>index.html</welcome-file> Modified: ofbiz/ofbiz-plugins/trunk/ebaystore/webapp/ebaystore/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ebaystore/webapp/ebaystore/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/ebaystore/webapp/ebaystore/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-plugins/trunk/ebaystore/webapp/ebaystore/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -86,15 +86,6 @@ under the License. <url-pattern>/control/*</url-pattern> </servlet-mapping> - <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> <welcome-file>index.html</welcome-file> Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecommerce/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -149,15 +149,6 @@ under the License. <url-pattern>/products/*</url-pattern> </servlet-mapping> - <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> <welcome-file>index.jsp</welcome-file> <welcome-file>index.html</welcome-file> Modified: ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecomseo/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecomseo/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecomseo/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-plugins/trunk/ecommerce/webapp/ecomseo/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -151,15 +151,6 @@ under the License. <url-pattern>/products/*</url-pattern> </servlet-mapping> - <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> <welcome-file>index.jsp</welcome-file> <welcome-file>index.html</welcome-file> Modified: ofbiz/ofbiz-plugins/trunk/example/entitydef/entitymodel_view.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/example/entitydef/entitymodel_view.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/example/entitydef/entitymodel_view.xml (original) +++ ofbiz/ofbiz-plugins/trunk/example/entitydef/entitymodel_view.xml Wed Oct 4 07:12:57 2017 @@ -152,4 +152,11 @@ under the License. <alias entity-alias="EX" name="total" field="exampleId" function="count-distinct"/> <alias entity-alias="EX" name="exampleTypeId" group-by="true"/> </view-entity> + +<view-entity entity-name="ExampleTypeView" package-name="org.apache.ofbiz.example.example"> + <member-entity entity-alias="EX" entity-name="Example"/> + <alias entity-alias="EX" name="exampleId" field="exampleId" /> + <alias entity-alias="EX" name="exampleTypeId" group-by="true"/> + </view-entity> + </entitymodel> Modified: ofbiz/ofbiz-plugins/trunk/example/webapp/example/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/example/webapp/example/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/example/webapp/example/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-plugins/trunk/example/webapp/example/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -83,14 +83,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 --> - <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/ofbiz-plugins/trunk/exampleext/webapp/exampleext/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/exampleext/webapp/exampleext/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/exampleext/webapp/exampleext/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-plugins/trunk/exampleext/webapp/exampleext/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -78,14 +78,6 @@ under the License. </servlet> <servlet-mapping><servlet-name>ControlServlet</servlet-name><url-pattern>/control/*</url-pattern></servlet-mapping> - <session-config> - <session-timeout>60</session-timeout><!-- in minutes --> - <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/ofbiz-plugins/trunk/hhfacility/webapp/hhfacility/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/hhfacility/webapp/hhfacility/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/hhfacility/webapp/hhfacility/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-plugins/trunk/hhfacility/webapp/hhfacility/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -89,15 +89,6 @@ under the License. <url-pattern>/control/*</url-pattern> </servlet-mapping> - <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> <welcome-file>index.html</welcome-file> Modified: ofbiz/ofbiz-plugins/trunk/lucene/webapp/content/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/lucene/webapp/content/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/lucene/webapp/content/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-plugins/trunk/lucene/webapp/content/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -93,14 +93,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 --> - <cookie-config> - <http-only>true</http-only> - <secure>true</secure> - </cookie-config> - </session-config> - <welcome-file-list> <welcome-file>index.jsp</welcome-file> <welcome-file>index.html</welcome-file> Modified: ofbiz/ofbiz-plugins/trunk/myportal/webapp/myportal/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/myportal/webapp/myportal/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/myportal/webapp/myportal/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-plugins/trunk/myportal/webapp/myportal/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -83,15 +83,6 @@ <url-pattern>/control/*</url-pattern> </servlet-mapping> - <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> <welcome-file>index.html</welcome-file> Modified: ofbiz/ofbiz-plugins/trunk/pricat/webapp/pricat/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/pricat/webapp/pricat/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/pricat/webapp/pricat/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-plugins/trunk/pricat/webapp/pricat/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -83,14 +83,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 --> - <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/ofbiz-plugins/trunk/pricat/webapp/pricatdemo/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/pricat/webapp/pricatdemo/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/pricat/webapp/pricatdemo/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-plugins/trunk/pricat/webapp/pricatdemo/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -83,14 +83,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 --> - <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/ofbiz-plugins/trunk/projectmgr/webapp/projectmgr/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/projectmgr/webapp/projectmgr/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/projectmgr/webapp/projectmgr/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-plugins/trunk/projectmgr/webapp/projectmgr/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -82,14 +82,6 @@ <url-pattern>/control/*</url-pattern> </servlet-mapping> - <session-config> - <session-timeout>60</session-timeout> <!-- in minutes --> - <cookie-config> - <http-only>true</http-only> - <secure>true</secure> - </cookie-config> - </session-config> - <welcome-file-list> <welcome-file>index.jsp</welcome-file> <welcome-file>index.html</welcome-file> Modified: ofbiz/ofbiz-plugins/trunk/scrum/webapp/demotest/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/scrum/webapp/demotest/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/scrum/webapp/demotest/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-plugins/trunk/scrum/webapp/demotest/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -111,14 +111,6 @@ under the License. <url-pattern>/control/*</url-pattern> </servlet-mapping> - <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/ofbiz-plugins/trunk/scrum/webapp/scrum/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/scrum/webapp/scrum/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/scrum/webapp/scrum/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-plugins/trunk/scrum/webapp/scrum/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -86,14 +86,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 --> - <cookie-config> - <http-only>true</http-only> - <secure>true</secure> - </cookie-config> - </session-config> - <welcome-file-list> <welcome-file>index.jsp</welcome-file> <welcome-file>index.html</welcome-file> Modified: ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-plugins/trunk/solr/webapp/solr/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -182,15 +182,6 @@ <url-pattern>/schema/*</url-pattern> </servlet-mapping> - <session-config> - <session-timeout>2</session-timeout> - <cookie-config> - <http-only>true</http-only> - <secure>true</secure> - </cookie-config> - <tracking-mode>COOKIE</tracking-mode> - </session-config> - <mime-mapping> <extension>.xsl</extension> <!-- per http://www.w3.org/TR/2006/PR-xslt20-20061121/ --> Modified: ofbiz/ofbiz-plugins/trunk/webpos/webapp/webpos/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-plugins/trunk/webpos/webapp/webpos/WEB-INF/web.xml?rev=1811041&r1=1811040&r2=1811041&view=diff ============================================================================== --- ofbiz/ofbiz-plugins/trunk/webpos/webapp/webpos/WEB-INF/web.xml (original) +++ ofbiz/ofbiz-plugins/trunk/webpos/webapp/webpos/WEB-INF/web.xml Wed Oct 4 07:12:57 2017 @@ -101,13 +101,6 @@ <servlet-name>CatalogUrlServlet</servlet-name> <url-pattern>/products/*</url-pattern> </servlet-mapping> - <session-config> - <session-timeout>60</session-timeout> - <cookie-config> - <http-only>true</http-only> - <secure>true</secure> - </cookie-config> - </session-config> <welcome-file-list> <welcome-file>index.jsp</welcome-file> <welcome-file>index.html</welcome-file> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |