You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by jl...@apache.org on 2013/01/05 14:40:21 UTC
svn commit: r1429284 [3/3] - in /ofbiz/branches/webhelp-2012-12-07: ./
applications/accounting/config/ applications/accounting/data/
applications/content/servicedef/
applications/order/script/org/ofbiz/order/order/
applications/order/servicedef/ applic...
Modified: ofbiz/branches/webhelp-2012-12-07/framework/security/config/security.properties
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/security/config/security.properties?rev=1429284&r1=1429283&r2=1429284&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/framework/security/config/security.properties (original)
+++ ofbiz/branches/webhelp-2012-12-07/framework/security/config/security.properties Sat Jan 5 13:40:19 2013
@@ -26,6 +26,33 @@ security.context=default
# -- define the password restrictions --
password.length.min=5
+### -- pattern based password OFBIZ-4958
+security.login.password.pattern.enable=true
+security.login.password.pattern=^.*(?=.{5,}).*$
+# This is a mix to handle the localisation of the OOTB pattern which is only a fixed length
+security.login.password.pattern.description=loginservices.password_must_be_least_characters_long
+# -- For More restrictive pattern you can use the following, no localisation-
+#security.login.password.pattern=^.*(?=.{5,})(?=.*[a-zA-Z])(?=.*[!@#$%^&*]).*$
+#security.login.password.pattern.description=Your password must be 5 characters long, Only contains alphanumeric(number optional) and at least one from following special characters: !@#$%^&*.
+# Only contains alphanumeric and the following special characters: !@#$%^&*
+# Contains at least 1 of the special characters in the list above
+# The required special character can appear anywhere in the string (for example: !abc, a!bc, abc!)
+# minimum length 5 digit.
+# HELP
+# Start of group
+# (
+# (?=.*\d) # must contains one digit from 0-9
+# (?=.*[a-z]) # must contains one lowercase characters
+# (?=.*[A-Z]) # must contains one uppercase characters
+# (?=.*[!@#$%^&*]) # must contains one special symbols in the list "!@#$%^&*"
+# . # match anything with previous condition checking
+# {5,20} # length at least 5 characters and maximum of 20
+# {5,} # minimum length 5 chars and no linitation to max length.
+# )
+# End of group
+# For further password patterns look at
+# http://docs.oracle.com/javase/1.4.2/docs/api/java/util/regex/Pattern.html#sum
+
# -- disable the account after this many logins --
max.failed.logins=3
Modified: ofbiz/branches/webhelp-2012-12-07/framework/service/dtd/services.xsd
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/service/dtd/services.xsd?rev=1429284&r1=1429283&r2=1429284&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/framework/service/dtd/services.xsd (original)
+++ ofbiz/branches/webhelp-2012-12-07/framework/service/dtd/services.xsd Sat Jan 5 13:40:19 2013
@@ -266,7 +266,7 @@ under the License.
<xs:documentation>
Calculate and maintain an average response time for this service. Service metrics can be used
for monitoring and reporting.
- <br/><br/>
+
The metric works by gathering statistics until a configurable maximum is reached (number of
requests or elapsed time), then the average is calculated. A smoothing factor is used to
smooth differences between calculations.
Modified: ofbiz/branches/webhelp-2012-12-07/framework/webapp/dtd/site-conf.xsd
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/webapp/dtd/site-conf.xsd?rev=1429284&r1=1429283&r2=1429284&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/framework/webapp/dtd/site-conf.xsd (original)
+++ ofbiz/branches/webhelp-2012-12-07/framework/webapp/dtd/site-conf.xsd Sat Jan 5 13:40:19 2013
@@ -343,7 +343,7 @@ under the License.
Calculate and maintain an average response time for this request. Request metrics can be used
for monitoring and reporting. Metrics can also be used to trigger an alternate
response if the optional threshold attribute is used.
- <br/><br/>
+
The metric works by gathering statistics until a configurable maximum is reached (number of
requests or elapsed time), then the average is calculated. A smoothing factor is used to
smooth differences between calculations.
Modified: ofbiz/branches/webhelp-2012-12-07/framework/webtools/widget/ServiceForms.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/webtools/widget/ServiceForms.xml?rev=1429284&r1=1429283&r2=1429284&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/framework/webtools/widget/ServiceForms.xml (original)
+++ ofbiz/branches/webhelp-2012-12-07/framework/webtools/widget/ServiceForms.xml Sat Jan 5 13:40:19 2013
@@ -57,7 +57,7 @@ under the License.
<form name="FindJobs" type="single" target="FindJob" default-entity-name="JobSandbox">
<field name="noConditionFind" position="1"><hidden value="Y"/><!-- if this isn't there then with all fields empty no query will be done --></field>
<field name="jobName" title="${uiLabelMap.WebtoolsJob}" position="1"><text-find/></field>
- <field name="clock" position="2" title=" "><display description="" default-value="ok"/></field>
+ <field name="clock" position="2" title="${uiLabelMap.CommonServerHour}:"><display/></field>
<field name="jobId" title="${uiLabelMap.CommonId}" position="1"><text-find/></field>
<field name="serviceName" title="${uiLabelMap.WebtoolsServiceName}"><text-find/></field>
<field name="statusId" title="${uiLabelMap.CommonStatus}" position="1">
Modified: ofbiz/branches/webhelp-2012-12-07/framework/webtools/widget/ServiceScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/webtools/widget/ServiceScreens.xml?rev=1429284&r1=1429283&r2=1429284&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/framework/webtools/widget/ServiceScreens.xml (original)
+++ ofbiz/branches/webhelp-2012-12-07/framework/webtools/widget/ServiceScreens.xml Sat Jan 5 13:40:19 2013
@@ -49,12 +49,15 @@ under the License.
<set field="tabButtonItem" value="findJob"/>
<set field="jobCtx" from-field="parameters"/>
<set field="dummy" value="${groovy: if ('SERVICE_PENDING'.equals(jobCtx.statusId)) jobCtx.jobId = ''}"/> <!-- To more easily see current pending jobs and possibly cancel some others -->
+ <!-- fields for ServerHour24HourFormatJs.ftl -->
+ <set field="clockField" value="FindJobs_clock_title"/>
</actions>
<widgets>
<decorator-screen name="CommonServiceDecorator" location="${parameters.mainDecoratorLocation}">
<decorator-section name="body">
<section>
<widgets>
+ <platform-specific><html><html-template location="component://common/webcommon/includes/ServerHour24HourFormatJs.ftl"/></html></platform-specific>
<decorator-screen name="FindScreenDecorator" location="component://common/widget/CommonScreens.xml">
<decorator-section name="search-options">
<include-form name="FindJobs" location="component://webtools/widget/ServiceForms.xml"/>
Modified: ofbiz/branches/webhelp-2012-12-07/framework/widget/src/org/ofbiz/widget/WidgetWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/widget/src/org/ofbiz/widget/WidgetWorker.java?rev=1429284&r1=1429283&r2=1429284&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/framework/widget/src/org/ofbiz/widget/WidgetWorker.java (original)
+++ ofbiz/branches/webhelp-2012-12-07/framework/widget/src/org/ofbiz/widget/WidgetWorker.java Sat Jan 5 13:40:19 2013
@@ -289,7 +289,7 @@ public class WidgetWorker {
writer.append(key);
writer.append("\" value=\"");
- String valueFromContext = context.containsKey(key) ?
+ String valueFromContext = context.containsKey(key) && context.get(key)!= null ?
context.get(key).toString() : parameter.getValue();
writer.append(valueFromContext);
writer.append("\" type=\"hidden\"/>");
Modified: ofbiz/branches/webhelp-2012-12-07/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java?rev=1429284&r1=1429283&r2=1429284&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java (original)
+++ ofbiz/branches/webhelp-2012-12-07/framework/widget/src/org/ofbiz/widget/form/MacroFormRenderer.java Sat Jan 5 13:40:19 2013
@@ -358,7 +358,7 @@ public class MacroFormRenderer implement
List<ModelForm.UpdateArea> updateAreas = modelFormField.getOnChangeUpdateAreas();
boolean ajaxEnabled = updateAreas != null && this.javaScriptEnabled;
- if (!textField.getClientAutocompleteField() || ajaxEnabled) {
+ if (textField.getClientAutocompleteField() || ajaxEnabled) {
clientAutocomplete = "true";
}
Modified: ofbiz/branches/webhelp-2012-12-07/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java?rev=1429284&r1=1429283&r2=1429284&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java (original)
+++ ofbiz/branches/webhelp-2012-12-07/framework/widget/src/org/ofbiz/widget/html/HtmlMenuRenderer.java Sat Jan 5 13:40:19 2013
@@ -455,10 +455,12 @@ public class HtmlMenuRenderer extends Ht
writer.append(name);
writer.append("\"");
}
- if (UtilValidate.isNotEmpty(targetWindow)) {
- writer.append(" target=\"");
- writer.append(targetWindow);
- writer.append("\"");
+ if (!"hidden-form".equals(linkType)) {
+ if (UtilValidate.isNotEmpty(targetWindow)) {
+ writer.append(" target=\"");
+ writer.append(targetWindow);
+ writer.append("\"");
+ }
}
writer.append(" href=\"");
Modified: ofbiz/branches/webhelp-2012-12-07/specialpurpose/ebay/data/DemoEbayData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/specialpurpose/ebay/data/DemoEbayData.xml?rev=1429284&r1=1429283&r2=1429284&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/specialpurpose/ebay/data/DemoEbayData.xml (original)
+++ ofbiz/branches/webhelp-2012-12-07/specialpurpose/ebay/data/DemoEbayData.xml Sat Jan 5 13:40:19 2013
@@ -26,6 +26,30 @@ under the License.
<customXml><![CDATA[<custom-xml><Currency>USD</Currency><UseTaxTable>false</UseTaxTable><DispatchTimeMax>3</DispatchTimeMax><ReturnPolicy><ReturnsAcceptedOption>ReturnsNotAccepted</ReturnsAcceptedOption></ReturnPolicy><ShippingDetails><ShippingType>Flat</ShippingType><ShippingServiceOptions><ShippingService>UPS2ndDay</ShippingService><ShippingServicePriority>1</ShippingServicePriority><ShippingServiceCost>5</ShippingServiceCost><ShippingServiceAdditionalCost>2</ShippingServiceAdditionalCost><ShippingSurcharge>1</ShippingSurcharge></ShippingServiceOptions></ShippingDetails></custom-xml>]]></customXml>
</EbayConfig>
+ <!--Catalog specific to eBay-->
+ <ProdCatalog prodCatalogId="eBayCatalog" catalogName="eBay Catalog" useQuickAdd="Y"/>
+ <ProductStoreCatalog productStoreId="9000" prodCatalogId="eBayCatalog" fromDate="2009-11-05 12:00:00.0" sequenceNum="4"/>
+
+ <!-- Category specific to eBay -->
+ <ProductCategory categoryName="15064" productCategoryId="eBay_Category" productCategoryTypeId="EBAY_CATEGORY"/>
+ <ProdCatalogCategory prodCatalogId="eBayCatalog" productCategoryId="eBay_Category" fromDate="2009-11-05 12:00:00.0" sequenceNum="1" prodCatalogCategoryTypeId="PCCT_EBAY_ROOT"/>
+
+ <ProductCategory productCategoryId="eBay_ECom_Category" categoryName="15064" productCategoryTypeId="EBAY_CATEGORY"/>
+
+ <ProductCategoryRollup parentProductCategoryId="eBay_Category" productCategoryId="eBay_ECom_Category" fromDate="2009-11-05 12:00:00.0"/>
+
+ <!-- ProductCategoryMember record specific to eBay -->
+ <ProductCategoryMember productCategoryId="eBay_ECom_Category" productId="GZ-1000" fromDate="2009-11-05 12:15:00.0"/>
+ <ProductCategoryMember productCategoryId="eBay_ECom_Category" productId="GZ-1001" fromDate="2009-11-05 12:15:00.0"/>
+ <ProductCategoryMember productCategoryId="eBay_ECom_Category" productId="GZ-2644" fromDate="2009-11-05 12:15:00.0"/>
+
+ <!-- ProductPrice specific to eBay -->
+ <ProductPrice productId="GZ-1000" productPricePurposeId="EBAY" productPriceTypeId="MINIMUM_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2001-05-13 12:00:00.0" price="15.0" createdDate="2001-05-13 12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0" lastModifiedByUserLogin="admin"/>
+ <ProductPrice productId="GZ-1000" productPricePurposeId="EBAY" productPriceTypeId="MAXIMUM_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2001-05-13 12:00:00.0" price="18.0" createdDate="2001-05-13 12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0" lastModifiedByUserLogin="admin"/>
+ <ProductPrice productId="GZ-1001" productPricePurposeId="EBAY" productPriceTypeId="MINIMUM_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2001-05-13 12:00:00.0" price="25.99" createdDate="2001-05-13 12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0" lastModifiedByUserLogin="admin"/>
+ <ProductPrice productId="GZ-2644" productPricePurposeId="EBAY" productPriceTypeId="MINIMUM_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2001-05-13 12:00:00.0" price="48.0" createdDate="2001-05-13 12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0" lastModifiedByUserLogin="admin"/>
+ <ProductPrice productId="GZ-2644" productPricePurposeId="EBAY" productPriceTypeId="MAXIMUM_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2001-05-13 12:00:00.0" price="55.0" createdDate="2001-05-13 12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0" lastModifiedByUserLogin="admin"/>
+
<EbayShippingMethod methodTypeEnumId="EBAY_FLAT_RATE" shipmentMethodName="USPSPriority" productStoreId="9000" amount="20.00" carrierPartyId="USPS" shipmentMethodTypeId="STANDARD"/>
<EbayShippingMethod methodTypeEnumId="EBAY_FLAT_RATE" shipmentMethodName="UPSGround" productStoreId="9000" amount="10.00" carrierPartyId="UPS" shipmentMethodTypeId="GROUND"/>
<EbayShippingMethod methodTypeEnumId="EBAY_FLAT_RATE" shipmentMethodName="UPS3rdDay" productStoreId="9000" amount="0.00" carrierPartyId="UPS" shipmentMethodTypeId="THIRD_DAY"/>
Modified: ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/data/DemoProduct.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/data/DemoProduct.xml?rev=1429284&r1=1429283&r2=1429284&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/data/DemoProduct.xml (original)
+++ ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/data/DemoProduct.xml Sat Jan 5 13:40:19 2013
@@ -335,16 +335,6 @@ under the License.
<ProductCategory categoryName="Toys & Games"
primaryParentCategoryId="GOOGLE_BASE" productCategoryId="GB_TYS_GMS" productCategoryTypeId="GOOGLE_BASE_CATEGORY"/>
- <!--Catalog specific to eBay-->
- <ProdCatalog prodCatalogId="eBayCatalog" catalogName="eBay Catalog" useQuickAdd="Y"/>
- <ProductStoreCatalog productStoreId="9000" prodCatalogId="eBayCatalog" fromDate="2009-11-05 12:00:00.0" sequenceNum="4"/>
-
- <!-- Category specific to eBay -->
- <ProductCategory categoryName="15064" productCategoryId="eBay_Category" productCategoryTypeId="EBAY_CATEGORY"/>
- <ProdCatalogCategory prodCatalogId="eBayCatalog" productCategoryId="eBay_Category" fromDate="2009-11-05 12:00:00.0" sequenceNum="1" prodCatalogCategoryTypeId="PCCT_EBAY_ROOT"/>
-
- <ProductCategory productCategoryId="eBay_ECom_Category" categoryName="15064" productCategoryTypeId="EBAY_CATEGORY"/>
-
<ProdCatalogCategory prodCatalogId="GoogleCatalog" productCategoryId="GOOGLE_BASE" fromDate="2001-05-13 12:00:00.0"
sequenceNum="1" prodCatalogCategoryTypeId="PCCT_BROWSE_ROOT"/>
@@ -618,13 +608,6 @@ under the License.
<ProductPrice productId="WG-9944" productPricePurposeId="PURCHASE" productPriceTypeId="LIST_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2001-05-13 12:00:00.0" price="594.0" createdDate="2001-05-13 12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0" lastModifiedByUserLogin="admin"/>
<ProductPrice productId="WG-9944" productPricePurposeId="PURCHASE" productPriceTypeId="AVERAGE_COST" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2001-05-13 12:00:00.0" price="320.0" createdDate="2001-05-13 12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0" lastModifiedByUserLogin="admin"/>
- <!-- ProductPrice specific to eBay -->
- <ProductPrice productId="GZ-1000" productPricePurposeId="EBAY" productPriceTypeId="MINIMUM_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2001-05-13 12:00:00.0" price="15.0" createdDate="2001-05-13 12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0" lastModifiedByUserLogin="admin"/>
- <ProductPrice productId="GZ-1000" productPricePurposeId="EBAY" productPriceTypeId="MAXIMUM_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2001-05-13 12:00:00.0" price="18.0" createdDate="2001-05-13 12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0" lastModifiedByUserLogin="admin"/>
- <ProductPrice productId="GZ-1001" productPricePurposeId="EBAY" productPriceTypeId="MINIMUM_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2001-05-13 12:00:00.0" price="25.99" createdDate="2001-05-13 12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0" lastModifiedByUserLogin="admin"/>
- <ProductPrice productId="GZ-2644" productPricePurposeId="EBAY" productPriceTypeId="MINIMUM_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2001-05-13 12:00:00.0" price="48.0" createdDate="2001-05-13 12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0" lastModifiedByUserLogin="admin"/>
- <ProductPrice productId="GZ-2644" productPricePurposeId="EBAY" productPriceTypeId="MAXIMUM_PRICE" currencyUomId="USD" productStoreGroupId="_NA_" fromDate="2001-05-13 12:00:00.0" price="55.0" createdDate="2001-05-13 12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0" lastModifiedByUserLogin="admin"/>
-
<!-- test Subscription product, a Gizmo Newsletter -->
<Product productId="GZ-NEWS-1MO" productTypeId="DIGITAL_GOOD" primaryProductCategoryId="101" productName="Gizmo Newsletter 1 Month" internalName="Gizmo Newsletter 1 Month Subscription" description="A 1 month subscription to the Gizmo Newsletter: can be used immediately after purchase." longDescription="This newsletter will give you regular updates on the wonderful world of Gizmos!" taxable="Y" chargeShipping="N" autoCreateKeywords="Y" isVirtual="N" isVariant="N" createdDate="2001-05-13 12:00:00.0" createdByUserLogin="admin" lastModifiedDate="2001-05-13 12:00:00.0" lastModifiedByUserLogin="admin"/>
<SubscriptionResource subscriptionResourceId="GZ-NEWS" description="Gizmo Newsletter"/>
@@ -1049,12 +1032,7 @@ under the License.
<ProductCategoryRollup fromDate="2001-05-13 12:00:00.0" parentProductCategoryId="GOOGLE_BASE" productCategoryId="GB_SOFTWARE"/>
<ProductCategoryRollup fromDate="2001-05-13 12:00:00.0" parentProductCategoryId="GOOGLE_BASE" productCategoryId="GB_SPRTNG_GDS"/>
<ProductCategoryRollup fromDate="2001-05-13 12:00:00.0" parentProductCategoryId="GOOGLE_BASE" productCategoryId="GB_TYS_GMS"/>
-
- <!-- ProductCategoryMember record specific to eBay -->
- <ProductCategoryMember productCategoryId="eBay_ECom_Category" productId="GZ-1000" fromDate="2009-11-05 12:15:00.0"/>
- <ProductCategoryMember productCategoryId="eBay_ECom_Category" productId="GZ-1001" fromDate="2009-11-05 12:15:00.0"/>
- <ProductCategoryMember productCategoryId="eBay_ECom_Category" productId="GZ-2644" fromDate="2009-11-05 12:15:00.0"/>
-
+
<ProductCategoryRollup fromDate="2001-05-13 12:00:00.0" parentProductCategoryId="CATALOG1" productCategoryId="100"/>
<ProductCategoryRollup fromDate="2001-05-13 12:00:00.0" parentProductCategoryId="100" productCategoryId="101"/>
<ProductCategoryRollup fromDate="2001-05-13 12:00:00.0" parentProductCategoryId="100" productCategoryId="102"/>
@@ -1065,9 +1043,6 @@ under the License.
<ProductCategoryRollup fromDate="2001-05-13 12:00:00.0" parentProductCategoryId="201" productCategoryId="2012"/>
<ProductCategoryRollup fromDate="2001-05-13 12:00:00.0" parentProductCategoryId="2011" productCategoryId="20111"/>
- <!-- ProductCategoryRollup record specific to eBay -->
- <ProductCategoryRollup parentProductCategoryId="eBay_Category" productCategoryId="eBay_ECom_Category" fromDate="2009-11-05 12:00:00.0"/>
-
<!-- some default product facility settings -->
<ProductFacility productId="GZ-2644" facilityId="WebStoreWarehouse" minimumStock="2" reorderQuantity="10" daysToShip="15"/>
<ProductFacility productId="GZ-8544" facilityId="WebStoreWarehouse" minimumStock="20" reorderQuantity="50" daysToShip="1"/>
Modified: ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml?rev=1429284&r1=1429283&r2=1429284&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml (original)
+++ ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml Sat Jan 5 13:40:19 2013
@@ -803,7 +803,7 @@ under the License.
<string value="SHIPPING_LOCATION"/>
<field field="addressContext.contactMechId"/>
</call-object-method>
- <call-object-method obj-field="cart" method-name="setShippingContactMechId">
+ <call-object-method obj-field="cart" method-name="setAllShippingContactMechId">
<field field="addressContext.contactMechId"/>
</call-object-method>
</if-not-empty>
@@ -820,25 +820,25 @@ under the License.
<session-to-field field="cart" session-name="shoppingCart"/>
<if-not-empty field="cart">
<set field="shipmentMethodTypeId" from-field="parameters.shipmentMethodTypeId"/>
- <call-object-method obj-field="cart" method-name="setShipmentMethodTypeId">
+ <call-object-method obj-field="cart" method-name="setAllShipmentMethodTypeId">
<field field="shipmentMethodTypeId"/>
</call-object-method>
<set field="carrierPartyId" from-field="parameters.carrierPartyId"/>
- <call-object-method obj-field="cart" method-name="setCarrierPartyId">
+ <call-object-method obj-field="cart" method-name="setAllCarrierPartyId">
<field field="carrierPartyId"/>
</call-object-method>
<set field="maySplit" from-field="parameters.may_split" type="Boolean"/>
<if-not-empty field="maySplit">
- <call-object-method obj-field="cart" method-name="setMaySplit">
+ <call-object-method obj-field="cart" method-name="setAllMaySplit">
<field field="maySplit" type="Boolean"/>
</call-object-method>
</if-not-empty>
<set field="shippingInstruction" from-field="parameters.shipping_instructions" type="String"/>
<if-not-empty field="shippingInstruction">
- <call-object-method obj-field="cart" method-name="setShippingInstructions">
+ <call-object-method obj-field="cart" method-name="setAllShippingInstructions">
<field field="shippingInstruction" type="String"/>
</call-object-method>
</if-not-empty>
@@ -852,14 +852,14 @@ under the License.
<set field="isGift" from-field="parameters.is_gift" type="Boolean"/>
<if-not-empty field="isGift">
- <call-object-method obj-field="cart" method-name="setIsGift">
+ <call-object-method obj-field="cart" method-name="setAllIsGift">
<field field="isGift" type="Boolean"/>
</call-object-method>
</if-not-empty>
<set field="giftMessage" from-field="parameters.gift_message" type="String"/>
<if-not-empty field="giftMessage">
- <call-object-method obj-field="cart" method-name="setGiftMessage">
+ <call-object-method obj-field="cart" method-name="setAllGiftMessage">
<field field="giftMessage" type="String"/>
</call-object-method>
</if-not-empty>
@@ -1055,13 +1055,13 @@ under the License.
<if-empty field="shoppingCart">
<session-to-field field="shoppingCart"/>
</if-empty>
- <call-object-method obj-field="shoppingCart" method-name="setShipmentMethodTypeId">
+ <call-object-method obj-field="shoppingCart" method-name="setAllShipmentMethodTypeId">
<field field="shipmentMethodTypeId"/>
</call-object-method>
- <call-object-method obj-field="shoppingCart" method-name="setCarrierPartyId">
+ <call-object-method obj-field="shoppingCart" method-name="setAllCarrierPartyId">
<field field="carrierPartyId"/>
</call-object-method>
- <call-object-method obj-field="shoppingCart" method-name="setProductStoreShipMethId">
+ <call-object-method obj-field="shoppingCart" method-name="setAllProductStoreShipMethId">
<field field="productStoreShipMethId"/>
</call-object-method>
<call-object-method obj-field="shoppingCart" method-name="getCurrency" ret-field="isoCode"/>
@@ -1314,4 +1314,9 @@ under the License.
<default-message property="CommonGenericServiceSuccessMessage" resource="CommonUiLabels"></default-message>
</call-service>
</simple-method>
+ <simple-method method-name="fromSetSessionLocale"
+ short-description="Add field to request for redirection after SetSessionLocale" login-required="false">
+ <set field="fromSetSessionLocale" value="true"/>
+ <field-to-request field="fromSetSessionLocale" request-name="fromSetSessionLocale"/>
+ </simple-method>
</simple-methods>
Modified: ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml?rev=1429284&r1=1429283&r2=1429284&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml (original)
+++ ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/customer/QuickAnonCustomerEvents.xml Sat Jan 5 13:40:19 2013
@@ -547,7 +547,7 @@ under the License.
<string value="SHIPPING_LOCATION"/>
<field field="parameters.shippingContactMechId"/>
</call-object-method>
- <call-object-method obj-field="cart" method-name="setShippingContactMechId">
+ <call-object-method obj-field="cart" method-name="setAllShippingContactMechId">
<field field="parameters.shippingContactMechId"/>
</call-object-method>
</if-not-empty>
@@ -577,23 +577,23 @@ under the License.
<session-to-field field="cart" session-name="shoppingCart"/>
<if-not-empty field="cart">
<set field="shipmentMethodTypeId" from-field="parameters.shipmentMethodTypeId"/>
- <call-object-method obj-field="cart" method-name="setShipmentMethodTypeId">
+ <call-object-method obj-field="cart" method-name="setAllShipmentMethodTypeId">
<field field="shipmentMethodTypeId"/>
</call-object-method>
<set field="carrierPartyId" from-field="parameters.carrierPartyId"/>
- <call-object-method obj-field="cart" method-name="setCarrierPartyId">
+ <call-object-method obj-field="cart" method-name="setAllCarrierPartyId">
<field field="carrierPartyId"/>
</call-object-method>
<set field="maySplit" from-field="parameters.may_split" type="Boolean" default-value="false"/>
- <call-object-method obj-field="cart" method-name="setMaySplit">
+ <call-object-method obj-field="cart" method-name="setAllMaySplit">
<field field="maySplit" type="Boolean"/>
</call-object-method>
<set field="shippingInstruction" from-field="parameters.shipping_instructions" type="String"/>
<if-not-empty field="shippingInstruction">
- <call-object-method obj-field="cart" method-name="setShippingInstructions">
+ <call-object-method obj-field="cart" method-name="setAllShippingInstructions">
<field field="shippingInstruction" type="String"/>
</call-object-method>
</if-not-empty>
@@ -606,13 +606,13 @@ under the License.
</if-not-empty>
<set field="isGift" from-field="parameters.is_gift" type="Boolean" default-value="false"/>
- <call-object-method obj-field="cart" method-name="setIsGift">
+ <call-object-method obj-field="cart" method-name="setAllIsGift">
<field field="isGift" type="Boolean"/>
</call-object-method>
<set field="giftMessage" from-field="parameters.gift_message" type="String"/>
<if-not-empty field="giftMessage">
- <call-object-method obj-field="cart" method-name="setGiftMessage">
+ <call-object-method obj-field="cart" method-name="setAllGiftMessage">
<field field="giftMessage" type="String"/>
</call-object-method>
</if-not-empty>
Modified: ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml?rev=1429284&r1=1429283&r2=1429284&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml (original)
+++ ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml Sat Jan 5 13:40:19 2013
@@ -126,10 +126,5 @@ under the License.
<call-service service-name="createAffiliate" in-map-name="af_context">
<default-message resource="EcommerceUiLabels" property="EcommerceAffiliateCreatedSuccessfully"/>
</call-service>
-
- </simple-method>
- <simple-method method-name="addCheckValue" short-description="Add field to request for investigation purpose" login-required="false">
- <set field="checkValue" value="check" type="PlainString"/>
- <field-to-request field="checkValue" request-name="checkValue"/>
</simple-method>
</simple-methods>
Modified: ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml?rev=1429284&r1=1429283&r2=1429284&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml (original)
+++ ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/webapp/ecommerce/WEB-INF/controller.xml Sat Jan 5 13:40:19 2013
@@ -132,7 +132,7 @@ under the License.
<request-map uri="setSessionLocale">
<security https="false" auth="false"/>
<event type="java" path="org.ofbiz.common.CommonEvents" invoke="setSessionLocale"/>
- <response name="success" type="request-redirect" value="checkValue"/>
+ <response name="success" type="request-redirect" value="fromSetSessionLocale"/>
<response name="error" type="view" value="main"/>
</request-map>
@@ -1966,8 +1966,8 @@ under the License.
<security https="true" auth="false"/>
<response name="success" type="view" value="productCategoryList" save-current-view="true"/>
</request-map>
- <request-map uri="checkValue">
- <event type="simple" path="component://ecommerce/script/org/ofbiz/ecommerce/misc/AffiliateSimpleEvents.xml" invoke="addCheckValue"/>
+ <request-map uri="fromSetSessionLocale">
+ <event type="simple" path="component://ecommerce/script/org/ofbiz/ecommerce/customer/CustomerEvents.xml" invoke="fromSetSessionLocale"/>
<response name="success" type="view-last" value="main"/>
<response name="error" type="view" value="main"/>
</request-map>
Modified: ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl?rev=1429284&r1=1429283&r2=1429284&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl (original)
+++ ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/webapp/ecommerce/order/OnePageCheckoutProcess.ftl Sat Jan 5 13:40:19 2013
@@ -380,7 +380,7 @@ under the License.
<label for="cardNumber">${uiLabelMap.AccountingCardNumber}*
<span id="advice-required-cardNumber" style="display: none;" class="errorMessage"> (${uiLabelMap.CommonRequired})</span>
</label>
- <input id="cardNumber" name="cardNumber" class="required" type="text" value="${cardNumber?if_exists}" size="30" maxlength="16" />
+ <input id="cardNumber" name="cardNumber" class="required creditcard" type="text" value="${cardNumber?if_exists}" size="30" maxlength="16" />
</span>
<span>
<label for="billToCardSecurityCode">CVV2</label>
Modified: ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/widget/CatalogScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/widget/CatalogScreens.xml?rev=1429284&r1=1429283&r2=1429284&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/widget/CatalogScreens.xml (original)
+++ ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/widget/CatalogScreens.xml Sat Jan 5 13:40:19 2013
@@ -534,7 +534,7 @@ under the License.
<property-map resource="ProductUiLabels" map-name="uiLabelMap" global="true"/>
<property-map resource="OrderUiLabels" map-name="uiLabelMap" global="true"/>
<script location="component://order/webapp/ordermgr/WEB-INF/actions/entry/catalog/Category.groovy"/>
- <set field="check" type="PlainString" value="${groovy: return request.getAttribute('checkValue');}"/>
+ <set field="fromSetSessionLocale" value="${groovy: return request.getAttribute('fromSetSessionLocale');}"/>
<set field="visualThemeId" from-field="productStore.visualThemeId" default-value="EC_DEFAULT"/>
<service service-name="getVisualThemeResources">
<field-map field-name="visualThemeId"/>
@@ -545,7 +545,7 @@ under the License.
<widgets>
<section>
<condition>
- <if-compare operator="equals" value="check" field="check" type="PlainString"/>
+ <if-compare operator="equals" value="true" field="fromSetSessionLocale"/>
</condition>
<widgets>
<include-screen name="category"/>
Modified: ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/widget/CommonScreens.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/widget/CommonScreens.xml?rev=1429284&r1=1429283&r2=1429284&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/widget/CommonScreens.xml (original)
+++ ofbiz/branches/webhelp-2012-12-07/specialpurpose/ecommerce/widget/CommonScreens.xml Sat Jan 5 13:40:19 2013
@@ -63,7 +63,7 @@ under the License.
<entity-and list="webAnalyticsConfigs" entity-name="WebAnalyticsConfig">
<field-map field-name="webSiteId"/>
</entity-and>
- <set field="layoutSettings.javaScripts[]" value="/images/getDependentDropdownValues.js" global="true" />
+ <set field="layoutSettings.javaScripts[]" value="/images/miscAjaxFunctions.js" global="true" />
</actions>
<widgets>
<section>
Modified: ofbiz/branches/webhelp-2012-12-07/specialpurpose/example/data/ExampleDemoData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/specialpurpose/example/data/ExampleDemoData.xml?rev=1429284&r1=1429283&r2=1429284&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/specialpurpose/example/data/ExampleDemoData.xml (original)
+++ ofbiz/branches/webhelp-2012-12-07/specialpurpose/example/data/ExampleDemoData.xml Sat Jan 5 13:40:19 2013
@@ -61,6 +61,20 @@ under the License.
<Example exampleId="EX08" exampleName="Example 8" exampleTypeId="MADE_UP" statusId="EXST_IN_DESIGN"/>
<Example exampleId="EX09" exampleName="Example 9" exampleTypeId="MADE_UP" statusId="EXST_IN_DESIGN"/>
<Example exampleId="EX10" exampleName="Example 10" exampleTypeId="MADE_UP" statusId="EXST_IN_DESIGN"/>
- <Example exampleId="EX11" exampleName="Example 11" exampleTypeId="INSPIRED" statusId="EXST_IN_DESIGN"/>
- <Example exampleId="EX12" exampleName="Example 12" exampleTypeId="INSPIRED" statusId="EXST_IN_DESIGN"/>
+ <Example exampleId="EX11" exampleName="Example 11" exampleTypeId="INSPIRED" statusId="EXST_IN_DESIGN" description="mMy inspired example 11 description"/>
+ <Example exampleId="EX12" exampleName="Example 12" exampleTypeId="INSPIRED" statusId="EXST_IN_DESIGN" description="mMy inspired example 12 description"/>
+ <create>
+ <Example exampleId="EX13" exampleName="Example 13" exampleTypeId="INSPIRED" statusId="EXST_IN_DESIGN"/>
+ <Example exampleId="EX14" exampleName="Example 14" exampleTypeId="INSPIRED" statusId="EXST_IN_DESIGN"/>
+ </create>
+ <create-replace>
+ <Example exampleId="EX12" exampleName="Example 12 after replace" exampleTypeId="INSPIRED" statusId="EXST_IN_DESIGN"/>
+ </create-replace>
+ <create-update>
+ <Example exampleId="EX12" exampleName="Example 11 after update" exampleTypeId="INSPIRED" statusId="EXST_IN_DESIGN"/>
+ </create-update>
+ <delete>
+ <Example exampleId="EX09"/>
+ </delete>
+ <Example exampleId="EX10" exampleName="Example 10 after update"/>
</entity-engine-xml>
Modified: ofbiz/branches/webhelp-2012-12-07/specialpurpose/webpos/script/org/ofbiz/webpos/event/CartEvents.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/specialpurpose/webpos/script/org/ofbiz/webpos/event/CartEvents.xml?rev=1429284&r1=1429283&r2=1429284&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/specialpurpose/webpos/script/org/ofbiz/webpos/event/CartEvents.xml (original)
+++ ofbiz/branches/webhelp-2012-12-07/specialpurpose/webpos/script/org/ofbiz/webpos/event/CartEvents.xml Sat Jan 5 13:40:19 2013
@@ -421,13 +421,13 @@ under the License.
<field-map field-name="roleTypeId" value="CARRIER"/>
</entity-one>
<field-to-request field="shipmentMethod.description" request-name="shippingDescription"/>
- <call-object-method obj-field="shoppingCart" method-name="setShipmentMethodTypeId">
+ <call-object-method obj-field="shoppingCart" method-name="setAllShipmentMethodTypeId">
<field field="shipmentMethodTypeId"/>
</call-object-method>
- <call-object-method obj-field="shoppingCart" method-name="setCarrierPartyId">
+ <call-object-method obj-field="shoppingCart" method-name="setAllCarrierPartyId">
<field field="carrierPartyId"/>
</call-object-method>
- <call-object-method obj-field="shoppingCart" method-name="setProductStoreShipMethId">
+ <call-object-method obj-field="shoppingCart" method-name="setAllProductStoreShipMethId">
<field field="productStoreShipMethId"/>
</call-object-method>
<call-object-method obj-field="shoppingCart" method-name="getCurrency" ret-field="isoCode"/>
Modified: ofbiz/branches/webhelp-2012-12-07/themes/flatgrey/data/FlatGreyThemeData.xml
URL: http://svn.apache.org/viewvc/ofbiz/branches/webhelp-2012-12-07/themes/flatgrey/data/FlatGreyThemeData.xml?rev=1429284&r1=1429283&r2=1429284&view=diff
==============================================================================
--- ofbiz/branches/webhelp-2012-12-07/themes/flatgrey/data/FlatGreyThemeData.xml (original)
+++ ofbiz/branches/webhelp-2012-12-07/themes/flatgrey/data/FlatGreyThemeData.xml Sat Jan 5 13:40:19 2013
@@ -21,12 +21,12 @@ under the License.
<entity-engine-xml>
<VisualTheme visualThemeId="FLAT_GREY" visualThemeSetId="BACKOFFICE" description="Flat Grey - Floating Layout, Sight-Impaired Accessible, Bidirectional"/>
<VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_NAME" resourceValue="FLAT_GREY" sequenceId="01"/>
- <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/flatgrey/maincss-min.css" sequenceId="01"/>
- <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/flatgrey/javascript-min.css" sequenceId="02"/>
+ <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/flatgrey/maincss.css" sequenceId="01"/>
+ <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_STYLESHEET" resourceValue="/flatgrey/javascript.css" sequenceId="02"/>
<VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HELPSTYLESHEET" resourceValue="/flatgrey/help.css" sequenceId="01"/>
<VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_DOCBOOKSTYLESHEET" resourceValue="/flatgrey/webapp/flatgrey/docbook.css" sequenceId="01"/>
- <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_RTL_STYLESHEET" resourceValue="/flatgrey/mainrtl-min.css" sequenceId="01"/>
- <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/flatgrey/js/application-min.js" sequenceId="01"/>
+ <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_RTL_STYLESHEET" resourceValue="/flatgrey/mainrtl.css" sequenceId="01"/>
+ <VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_JAVASCRIPT" resourceValue="/flatgrey/js/application.js" sequenceId="01"/>
<VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_SHORTCUT_ICON" resourceValue="/images/ofbiz.ico" sequenceId="01"/>
<VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_IMAGE_URL" resourceValue="/flatgrey/images/ofbiz_logo.gif" sequenceId="01"/>
<VisualThemeResource visualThemeId="FLAT_GREY" resourceTypeEnumId="VT_HDR_TMPLT_LOC" resourceValue="component://flatgrey/includes/header.ftl" sequenceId="01"/>