svn commit: r1799242 [3/3] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/ applications/commonext/data/he
Locked
svn commit: r1799242 [3/3] - in /ofbiz/ofbiz-framework/trunk: applications/accounting/ applications/commonext/data/he
 
|
Propchange: ofbiz/ofbiz-framework/trunk/applications/product/webapp/catalog/WEB-INF/controller - Copie.xml
------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/ofbiz-framework/trunk/applications/product/webapp/catalog/WEB-INF/controller - Copie.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/ofbiz-framework/trunk/applications/product/webapp/catalog/WEB-INF/controller - Copie.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: ofbiz/ofbiz-framework/trunk/applications/product/webapp/catalog/WEB-INF/web - Copie.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/applications/product/webapp/catalog/WEB-INF/web%20-%20Copie.xml?rev=1799242&view=auto ============================================================================== --- ofbiz/ofbiz-framework/trunk/applications/product/webapp/catalog/WEB-INF/web - Copie.xml (added) +++ ofbiz/ofbiz-framework/trunk/applications/product/webapp/catalog/WEB-INF/web - Copie.xml Mon Jun 19 17:38:38 2017 @@ -0,0 +1,166 @@ +<?xml version="1.0"?> + +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> + +<web-app version="3.0"> + <display-name>Apache OFBiz - Catalog</display-name> + <description>Catalog 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> + </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>catalog</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://product/widget/catalog/CommonScreens.xml</param-value> + </context-param> + + <filter> + <display-name>ControlFilter</display-name> + <filter-name>ControlFilter</filter-name> + <filter-class>org.apache.ofbiz.webapp.control.ControlFilter</filter-class> + <init-param> + <param-name>allowedPaths</param-name> + <param-value>/error:/control:/select:/index.html:/index.jsp:/default.html:/default.jsp:/images:/imagemanagement:/products:/JavaScriptServlet</param-value> + </init-param> + <init-param> + <param-name>redirectPath</param-name> + <param-value>/control/main</param-value> + </init-param> + </filter> + <filter> + <display-name>ContextFilter</display-name> + <filter-name>ContextFilter</filter-name> + <filter-class>org.apache.ofbiz.webapp.control.ContextFilter</filter-class> + </filter> + <filter> + <filter-name>CSRFGuard</filter-name> + <filter-class>org.owasp.csrfguard.CsrfGuardFilter</filter-class> + </filter> + <filter-mapping> + <filter-name>ControlFilter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + <filter-mapping> + <filter-name>ContextFilter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + <filter-mapping> + <filter-name>CSRFGuard</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <listener><listener-class>org.apache.ofbiz.webapp.control.ControlEventListener</listener-class></listener> + <listener><listener-class>org.apache.ofbiz.webapp.control.LoginEventListener</listener-class></listener> + <!-- NOTE: not all app servers support mounting implementations of the HttpSessionActivationListener interface --> + <!-- <listener><listener-class>org.apache.ofbiz.webapp.control.ControlActivationEventListener</listener-class></listener> --> + + + <listener><listener-class>org.owasp.csrfguard.CsrfGuardServletContextListener</listener-class></listener> + <listener><listener-class>org.owasp.csrfguard.CsrfGuardHttpSessionListener</listener-class></listener> + <context-param> + <param-name>Owasp.CsrfGuard.Config</param-name> + <param-value>WEB-INF/Owasp.CsrfGuard.properties</param-value> + </context-param> + <context-param> + <param-name>Owasp.CsrfGuard.Config.Print</param-name> + <param-value>true</param-value> + </context-param> + + + + <servlet> + <description>Main Control Servlet</description> + <display-name>ControlServlet</display-name> + <servlet-name>ControlServlet</servlet-name> + <servlet-class>org.apache.ofbiz.webapp.control.ControlServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + + <servlet> + <description>Image URL Servlet</description> + <display-name>ImageUrlServlet</display-name> + <servlet-name>ImageUrlServlet</servlet-name> + <servlet-class>org.apache.ofbiz.product.imagemanagement.ImageUrlServlet</servlet-class> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet> + <servlet-name>JavaScriptServlet</servlet-name> + <servlet-class>org.owasp.csrfguard.servlet.JavaScriptServlet</servlet-class> + <load-on-startup>1</load-on-startup> + <init-param> + <param-name>source-file</param-name> + <param-value>WEB-INF/Owasp.CsrfGuard.js</param-value> + </init-param> + <init-param> + <param-name>inject-into-forms</param-name> + <param-value>true</param-value> + </init-param> + <init-param> + <param-name>inject-into-attributes</param-name> + <param-value>true</param-value> + </init-param> + <init-param> + <param-name>domain-strict</param-name> + <param-value>false</param-value> + </init-param> + <init-param> + <param-name>referer-pattern</param-name> + <param-value>.*localhost.*</param-value> + </init-param> + </servlet> + + <servlet-mapping> + <servlet-name>JavaScriptServlet</servlet-name> + <url-pattern>/JavaScriptServlet</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>ControlServlet</servlet-name> + <url-pattern>/control/*</url-pattern> + </servlet-mapping> + + <servlet-mapping> + <servlet-name>ImageUrlServlet</servlet-name> + <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> + <welcome-file>index.htm</welcome-file> + </welcome-file-list> +</web-app> Propchange: ofbiz/ofbiz-framework/trunk/applications/product/webapp/catalog/WEB-INF/web - Copie.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/ofbiz-framework/trunk/applications/product/webapp/catalog/WEB-INF/web - Copie.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/ofbiz-framework/trunk/applications/product/webapp/catalog/WEB-INF/web - Copie.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: ofbiz/ofbiz-framework/trunk/framework/images/webapp/images/commons-safe-head.ftl URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/images/webapp/images/commons-safe-head.ftl?rev=1799242&view=auto ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/images/webapp/images/commons-safe-head.ftl (added) +++ ofbiz/ofbiz-framework/trunk/framework/images/webapp/images/commons-safe-head.ftl Mon Jun 19 17:38:38 2017 @@ -0,0 +1,15 @@ +<#-- Refer to https://cyh.herokuapp.com/cyh for details, you might also have a look at https://cwiki.apache.org/confluence/display/OFBIZ/How+to+Secure+HTTP+Headers --> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" /> + <meta http-equiv="pragma" content="no-cache" /> + <meta http-equiv="cache-control" content="no-cache, no-store, must-revalidate" /> + <meta http-equiv="expires" content="-1" /> + + <title>${layoutSettings.companyName}: <#if (titleProperty)?has_content>${uiLabelMap[titleProperty]}<#else>${title!}#if></title> + + <meta name="robots" content="index, follow" /> + <meta name="googlebot" content="index,follow" /> + <meta name="description" content="" /> + <meta name="keywords" content="" /> + <meta name="copyright" content="" /> + <meta name="author" content="" /> Propchange: ofbiz/ofbiz-framework/trunk/framework/images/webapp/images/commons-safe-head.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/ofbiz-framework/trunk/framework/images/webapp/images/commons-safe-head.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/ofbiz-framework/trunk/framework/images/webapp/images/commons-safe-head.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/ofbiz-framework/trunk/framework/service/documents/ServiceEngine.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/service/documents/ServiceEngine.xml?rev=1799242&r1=1799241&r2=1799242&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/service/documents/ServiceEngine.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/service/documents/ServiceEngine.xml Mon Jun 19 17:38:38 2017 @@ -23,6 +23,6 @@ xmlns="http://docbook.org/ns/docbook"> <title>The Service Engine</title> <para> - A description of the service engine can be found at the <link xl:href="http://cwiki.apache.org/confluence/display/OFBTECH/Service+Engine+Guide">OFBiz documentation site</link> + A description of the service engine can be found at the <link xl:href="https://cwiki.apache.org/confluence/display/OFBIZ/Service+Engine+Guide">OFBiz documentation site</link> </para> </section> Modified: ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java?rev=1799242&r1=1799241&r2=1799242&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java (original) +++ ofbiz/ofbiz-framework/trunk/framework/webapp/src/main/java/org/apache/ofbiz/webapp/event/ServiceEventHandler.java Mon Jun 19 17:38:38 2017 @@ -407,7 +407,7 @@ public class ServiceEventHandler impleme + "(a form field) instead of the request URL." + " Moreover it would be kind if you could create a Jira sub-task of https://issues.apache.org/jira/browse/OFBIZ-2330 " + "(check before if a sub-task for this error does not exist)." - + " If you are not sure how to create a Jira issue please have a look before at http://cwiki.apache.org/confluence/x/JIB2" + + " If you are not sure how to create a Jira issue please have a look before at https://cwiki.apache.org/confluence/display/OFBIZ/OFBiz+Contributors+Best+Practices" + " Thank you in advance for your help."; Debug.logError("=============== " + errMsg + "; In session [" + ControlActivationEventListener.showSessionId(session) + "]; Note that this can be changed using the service.http.parameters.require.encrypted property in the url.properties file", module); Modified: ofbiz/ofbiz-framework/trunk/framework/webtools/widget/MiscScreens.xml URL: http://svn.apache.org/viewvc/ofbiz/ofbiz-framework/trunk/framework/webtools/widget/MiscScreens.xml?rev=1799242&r1=1799241&r2=1799242&view=diff ============================================================================== --- ofbiz/ofbiz-framework/trunk/framework/webtools/widget/MiscScreens.xml (original) +++ ofbiz/ofbiz-framework/trunk/framework/webtools/widget/MiscScreens.xml Mon Jun 19 17:38:38 2017 @@ -44,9 +44,9 @@ under the License. <screen name="WebtoolsLayoutDemo"> <!-- Demonstrates UI layout best practices and serves as a visual theme test jig. For more information: - https://cwiki.apache.org/OFBADMIN/user-interface-layout-best-practices.html - https://cwiki.apache.org/OFBADMIN/html-and-css-best-practices.html - https://cwiki.apache.org/apache/ofbiz/ofbiz-maincsscss-html-element-collection-styles.html + https://cwiki.apache.org/confluence/display/OFBIZ/User+Interface+Layout+Best+Practices + https://cwiki.apache.org/confluence/display/OFBIZ/HTML+and+CSS+Best+Practices + https://cwiki.apache.org/confluence/display/OFBIZ/OFBiz+maincss.css+HTML+Element+Collection+Styles?src=search --> <section> <actions> |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |