svn commit: r1716036 - in /ofbiz/trunk/specialpurpose/ec
Locked
svn commit: r1716036 - in /ofbiz/trunk/specialpurpose/ec
 
|
Author: jleroux
Date: Tue Nov 24 06:11:19 2015 New Revision: 1716036 URL: http://svn.apache.org/viewvc?rev=1716036&view=rev Log: Reverts r1715506, I crossed many issues, reported on dev ML and OFBIZ-6655 Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecomclone/WEB-INF/web.xml ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml ofbiz/trunk/specialpurpose/ecommerce/webapp/ecomseo/WEB-INF/web.xml Modified: ofbiz/trunk/specialpurpose/ecommerce/webapp/ecomclone/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecomclone/WEB-INF/web.xml?rev=1716036&r1=1716035&r2=1716036&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecomclone/WEB-INF/web.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecomclone/WEB-INF/web.xml Tue Nov 24 06:11:19 2015 @@ -1,4 +1,5 @@ <?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 @@ -19,45 +20,41 @@ specific language governing permissions under the License. --> -<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"> +<web-app> <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> - <display-name>CatalogUrlFilter</display-name> <filter-name>CatalogUrlFilter</filter-name> + <display-name>CatalogUrlFilter</display-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> - <display-name>ContextFilter</display-name> <filter-name>ContextFilter</filter-name> + <display-name>ContextFilter</display-name> <filter-class>org.ofbiz.webapp.control.ContextFilter</filter-class> <init-param> <param-name>disableContextSecurity</param-name> @@ -95,9 +92,9 @@ under the License. <listener><listener-class>org.ofbiz.webapp.control.LoginEventListener</listener-class></listener> <servlet> - <description>Main Control Servlet</description> - <display-name>ControlServlet</display-name> <servlet-name>ControlServlet</servlet-name> + <display-name>ControlServlet</display-name> + <description>Main Control Servlet</description> <servlet-class>org.ofbiz.webapp.control.ControlServlet</servlet-class> <load-on-startup>1</load-on-startup> </servlet> @@ -111,9 +108,9 @@ under the License. </servlet> --> <servlet> - <description>Catalog (Category/Product) URL Servlet</description> - <display-name>CatalogUrlServlet</display-name> <servlet-name>CatalogUrlServlet</servlet-name> + <display-name>CatalogUrlServlet</display-name> + <description>Catalog (Category/Product) URL Servlet</description> <servlet-class>org.ofbiz.product.category.CatalogUrlServlet</servlet-class> <load-on-startup>1</load-on-startup> </servlet> @@ -135,11 +132,6 @@ 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/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml?rev=1716036&r1=1716035&r2=1716036&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/web.xml Tue Nov 24 06:11:19 2015 @@ -1,4 +1,5 @@ <?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 @@ -19,52 +20,48 @@ specific language governing permissions under the License. --> -<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"> +<web-app> <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> - <display-name>CatalogUrlFilter</display-name> <filter-name>CatalogUrlFilter</filter-name> + <display-name>CatalogUrlFilter</display-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> - <display-name>ContentUrlFilter</display-name> <filter-name>ContentUrlFilter</filter-name> + <display-name>ContentUrlFilter</display-name> <filter-class>org.ofbiz.content.content.ContentUrlFilter</filter-class> <init-param> <param-name>defaultLocaleString</param-name> @@ -73,8 +70,8 @@ under the License. <init-param><param-name>viewRequest</param-name><param-value>ViewBlogArticle</param-value></init-param> </filter> <filter> - <display-name>ContextFilter</display-name> <filter-name>ContextFilter</filter-name> + <display-name>ContextFilter</display-name> <filter-class>org.ofbiz.webapp.control.ContextFilter</filter-class> <init-param> <param-name>disableContextSecurity</param-name> @@ -108,8 +105,8 @@ under the License. <listener><listener-class>org.ofbiz.webapp.control.LoginEventListener</listener-class></listener> <servlet> - <display-name>ControlServlet</display-name> <servlet-name>ControlServlet</servlet-name> + <display-name>ControlServlet</display-name> <description>Main Control Servlet</description> <servlet-class>org.ofbiz.webapp.control.ControlServlet</servlet-class> <load-on-startup>1</load-on-startup> @@ -124,9 +121,9 @@ under the License. </servlet> --> <servlet> - <description>Catalog (Category/Product) URL Servlet</description> - <display-name>CatalogUrlServlet</display-name> <servlet-name>CatalogUrlServlet</servlet-name> + <display-name>CatalogUrlServlet</display-name> + <description>Catalog (Category/Product) URL Servlet</description> <servlet-class>org.ofbiz.product.category.CatalogUrlServlet</servlet-class> <load-on-startup>1</load-on-startup> </servlet> @@ -148,11 +145,6 @@ 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/trunk/specialpurpose/ecommerce/webapp/ecomseo/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/specialpurpose/ecommerce/webapp/ecomseo/WEB-INF/web.xml?rev=1716036&r1=1716035&r2=1716036&view=diff ============================================================================== --- ofbiz/trunk/specialpurpose/ecommerce/webapp/ecomseo/WEB-INF/web.xml (original) +++ ofbiz/trunk/specialpurpose/ecommerce/webapp/ecomseo/WEB-INF/web.xml Tue Nov 24 06:11:19 2015 @@ -1,4 +1,5 @@ <?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 @@ -19,58 +20,54 @@ specific language governing permissions under the License. --> -<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"> +<web-app> <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> - <display-name>SeoCatalogUrlFilter</display-name> <filter> <filter-name>SeoCatalogUrlFilter</filter-name> + <display-name>SeoCatalogUrlFilter</display-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> - <display-name>SeoContentUrlFilter</display-name> <filter-name>SeoContentUrlFilter</filter-name> + <display-name>SeoContentUrlFilter</display-name> <filter-class>org.ofbiz.product.category.SeoContentUrlFilter</filter-class> <init-param> <param-name>defaultLocaleString</param-name> @@ -79,8 +76,8 @@ under the License. <init-param><param-name>viewRequest</param-name><param-value>ViewBlogArticle</param-value></init-param> </filter> <filter> - <display-name>SeoContextFilter</display-name> <filter-name>SeoContextFilter</filter-name> + <display-name>SeoContextFilter</display-name> <filter-class>org.ofbiz.product.category.SeoContextFilter</filter-class> <init-param> <param-name>disableContextSecurity</param-name> @@ -114,8 +111,8 @@ under the License. <listener><listener-class>org.ofbiz.webapp.control.LoginEventListener</listener-class></listener> <servlet> - <display-name>SeoControlServlet</display-name> <servlet-name>SeoControlServlet</servlet-name> + <display-name>SeoControlServlet</display-name> <description>Main SEO Control Servlet</description> <servlet-class>org.ofbiz.product.category.SeoControlServlet</servlet-class> <load-on-startup>1</load-on-startup> @@ -130,9 +127,9 @@ under the License. </servlet> --> <servlet> - <description>SEO Catalog (Category/Product) URL Servlet</description> - <display-name>SeoCatalogUrlServlet</display-name> <servlet-name>SeoCatalogUrlServlet</servlet-name> + <display-name>SeoCatalogUrlServlet</display-name> + <description>SEO Catalog (Category/Product) URL Servlet</description> <servlet-class>org.ofbiz.product.category.SeoCatalogUrlServlet</servlet-class> <load-on-startup>1</load-on-startup> </servlet> @@ -154,11 +151,6 @@ 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> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |