svn commit: r1781366 [3/3] - in /ofbiz/trunk: applications/content/widget/co
Locked
svn commit: r1781366 [3/3] - in /ofbiz/trunk: applications/content/widget/co
 
|
Propchange: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller - Copie.xml
------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller - Copie.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/controller - Copie.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Added: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/web - Copie.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/web%20-%20Copie.xml?rev=1781366&view=auto ============================================================================== --- ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/web - Copie.xml (added) +++ ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/web - Copie.xml Thu Feb 2 10:33:59 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/trunk/applications/product/webapp/catalog/WEB-INF/web - Copie.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/web - Copie.xml ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/applications/product/webapp/catalog/WEB-INF/web - Copie.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java?rev=1781366&r1=1781365&r2=1781366&view=diff ============================================================================== --- ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java (original) +++ ofbiz/trunk/framework/base/src/main/java/org/apache/ofbiz/base/util/template/FreeMarkerWorker.java Thu Feb 2 10:33:59 2017 @@ -36,9 +36,6 @@ import java.util.TimeZone; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; -import freemarker.cache.MultiTemplateLoader; -import freemarker.cache.StringTemplateLoader; -import freemarker.cache.TemplateLoader; import org.apache.ofbiz.base.location.FlexibleLocation; import org.apache.ofbiz.base.util.Debug; import org.apache.ofbiz.base.util.StringUtil; @@ -48,8 +45,15 @@ import org.apache.ofbiz.base.util.UtilPr import org.apache.ofbiz.base.util.UtilValidate; import org.apache.ofbiz.base.util.cache.UtilCache; +import freemarker.cache.ConditionalTemplateConfigurationFactory; +import freemarker.cache.MultiTemplateLoader; +import freemarker.cache.PathGlobMatcher; +import freemarker.cache.StringTemplateLoader; +import freemarker.cache.TemplateLoader; import freemarker.cache.URLTemplateLoader; import freemarker.core.Environment; +import freemarker.core.HTMLOutputFormat; +import freemarker.core.TemplateConfiguration; import freemarker.ext.beans.BeanModel; import freemarker.ext.beans.BeansWrapper; import freemarker.ext.beans.BeansWrapperBuilder; @@ -91,6 +95,14 @@ public final class FreeMarkerWorker { public static Configuration makeConfiguration(BeansWrapper wrapper) { Configuration newConfig = newConfiguration(); + TemplateConfiguration tcHTML = new TemplateConfiguration(); + tcHTML.setOutputFormat(HTMLOutputFormat.INSTANCE); + + newConfig.setTemplateConfigurations( + new ConditionalTemplateConfigurationFactory( + new PathGlobMatcher("*.ftl"), + tcHTML)); + newConfig.setObjectWrapper(wrapper); TemplateHashModel staticModels = wrapper.getStaticModels(); newConfig.setSharedVariable("Static", staticModels); Modified: ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityOne.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityOne.java?rev=1781366&r1=1781365&r2=1781366&view=diff ============================================================================== --- ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityOne.java (original) +++ ofbiz/trunk/framework/minilang/src/main/java/org/apache/ofbiz/minilang/method/entityops/EntityOne.java Thu Feb 2 10:33:59 2017 @@ -44,7 +44,7 @@ public final class EntityOne extends Ent super(element, simpleMethod); if (MiniLangValidate.validationOn()) { MiniLangValidate.attributeNames(simpleMethod, element, "entity-name", "use-cache", "auto-field-map", "value-field", "delegator-name"); - MiniLangValidate.requiredAttributes(simpleMethod, element, "entity-name", "value-field"); + MiniLangValidate.requiredAttributes(simpleMethod, element, "entity-name"); MiniLangValidate.expressionAttributes(simpleMethod, element, "value-field", "delegator-name"); MiniLangValidate.childElements(simpleMethod, element, "field-map", "select-field"); } Added: ofbiz/trunk/framework/webapp/config/requestHandler - Copie.properties URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/webapp/config/requestHandler%20-%20Copie.properties?rev=1781366&view=auto ============================================================================== --- ofbiz/trunk/framework/webapp/config/requestHandler - Copie.properties (added) +++ ofbiz/trunk/framework/webapp/config/requestHandler - Copie.properties Thu Feb 2 10:33:59 2017 @@ -0,0 +1,18 @@ +# -- N if you want to use external requests, see OFBIZ-5037 +throwRequestHandlerExceptionOnMissingLocalRequest=N + +# -- Default HTTP status-code, see OFBIZ-5109 +status-code=302 + +# -- Default Content-Disposition type +# attachment might be replaced by inline if you prefer to offer this option to your users. +# attachment is supposed to be more secure, but this is a bit unclear see OFBIZ-6702 for details +content-disposition-type=attachment + +# -- Should we use strict-transport-security? True by default. +# Use false if you don't have a certificate or not a signed one and it annoys you to set "none" for each HTTP request! +#strict-transport-security=false + +# -- Should we show the sessionId in log? False (ie N) by default. +show-sessionId-in-log=N + Propchange: ofbiz/trunk/framework/webapp/config/requestHandler - Copie.properties ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/framework/webapp/config/requestHandler - Copie.properties ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/framework/webapp/config/requestHandler - Copie.properties ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: ofbiz/trunk/framework/widget/dtd/widget-common.xsd URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/dtd/widget-common.xsd?rev=1781366&r1=1781365&r2=1781366&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/dtd/widget-common.xsd (original) +++ ofbiz/trunk/framework/widget/dtd/widget-common.xsd Thu Feb 2 10:33:59 2017 @@ -339,7 +339,7 @@ under the License. <xs:element minOccurs="0" maxOccurs="unbounded" ref="select-field" /> </xs:sequence> <xs:attribute name="entity-name" type="xs:string" use="required" /> - <xs:attribute name="value-field" type="xs:string" use="required" /> + <xs:attribute name="value-field" type="xs:string"/> <xs:attribute name="use-cache" default="false"> <xs:simpleType> <xs:restriction base="xs:token"> Modified: ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java?rev=1781366&r1=1781365&r2=1781366&view=diff ============================================================================== --- ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java (original) +++ ofbiz/trunk/framework/widget/src/main/java/org/apache/ofbiz/widget/renderer/macro/MacroFormRenderer.java Thu Feb 2 10:33:59 2017 @@ -185,7 +185,7 @@ public final class MacroFormRenderer imp } StringWriter sr = new StringWriter(); sr.append("<@renderLabel "); - sr.append("text=\""); + sr.append("text=r\""); sr.append(labelText); sr.append("\""); sr.append(" />"); Added: ofbiz/trunk/themes/tomahawk/template/Header - Copie.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/tomahawk/template/Header%20-%20Copie.ftl?rev=1781366&view=auto ============================================================================== --- ofbiz/trunk/themes/tomahawk/template/Header - Copie.ftl (added) +++ ofbiz/trunk/themes/tomahawk/template/Header - Copie.ftl Thu Feb 2 10:33:59 2017 @@ -0,0 +1,138 @@ +<#-- +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. +--> +<#assign externalKeyParam = "&externalLoginKey=" + requestAttributes.externalLoginKey!> + +<#if (requestAttributes.person)??><#assign person = requestAttributes.person></#if> +<#if (requestAttributes.partyGroup)??><#assign partyGroup = requestAttributes.partyGroup></#if> +<#assign docLangAttr = locale.toString()?replace("_", "-")> +<#assign langDir = "ltr"> +<#if "ar.iw"?contains(docLangAttr?substring(0, 2))> + <#assign langDir = "rtl"> +</#if> +<html lang="${docLangAttr}" dir="${langDir}" xmlns="http://www.w3.org/1999/xhtml"> +<head> + <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/> + <title>${layoutSettings.companyName}: <#if (titleProperty)?has_content>${uiLabelMap[titleProperty]}<#else>${title!}</#if></title> + <#if layoutSettings.shortcutIcon?has_content> + <#assign shortcutIcon = layoutSettings.shortcutIcon/> + <#elseif layoutSettings.VT_SHORTCUT_ICON?has_content> + <#assign shortcutIcon = layoutSettings.VT_SHORTCUT_ICON.get(0)/> + </#if> + <#if shortcutIcon?has_content> + <link rel="shortcut icon" href="<@ofbizContentUrl>${StringUtil.wrapString(shortcutIcon)}</@ofbizContentUrl>" /> + </#if> + + <#if layoutSettings.VT_HDR_JAVASCRIPT?has_content> + <#list layoutSettings.VT_HDR_JAVASCRIPT as javaScript> + <script src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="text/javascript"></script> + </#list> + </#if> + <#if layoutSettings.javaScripts?has_content> + <#--layoutSettings.javaScripts is a list of java scripts. --> + <#-- use a Set to make sure each javascript is declared only once, but iterate the list to maintain the correct order --> + <#assign javaScriptsSet = Static["org.apache.ofbiz.base.util.UtilMisc"].toSet(layoutSettings.javaScripts)/> + <#list layoutSettings.javaScripts as javaScript> + <#if javaScriptsSet.contains(javaScript)> + <#assign nothing = javaScriptsSet.remove(javaScript)/> + <script src="<@ofbizContentUrl>${StringUtil.wrapString(javaScript)}</@ofbizContentUrl>" type="text/javascript"></script> + </#if> + </#list> + </#if> +<script src="<@ofbizUrl>JavaScriptServlet</@ofbizUrl>" type="text/javascript"></script> + + <#if layoutSettings.styleSheets?has_content> + <#--layoutSettings.styleSheets is a list of style sheets. So, you can have a user-specified "main" style sheet, AND a component style sheet.--> + <#list layoutSettings.styleSheets as styleSheet> + <link rel="stylesheet" href="<@ofbizContentUrl>${StringUtil.wrapString(styleSheet)}</@ofbizContentUrl>" type="text/css"/> + </#list> + </#if> + <#if layoutSettings.VT_STYLESHEET?has_content> + <#list layoutSettings.VT_STYLESHEET as styleSheet> + <link rel="stylesheet" href="<@ofbizContentUrl>${StringUtil.wrapString(styleSheet)}</@ofbizContentUrl>" type="text/css"/> + </#list> + </#if> + <#if layoutSettings.rtlStyleSheets?has_content && langDir == "rtl"> + <#--layoutSettings.rtlStyleSheets is a list of rtl style sheets.--> + <#list layoutSettings.rtlStyleSheets as styleSheet> + <link rel="stylesheet" href="<@ofbizContentUrl>${StringUtil.wrapString(styleSheet)}</@ofbizContentUrl>" type="text/css"/> + </#list> + </#if> + <#if layoutSettings.VT_RTL_STYLESHEET?has_content && langDir == "rtl"> + <#list layoutSettings.VT_RTL_STYLESHEET as styleSheet> + <link rel="stylesheet" href="<@ofbizContentUrl>${StringUtil.wrapString(styleSheet)}</@ofbizContentUrl>" type="text/css"/> + </#list> + </#if> + <#if layoutSettings.VT_EXTRA_HEAD?has_content> + <#list layoutSettings.VT_EXTRA_HEAD as extraHead> + ${extraHead} + </#list> + </#if> + <#if layoutSettings.WEB_ANALYTICS?has_content> + <script language="JavaScript" type="text/javascript"> + <#list layoutSettings.WEB_ANALYTICS as webAnalyticsConfig> + ${StringUtil.wrapString(webAnalyticsConfig.webAnalyticsCode!)} + </#list> + </script> + </#if> +</head> +<#if layoutSettings.headerImageLinkUrl??> + <#assign logoLinkURL = "${layoutSettings.headerImageLinkUrl}"> +<#else> + <#assign logoLinkURL = "${layoutSettings.commonHeaderImageLinkUrl}"> +</#if> +<#assign organizationLogoLinkURL = "${layoutSettings.organizationLogoLinkUrl!}"> + +<body> + <div id="wait-spinner" style="display:none"> + <div id="wait-spinner-image"></div> + </div> + <div class="page-container"> + <div class="hidden"> + <a href="#column-container" title="${uiLabelMap.CommonSkipNavigation}" accesskey="2"> + ${uiLabelMap.CommonSkipNavigation} + </a> + </div> + <#if (userPreferences.COMPACT_HEADER)?default("N") == "N"> + <div id="masthead"> + <ul> + <#if layoutSettings.headerImageUrl??> + <#assign headerImageUrl = layoutSettings.headerImageUrl> + <#elseif layoutSettings.commonHeaderImageUrl??> + <#assign headerImageUrl = layoutSettings.commonHeaderImageUrl> + <#elseif layoutSettings.VT_HDR_IMAGE_URL??> + <#assign headerImageUrl = layoutSettings.VT_HDR_IMAGE_URL.get(0)> + </#if> + <#if headerImageUrl??> + <#if organizationLogoLinkURL?has_content> + <li id="org-logo-area"><a href="<@ofbizUrl>${logoLinkURL}</@ofbizUrl>"><img alt="${layoutSettings.companyName}" src="<@ofbizContentUrl>${StringUtil.wrapString(organizationLogoLinkURL)}</@ofbizContentUrl>"></a></li> + <#else> + <li id="logo-area"><a href="<@ofbizUrl>${logoLinkURL}</@ofbizUrl>" title="${layoutSettings.companyName!}"></a></li> + </#if> + </#if> + <#if layoutSettings.middleTopMessage1?has_content && layoutSettings.middleTopMessage1 != " "> + <li class="last-system-msg"> + <a href="${StringUtil.wrapString(layoutSettings.middleTopLink1!)}">${layoutSettings.middleTopMessage1!}</a><br/> + <a href="${StringUtil.wrapString(layoutSettings.middleTopLink2!)}">${layoutSettings.middleTopMessage2!}</a><br/> + <a href="${StringUtil.wrapString(layoutSettings.middleTopLink3!)}">${layoutSettings.middleTopMessage3!}</a> + </li> + </#if> + </ul> + <br class="clear" /> + </div> + </#if> Propchange: ofbiz/trunk/themes/tomahawk/template/Header - Copie.ftl ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/themes/tomahawk/template/Header - Copie.ftl ------------------------------------------------------------------------------ svn:keywords = Date Rev Author URL Id Propchange: ofbiz/trunk/themes/tomahawk/template/Header - Copie.ftl ------------------------------------------------------------------------------ svn:mime-type = text/plain |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |