Author: jleroux
Date: Tue Jul 29 03:18:19 2014
New Revision: 1614245
URL: http://svn.apache.org/r1614245
Log:
Keeps in sync with OFBiz trunk HEAD
Added:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/commonext/webapp/ordermgr-js/
- copied from r1614241,
ofbiz/trunk/applications/commonext/webapp/ordermgr-js/
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/commons/commons-pool2-2.2.jar
- copied unchanged from r1614241,
ofbiz/trunk/framework/base/lib/commons/commons-pool2-2.2.jar
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/lib/commons-dbcp2-2.0.1.jar
- copied unchanged from r1614241,
ofbiz/trunk/framework/entity/lib/commons-dbcp2-2.0.1.jar
Removed:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/webapp/ordermgr/images/js/
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/base/lib/commons/commons-pool-1.5.7.jar
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/lib/commons-dbcp-1.4.jar
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/ (props changed)
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/NOTICE
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/AccountingMenus.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/BillingAccountForms.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/GlSetupForms.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/InvoiceForms.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/InvoiceScreens.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/PaymentForms.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/PaymentScreens.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/ReportFinancialSummaryScreens.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/ap/forms/InvoiceForms.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/ar/forms/InvoiceForms.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/commonext/ofbiz-component.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/servicedef/secas.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/servicedef/secas.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/widget/ordermgr/OrderReturnScreens.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/widget/ordermgr/OrderViewScreens.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/price/PriceServices.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/servicedef/services.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/facility/FacilityScreens.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/config/entityengine.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/dtd/entity-config.xsd
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/InlineJdbc.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/connection/DBCPConnectionFactory.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/connection/DebugManagedDataSource.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/macros.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/CustomerScreens.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/OrderScreens.xml
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/demo-backup/all-manual.sh
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/demo-backup/branch13.7-demo.patch
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/demo-backup/check-svn-update.sh
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/demo-backup/ofbizDemo.crontab
Propchange: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/
------------------------------------------------------------------------------
Merged /ofbiz/trunk:r1612199-1614241
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath?rev=1614245&r1=1614244&r2=1614245&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath
(original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/.classpath Tue Jul
29 03:18:19 2014
@@ -73,7 +73,7 @@
<classpathentry kind="lib"
path="framework/base/lib/commons/commons-logging-1.1.2.jar"/>
<classpathentry kind="lib"
path="framework/base/lib/commons/commons-modeler-2.0.1.jar"/>
<classpathentry kind="lib"
path="framework/base/lib/commons/commons-net-3.1.jar"/>
- <classpathentry kind="lib"
path="framework/base/lib/commons/commons-pool-1.5.7.jar"/>
+ <classpathentry kind="lib"
path="framework/base/lib/commons/commons-pool2-2.2.jar"/>
<classpathentry kind="lib"
path="framework/base/lib/commons/commons-primitives-1.0.jar"/>
<classpathentry kind="lib"
path="framework/base/lib/commons/commons-validator-1.4.0.jar"/>
<classpathentry kind="lib"
path="framework/base/lib/commons/commons-csv-1.0.jar"/>
@@ -110,7 +110,7 @@
<classpathentry kind="lib"
path="framework/catalina/lib/tomcat-7.0.54-tomcat-util.jar"/>
<classpathentry kind="lib"
path="framework/catalina/lib/tomcat-extras-7.0.54-tomcat-juli.jar"/>
<classpathentry kind="lib"
path="framework/catalina/lib/tomcat-extras-7.0.54-tomcat-juli-adapters.jar"/>
- <classpathentry kind="lib"
path="framework/entity/lib/commons-dbcp-1.4.jar"/>
+ <classpathentry kind="lib"
path="framework/entity/lib/commons-dbcp2-2.0.1.jar"/>
<classpathentry kind="lib"
path="framework/geronimo/lib/geronimo-connector-3.1.1.jar"/>
<classpathentry kind="lib"
path="framework/geronimo/lib/geronimo-transaction-3.1.1.jar"/>
<classpathentry kind="lib"
path="specialpurpose/jetty/lib/com.sun.el-2.2.0.v201108011116.jar"/>
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE?rev=1614245&r1=1614244&r2=1614245&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/LICENSE Tue Jul 29
03:18:19 2014
@@ -54,7 +54,7 @@ framework/base/lib/commons/commons-lang-
framework/base/lib/commons/commons-logging-1.1.2.jar
framework/base/lib/commons/commons-modeler-2.0.1.jar
framework/base/lib/commons/commons-net-3.1.jar
-framework/base/lib/commons/commons-pool-1.5.7.jar
+framework/base/lib/commons/commons-pool2-2.2.jar
framework/base/lib/commons/commons-primitives-1.0.jar
framework/base/lib/commons/commons-validator-1.4.0.jar
framework/base/lib/j2eespecs/geronimo-activation_1.0.2_spec-1.0.jar
@@ -84,7 +84,7 @@ framework/catalina/lib/tomcat-7.0.54-tom
framework/catalina/lib/tomcat-7.0.54-tomcat-util.jar
framework/catalina/lib/tomcat-extras-7.0.54-tomcat-juli.jar
framework/catalina/lib/tomcat-extras-7.0.54-tomcat-juli-adapters.jar
-framework/entity/lib/commons-dbcp-1.4.jar
+framework/entity/lib/commons-dbcp2-2.0.1.jar
framework/entity/lib/jdbc/derby-10.10.1.1.jar
framework/entity/lib/jdbc/derbytools-10.8.2.2.jar
framework/service/lib/axiom-api-1.2.9.jar
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/NOTICE
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/NOTICE?rev=1614245&r1=1614244&r2=1614245&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/NOTICE (original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/NOTICE Tue Jul 29
03:18:19 2014
@@ -118,7 +118,7 @@ The full snowball package is available f
=========================================================================
Java compilation software for JSP pages is provided by Eclipse,
-which is open source software. The orginal software and
+which is open source software. The original software and
related infomation is available at
http://www.eclipse.org.
@@ -355,4 +355,4 @@ This product includes software developed
This product includes software developed by Matthew Eernisse (m...@fleegix.org)
and Open Source Applications Foundation. Licensed under the ASL2
https://github.com/mde/timezone-js
-=========================================================================
\ No newline at end of file
+=========================================================================
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java?rev=1614245&r1=1614244&r2=1614245&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java
Tue Jul 29 03:18:19 2014
@@ -425,7 +425,7 @@ public class TaxAuthorityServices {
GenericValue productPrice = null;
if (product != null && taxAuthPartyId != null && taxAuthGeoId
!= null) {
- // find a ProductPrice for the productId and taxAuth*
valxues, and see if it has a priceWithTax value
+ // find a ProductPrice for the productId and taxAuth*
values, and see if it has a priceWithTax value
Map<String, String> priceFindMap =
UtilMisc.toMap("productId", product.getString("productId"),
"taxAuthPartyId", taxAuthPartyId, "taxAuthGeoId",
taxAuthGeoId,
"productPricePurposeId", "PURCHASE");
@@ -504,9 +504,9 @@ public class TaxAuthorityServices {
BigDecimal enteredTotalPriceWithTax =
priceWithTax.multiply(itemQuantity);
BigDecimal calcedTotalPriceWithTax =
(baseSubtotal).add(baseTaxAmount);
if
(!enteredTotalPriceWithTax.equals(calcedTotalPriceWithTax)) {
- // if the calced amount is higher than the entered
amount we want the value to be negative
+ // if the calculated amount is higher than the entered
amount we want the value to be negative
// to get it down to match the entered amount
- // so, subtract the calced amount from the entered
amount (ie: correction = entered - calced)
+ // so, subtract the calculated amount from the entered
amount (ie: correction = entered - calculated)
BigDecimal correctionAmount =
enteredTotalPriceWithTax.subtract(calcedTotalPriceWithTax);
//Debug.logInfo("===================
correctionAmount=" + correctionAmount, module);
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/AccountingMenus.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/AccountingMenus.xml?rev=1614245&r1=1614244&r2=1614245&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/AccountingMenus.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/AccountingMenus.xml
Tue Jul 29 03:18:19 2014
@@ -404,7 +404,7 @@ under the License.
<menu name="PaymentSubTabBar" extends="CommonTabBarMenu"
extends-resource="component://common/widget/CommonMenus.xml"
menu-container-style="button-bar button-style-2">
<actions>
- <set field="isDisbursement" value="${bsh:if(payment!=void)return
org.ofbiz.accounting.util.UtilAccounting.isDisbursement(payment)}"/>
+ <set field="isDisbursement"
value="${groovy:if(payment!=void)return
org.ofbiz.accounting.util.UtilAccounting.isDisbursement(payment)}"/>
</actions>
<menu-item name="createNew" title="${uiLabelMap.CommonCreateNew}"
widget-style="buttontext create" >
<condition>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/BillingAccountForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/BillingAccountForms.xml?rev=1614245&r1=1614244&r2=1614245&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/BillingAccountForms.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/BillingAccountForms.xml
Tue Jul 29 03:18:19 2014
@@ -84,11 +84,11 @@ under the License.
<field-map field-name="compareDate" from-field="invoiceDate"/>
<field-map field-name="lastNameFirst" value="Y"/>
</service>
- <set field="paidInvoice" value="${bsh:
org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId).compareTo(java.math.BigDecimal.ZERO)==0}"
type="Boolean"/>
- <set field="amountToApply" value="${bsh:
+ <set field="paidInvoice" value="${groovy:
org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId).compareTo(java.math.BigDecimal.ZERO)==0}"
type="Boolean"/>
+ <set field="amountToApply" value="${groovy:
import java.text.NumberFormat;
return(NumberFormat.getNumberInstance(context.get("locale")).format(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"/>
- <set field="total" value="${bsh:
+ <set field="total" value="${groovy:
import java.text.NumberFormat;
return(NumberFormat.getNumberInstance(context.get("locale")).format(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(delegator,invoiceId)));}"/>
</row-actions>
@@ -104,22 +104,22 @@ under the License.
<field name="description"><display/></field>
<field name="partyIdFrom"><display
description="${partyNameResultFrom.fullName} [${partyIdFrom}]"/></field>
<field name="partyIdTo" parameter-name="partyId"><display
description="${partyNameResultTo.fullName} [${partyId}]"/></field>
- <field name="invoiceDate"><display
description="${bsh:invoiceDate.toString().substring(0,10)}"/></field>
+ <field name="invoiceDate"><display
description="${groovy:invoiceDate.toString().substring(0,10)}"/></field>
<field name="total" widget-area-style="align-text"><display
type="currency" currency="${currencyUomId}"/></field>
<field name="amountToApply" widget-area-style="align-text"><display
type="currency" currency="${currencyUomId}"/></field>
- <field name="capture" use-when="${bsh:!paidInvoice}"
widget-style="buttontext">
+ <field name="capture" use-when="${groovy:!paidInvoice}"
widget-style="buttontext">
<hyperlink target="capturePaymentsByInvoice"
description="${uiLabelMap.AccountingCapture}">
<parameter param-name="invoiceId"/>
<parameter param-name="billingAccountId"/>
</hyperlink>
</field>
- <field name="capture" use-when="${bsh:paidInvoice}"><display/></field>
+ <field name="capture"
use-when="${groovy:paidInvoice}"><display/></field>
</form>
<form name="EditBillingAccount" type="single"
target="updateBillingAccount" title=""
header-row-style="header-row" default-table-style="basic-table">
<actions>
- <set field="availableBalance" value="${bsh:billingAccount != null
?
org.ofbiz.order.order.OrderReadHelper.getBillingAccountBalance(billingAccount)
: 0}" type="BigDecimal"/>
+ <set field="availableBalance" value="${groovy:billingAccount !=
null ?
org.ofbiz.order.order.OrderReadHelper.getBillingAccountBalance(billingAccount)
: 0}" type="BigDecimal"/>
</actions>
<alt-target use-when="billingAccount==null"
target="createBillingAccount"/>
<auto-fields-service service-name="updateBillingAccount"
map-name="billingAccount"/>
@@ -152,7 +152,7 @@ under the License.
</field>
<!--
<field name="netBalance"
title="${uiLabelMap.AccountingBillingNetBalance}"
tooltip="${uiLabelMap.AccountingBillingNetBalanceMessage}">
- <display
description="${bsh:org.ofbiz.accounting.payment.BillingAccountWorker.getBillingAccountNetBalance(delegator,
billingAccountId)}" type="currency"
currency="${billingAccount.accountCurrencyUomId}"/>
+ <display
description="${groovy:org.ofbiz.accounting.payment.BillingAccountWorker.getBillingAccountNetBalance(delegator,
billingAccountId)}" type="currency"
currency="${billingAccount.accountCurrencyUomId}"/>
</field>
-->
<field name="availableBalance"
title="${uiLabelMap.AccountingBillingAvailableBalance}"
tooltip="${uiLabelMap.AccountingBillingAvailableBalanceMessage}">
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/GlSetupForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/GlSetupForms.xml?rev=1614245&r1=1614244&r2=1614245&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/GlSetupForms.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/GlSetupForms.xml
Tue Jul 29 03:18:19 2014
@@ -501,7 +501,7 @@ under the License.
<entity-one entity-name="GlAccountClass"
value-field="revenueGlAccountClass">
<field-map field-name="glAccountClassId" value="REVENUE"/>
</entity-one>
- <set field="revenueAccountClassIds"
value="${bsh:org.ofbiz.accounting.util.UtilAccounting.getDescendantGlAccountClassIds(revenueGlAccountClass)}"
type="List"/>
+ <set field="revenueAccountClassIds"
value="${groovy:org.ofbiz.accounting.util.UtilAccounting.getDescendantGlAccountClassIds(revenueGlAccountClass)}"
type="List"/>
</actions>
<auto-fields-service service-name="addInvoiceItemTypeGlAssignment"/>
<field name="organizationPartyId"><hidden
value="${organizationPartyId}"/></field>
@@ -555,7 +555,7 @@ under the License.
<entity-one entity-name="GlAccountClass"
value-field="expenseGlAccountClass">
<field-map field-name="glAccountClassId" value="EXPENSE"/>
</entity-one>
- <set field="expenseAccountClassIds"
value="${bsh:org.ofbiz.accounting.util.UtilAccounting.getDescendantGlAccountClassIds(expenseGlAccountClass)}"
type="List"/>
+ <set field="expenseAccountClassIds"
value="${groovy:org.ofbiz.accounting.util.UtilAccounting.getDescendantGlAccountClassIds(expenseGlAccountClass)}"
type="List"/>
</actions>
<auto-fields-service service-name="addInvoiceItemTypeGlAssignment"/>
<field name="organizationPartyId"><hidden
value="${organizationPartyId}"/></field>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/InvoiceForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/InvoiceForms.xml?rev=1614245&r1=1614244&r2=1614245&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/InvoiceForms.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/InvoiceForms.xml
Tue Jul 29 03:18:19 2014
@@ -69,9 +69,9 @@ under the License.
<field-map field-name="compareDate" from-field="invoiceDate"/>
<field-map field-name="lastNameFirst" value="Y"/>
</service>
- <set field="amountToApply"
value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)
+ <set field="amountToApply"
value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)
.multiply(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceCurrencyConversionRate(delegator,invoiceId))}"/>
- <set field="total"
value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(delegator,invoiceId)
+ <set field="total"
value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(delegator,invoiceId)
.multiply(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceCurrencyConversionRate(delegator,invoiceId))}"/>
<set field="currencyUomId"
from-field="defaultOrganizationPartyCurrencyUomId"/>
</row-actions>
@@ -102,7 +102,7 @@ under the License.
<form name="invoiceHeader" type="single" title="Invoice header
information" default-map-name="invoice"
header-row-style="header-row" default-table-style="basic-table">
<actions>
- <set field="total"
value="${bsh:return(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(invoice));}"/>
+ <set field="total"
value="${groovy:return(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(invoice));}"/>
<service service-name="getPartyNameForDate"
result-map="partyNameResultFrom">
<field-map field-name="partyId"
from-field="invoice.partyIdFrom"/>
<field-map field-name="compareDate"
from-field="invoice.invoiceDate"/>
@@ -131,10 +131,10 @@ under the License.
</field>
<field position="1" name="roleTypeId"><display/></field>
<field position="2" name="billingAccountId"><display/></field>
- <field position="1" name="invoiceDate"><display
description="${bsh:if(invoice.get("invoiceDate")!=null)return(invoice.getString("invoiceDate").substring(0,10));}"/></field>
- <field position="2" name="dueDate"><display
description="${bsh:if(invoice.get("dueDate")!=null)return(invoice.getString("dueDate").substring(0,10));}"/></field>
+ <field position="1" name="invoiceDate"><display
description="${groovy:if(invoice.get("invoiceDate")!=null)return(invoice.getString("invoiceDate").substring(0,10));}"/></field>
+ <field position="2" name="dueDate"><display
description="${groovy:if(invoice.get("dueDate")!=null)return(invoice.getString("dueDate").substring(0,10));}"/></field>
<field position="1" name="total"><display description="${total}"
type="currency" currency="${invoice.currencyUomId}"/></field>
- <field position="2" name="paidDate"><display
description="${bsh:if(invoice.get("paidDate")!=null)return(invoice.getString("paidDate").substring(0,10));}"/></field>
+ <field position="2" name="paidDate"><display
description="${groovy:if(invoice.get("paidDate")!=null)return(invoice.getString("paidDate").substring(0,10));}"/></field>
<field position="1" name="referenceNumber"
title="${uiLabelMap.FormFieldTitle_referenceNum}"><display/></field>
<field name="currencyUomId"><hidden/></field>
</form>
@@ -435,7 +435,7 @@ under the License.
<form name="ListInvoiceStatus" list-name="invoiceStatus" target=""
title="" type="list" paginate-target="ListInvoiceStatus"
odd-row-style="alternate-row" default-table-style="basic-table
hover-bar">
<field name="invoiceId"><hidden/></field>
- <field name="statusDate"><display
description="${bsh:statusDate.toString().substring(0,10)}"/></field>
+ <field name="statusDate"><display
description="${groovy:statusDate.toString().substring(0,10)}"/></field>
<field name="statusId"
title="${uiLabelMap.CommonStatus}"><display-entity
entity-name="StatusItem"/></field>
</form>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/InvoiceScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/InvoiceScreens.xml?rev=1614245&r1=1614244&r2=1614245&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/InvoiceScreens.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/InvoiceScreens.xml
Tue Jul 29 03:18:19 2014
@@ -188,9 +188,9 @@ under the License.
<order-by field-name="invoiceItemSeqId"/>
</entity-and>
<script
location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/CreateApplicationList.groovy"/>
- <set field="invoiceAmount"
value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(invoice)}"
type="BigDecimal"/>
- <set field="notAppliedAmount"
value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(invoice)}"
type="BigDecimal"/>
- <set field="appliedAmount"
value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceApplied(invoice)}"
type="BigDecimal"/>
+ <set field="invoiceAmount"
value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(invoice)}"
type="BigDecimal"/>
+ <set field="notAppliedAmount"
value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(invoice)}"
type="BigDecimal"/>
+ <set field="appliedAmount"
value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceApplied(invoice)}"
type="BigDecimal"/>
<entity-condition entity-name="InvItemAndOrdItem"
list="invItemAndOrdItems">
<condition-expr field-name="invoiceId" operator="equals"
from-field="invoiceId"/>
<order-by field-name="invoiceItemSeqId"/>
@@ -346,9 +346,9 @@ under the License.
<entity-one entity-name="Invoice" value-field="invoice"/>
<script
location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/CreateApplicationList.groovy"/>
<script
location="component://accounting/webapp/accounting/WEB-INF/actions/invoice/ListNotAppliedPayments.groovy"/>
- <set field="invoiceAmount"
value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(invoice)}"
type="BigDecimal"/>
- <set field="notAppliedAmount"
value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(invoice)}"
type="BigDecimal"/>
- <set field="appliedAmount"
value="${bsh:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceApplied(invoice)}"
type="BigDecimal"/>
+ <set field="invoiceAmount"
value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(invoice)}"
type="BigDecimal"/>
+ <set field="notAppliedAmount"
value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(invoice)}"
type="BigDecimal"/>
+ <set field="appliedAmount"
value="${groovy:org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceApplied(invoice)}"
type="BigDecimal"/>
</actions>
<widgets>
<decorator-screen name="CommonInvoiceDecorator"
location="${parameters.invoiceDecoratorLocation}">
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/PaymentForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/PaymentForms.xml?rev=1614245&r1=1614244&r2=1614245&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/PaymentForms.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/PaymentForms.xml
Tue Jul 29 03:18:19 2014
@@ -60,7 +60,7 @@ under the License.
</service>
</actions>
<row-actions>
- <set field="amountToApply"
value="${bsh:org.ofbiz.accounting.payment.PaymentWorker.getPaymentNotApplied(delegator,paymentId);}"/>
+ <set field="amountToApply"
value="${groovy:org.ofbiz.accounting.payment.PaymentWorker.getPaymentNotApplied(delegator,paymentId);}"/>
</row-actions>
<field name="paymentId" widget-style="buttontext">
<hyperlink description="${paymentId}" target="paymentOverview">
@@ -415,7 +415,7 @@ under the License.
</entity-condition>
</actions>
<row-actions>
- <set field="amountApplied"
value="${bsh:org.ofbiz.accounting.payment.PaymentWorker.getPaymentAppliedAmount(delegator,
paymentApplicationId);}"/>
+ <set field="amountApplied"
value="${groovy:org.ofbiz.accounting.payment.PaymentWorker.getPaymentAppliedAmount(delegator,
paymentApplicationId);}"/>
</row-actions>
<auto-fields-entity entity-name="PaymentApplication"
default-field-type="display"/>
<field name="paymentApplicationId"><hidden/></field>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/PaymentScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/PaymentScreens.xml?rev=1614245&r1=1614244&r2=1614245&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/PaymentScreens.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/PaymentScreens.xml
Tue Jul 29 03:18:19 2014
@@ -168,11 +168,11 @@ under the License.
<set field="tabButtonItem" value="editPaymentApplications"/>
<set field="paymentId" from-field="parameters.paymentId"/>
<entity-one entity-name="Payment" value-field="payment"/>
- <set field="appliedAmount" type="String" value="${bsh:
+ <set field="appliedAmount" type="String" value="${groovy:
import java.text.NumberFormat;
return(NumberFormat.getNumberInstance(context.get("locale")).format(org.ofbiz.accounting.payment.PaymentWorker.getPaymentApplied(payment)));}"/>
- <set field="notAppliedAmount" type="BigDecimal"
value="${bsh:org.ofbiz.accounting.payment.PaymentWorker.getPaymentNotApplied(payment)}"/>
- <set field="notAppliedAmountStr" type="String" value="${bsh:
+ <set field="notAppliedAmount" type="BigDecimal"
value="${groovy:org.ofbiz.accounting.payment.PaymentWorker.getPaymentNotApplied(payment)}"/>
+ <set field="notAppliedAmountStr" type="String" value="${groovy:
import java.text.NumberFormat;
return(NumberFormat.getCurrencyInstance(context.get("locale")).format(org.ofbiz.accounting.payment.PaymentWorker.getPaymentNotApplied(payment)));}"/>
<script
location="component://accounting/webapp/accounting/WEB-INF/actions/payment/ListNotAppliedInvoices.groovy"/>
@@ -351,8 +351,8 @@ under the License.
<entity-one entity-name="Payment" value-field="payment"/>
<set field="finAccountTransId"
from-field="payment.finAccountTransId"/>
<entity-one entity-name="FinAccountTrans"
value-field="finAccountTrans"/>
- <set field="appliedAmount"
value="${bsh:org.ofbiz.accounting.payment.PaymentWorker.getPaymentApplied(payment).toString()}"/>
- <set field="notAppliedAmount"
value="${bsh:org.ofbiz.accounting.payment.PaymentWorker.getPaymentNotApplied(payment).toString()}"/>
+ <set field="appliedAmount"
value="${groovy:org.ofbiz.accounting.payment.PaymentWorker.getPaymentApplied(payment).toString()}"/>
+ <set field="notAppliedAmount"
value="${groovy:org.ofbiz.accounting.payment.PaymentWorker.getPaymentNotApplied(payment).toString()}"/>
<entity-condition entity-name="AcctgTransAndEntries"
list="AcctgTransAndEntries">
<condition-expr field-name="paymentId"
from-field="paymentId"/>
<order-by field-name="acctgTransId"/>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/ReportFinancialSummaryScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/ReportFinancialSummaryScreens.xml?rev=1614245&r1=1614244&r2=1614245&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/ReportFinancialSummaryScreens.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/ReportFinancialSummaryScreens.xml
Tue Jul 29 03:18:19 2014
@@ -27,8 +27,8 @@ under the License.
<set field="titleProperty"
value="PageTitleFinancialSummaryReportOptions"/>
<set field="headerItem" value="FinancialSummryReports"/>
- <set field="month" from-field="parameters.month"
default-value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString("MM")}"/>
- <set field="year" from-field="parameters.year"
default-value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy")}"/>
+ <set field="month" from-field="parameters.month"
default-value="${groovy:org.ofbiz.base.util.UtilDateTime.nowDateString("MM")}"/>
+ <set field="year" from-field="parameters.year"
default-value="${groovy:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy")}"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
@@ -60,8 +60,8 @@ under the License.
<actions>
<set field="headerItem" value="FinancialSummryReports"/>
- <set field="month" from-field="parameters.month"
type="Integer"
default-value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString("MM")}"/>
- <set field="year" from-field="parameters.year" type="Integer"
default-value="${bsh:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy")}"/>
+ <set field="month" from-field="parameters.month"
type="Integer"
default-value="${groovy:org.ofbiz.base.util.UtilDateTime.nowDateString("MM")}"/>
+ <set field="year" from-field="parameters.year" type="Integer"
default-value="${groovy:org.ofbiz.base.util.UtilDateTime.nowDateString("yyyy")}"/>
<set field="organizationPartyId"
from-field="parameters.organizationPartyId"/>
<set field="currencyUomId"
from-field="parameters.currencyUomId"/>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/ap/forms/InvoiceForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/ap/forms/InvoiceForms.xml?rev=1614245&r1=1614244&r2=1614245&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/ap/forms/InvoiceForms.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/ap/forms/InvoiceForms.xml
Tue Jul 29 03:18:19 2014
@@ -33,10 +33,10 @@ under the License.
<field-map field-name="compareDate" from-field="invoiceDate"/>
<field-map field-name="lastNameFirst" value="Y"/>
</service>
- <set field="amountToApply" value="${bsh:
+ <set field="amountToApply" value="${groovy:
import java.text.NumberFormat;
return(NumberFormat.getNumberInstance(context.get("locale")).format(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"/>
- <set field="total" value="${bsh:
+ <set field="total" value="${groovy:
import java.text.NumberFormat;
return(NumberFormat.getNumberInstance(context.get("locale")).format(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(delegator,invoiceId)));}"/>
</row-actions>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/ar/forms/InvoiceForms.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/ar/forms/InvoiceForms.xml?rev=1614245&r1=1614244&r2=1614245&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/ar/forms/InvoiceForms.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/accounting/widget/ar/forms/InvoiceForms.xml
Tue Jul 29 03:18:19 2014
@@ -34,10 +34,10 @@ under the License.
<field-map field-name="compareDate" from-field="invoiceDate"/>
<field-map field-name="lastNameFirst" value="Y"/>
</service>
- <set field="amountToApply" value="${bsh:
+ <set field="amountToApply" value="${groovy:
import java.text.NumberFormat;
return(NumberFormat.getNumberInstance(context.get("locale")).format(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceNotApplied(delegator,invoiceId)));}"/>
- <set field="total" value="${bsh:
+ <set field="total" value="${groovy:
import java.text.NumberFormat;
return(NumberFormat.getNumberInstance(context.get("locale")).format(org.ofbiz.accounting.invoice.InvoiceWorker.getInvoiceTotal(delegator,invoiceId)));}"/>
</row-actions>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/commonext/ofbiz-component.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/commonext/ofbiz-component.xml?rev=1614245&r1=1614244&r2=1614245&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/commonext/ofbiz-component.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/commonext/ofbiz-component.xml
Tue Jul 29 03:18:19 2014
@@ -44,4 +44,12 @@ under the License.
location="webapp/ofbizsetup"
base-permission="OFBTOOLS,SETUP"
mount-point="/ofbizsetup"/>
+
+ <webapp name="ordermgr-js"
+ title="ordermgr-js"
+ server="default-server"
+ location="webapp/ordermgr-js"
+ mount-point="/ordermgr-js"
+ app-bar-display="false"/>
+
</ofbiz-component>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/servicedef/secas.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/servicedef/secas.xml?rev=1614245&r1=1614244&r2=1614245&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/servicedef/secas.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/content/servicedef/secas.xml
Tue Jul 29 03:18:19 2014
@@ -105,7 +105,7 @@ under the License.
</eca>
<!-- electronic text; needs dataResourceId -->
- <eca service="createElectronicText" event="in-validate">
+ <eca service="createElectronicText" event="invoke">
<condition field-name="dataResourceId" operator="is-empty"/>
<set field-name="dataResourceTypeId" value="ELECTRONIC_TEXT"/>
<action service="createDataResource" mode="sync"
result-to-context="true"/>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/servicedef/secas.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/servicedef/secas.xml?rev=1614245&r1=1614244&r2=1614245&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/servicedef/secas.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/servicedef/secas.xml
Tue Jul 29 03:18:19 2014
@@ -88,7 +88,7 @@ under the License.
<action service="releaseOrderPayments" mode="sync"/>
<action service="processRefundReturnForReplacement" mode="sync"/>
</eca>
- <eca service="changeOrderStatus" event="global-commit"
run-on-error="false">
+ <eca service="changeOrderStatus" event="global-commit-post-run"
run-on-error="false">
<condition field-name="statusId" operator="equals"
value="ORDER_COMPLETED"/>
<condition-field field-name="statusId" operator="not-equals"
to-field-name="oldStatusId"/>
<action service="createInvoiceFromOrder" mode="sync"/>
@@ -236,7 +236,7 @@ under the License.
<action service="processCreditReturn" mode="sync"/>
<action service="processRefundOnlyReturn" mode="sync"/>
</eca>
- <eca service="updateReturnStatusFromReceipt" event="global-commit">
+ <eca service="updateReturnStatusFromReceipt"
event="global-commit-post-run">
<condition field-name="returnHeaderStatus" operator="equals"
value="RETURN_RECEIVED"/>
<action service="addProductsBackToCategory" mode="sync"/>
<action service="processWaitReplacementReturn" mode="sync"/>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/widget/ordermgr/OrderReturnScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/widget/ordermgr/OrderReturnScreens.xml?rev=1614245&r1=1614244&r2=1614245&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/widget/ordermgr/OrderReturnScreens.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/widget/ordermgr/OrderReturnScreens.xml
Tue Jul 29 03:18:19 2014
@@ -88,7 +88,7 @@ under the License.
<set field="titleProperty" value="PageTitleReturnHeader"/>
<set field="headerItem" value="return"/>
<set field="tabButtonItem" value="OrderReturnHeader"/>
- <set field="layoutSettings.javaScripts[+0]"
value="/ordermgr/images/js/return.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]"
value="/ordermgr-js/return.js" global="true"/>
<property-to-field field="defaultCurrencyUomId"
resource="general" property="currency.uom.id.default" default="USD"/>
<script
location="component://order/webapp/ordermgr/WEB-INF/actions/return/ReturnHeader.groovy"/>
</actions>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/widget/ordermgr/OrderViewScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/widget/ordermgr/OrderViewScreens.xml?rev=1614245&r1=1614244&r2=1614245&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/widget/ordermgr/OrderViewScreens.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/order/widget/ordermgr/OrderViewScreens.xml
Tue Jul 29 03:18:19 2014
@@ -52,9 +52,9 @@ under the License.
<actions>
<set field="titleProperty" value="OrderViewOrder"/>
<set field="headerItem" value="findorders"/>
- <set field="layoutSettings.javaScripts[]"
value="/ordermgr/images/js/order.js" global="true"/>
- <set field="layoutSettings.javaScripts[]"
value="/ordermgr/images/js/OrderShippingInfo.js" global="true"/>
- <set field="layoutSettings.javaScripts[]"
value="/ordermgr/images/js/geoAutoCompleter.js" global="true"/>
+ <set field="layoutSettings.javaScripts[]"
value="/ordermgr-js/order.js" global="true"/>
+ <set field="layoutSettings.javaScripts[]"
value="/ordermgr-js/OrderShippingInfo.js" global="true"/>
+ <set field="layoutSettings.javaScripts[]"
value="/ordermgr-js/geoAutoCompleter.js" global="true"/>
<script
location="component://order/webapp/ordermgr/WEB-INF/actions/order/OrderView.groovy"/>
<script
location="component://order/webapp/ordermgr/WEB-INF/actions/order/OrderViewWebSecure.groovy"/>
</actions>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/price/PriceServices.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/price/PriceServices.xml?rev=1614245&r1=1614244&r2=1614245&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/price/PriceServices.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/script/org/ofbiz/product/price/PriceServices.xml
Tue Jul 29 03:18:19 2014
@@ -21,7 +21,7 @@ under the License.
<simple-methods xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:noNamespaceSchemaLocation="http://ofbiz.apache.org/dtds/simple-methods-v2.xsd";>
<!-- ProductPrice methods -->
- <simple-method method-name="createProductPrice" short-description="Create
an ProductPrice">
+ <simple-method method-name="createProductPrice" short-description="Create
a Product Price">
<set field="callingMethodName" value="createProductPrice"/>
<set field="checkAction" value="CREATE"/>
<call-simple-method method-name="checkProductRelatedPermission"
xml-resource="component://product/script/org/ofbiz/product/product/ProductServices.xml"/>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/servicedef/services.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/servicedef/services.xml?rev=1614245&r1=1614244&r2=1614245&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/servicedef/services.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/servicedef/services.xml
Tue Jul 29 03:18:19 2014
@@ -250,12 +250,14 @@ under the License.
<service name="createProductPrice" default-entity-name="ProductPrice"
engine="simple"
location="component://product/script/org/ofbiz/product/price/PriceServices.xml"
invoke="createProductPrice" auth="true">
<description>
- Create an ProductPrice.
- Price is always stored without tax.
+ Create a Product Price.
+
If taxAuthGeoId and taxAuthPartyId are (or taxAuthCombinedId is)
passed in then the price will be considered a price
with tax included (the priceWithoutTax, priceWithTax, taxAmount,
and taxPercentage fields will also be populated).
- If the taxInPrice field is 'Y' then the price field will be left
with the price included (price will be equal to priceWithTax),
+
+ If the taxInPrice field is 'Y' then the price field will be left
with the tax included (price will be equal to priceWithTax),
otherwise tax will be removed from the passed in price and the
price field will be equal to the priceWithoutTax field.
+
If taxAuthGeoId or taxAuthPartyId empty, and taxAuthCombinedId is
empty, then the taxInPrice field will be ignored.
</description>
<auto-attributes include="pk" mode="IN" optional="false"/>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/facility/FacilityScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/facility/FacilityScreens.xml?rev=1614245&r1=1614244&r2=1614245&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/facility/FacilityScreens.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/applications/product/widget/facility/FacilityScreens.xml
Tue Jul 29 03:18:19 2014
@@ -1093,7 +1093,7 @@ under the License.
<entity-one entity-name="Facility" value-field="facility"/>
<property-map resource="ProductUiLabels"
map-name="uiLabelMap"/>
<set field="title"
value="${uiLabelMap.ProductReceiveInventory}"/>
- <set field="layoutSettings.javaScripts[+0]"
value="/ordermgr/images/js/ConvertUom.js" global="true"/>
+ <set field="layoutSettings.javaScripts[+0]"
value="/ordermgr-js/ConvertUom.js" global="true"/>
</actions>
<widgets>
<decorator-screen name="CommonFacilityDecorator"
location="${parameters.commonFacilityDecoratorLocation}">
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml?rev=1614245&r1=1614244&r2=1614245&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml
(original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/build.xml Tue Jul
29 03:18:19 2014
@@ -1226,8 +1226,8 @@ under the License.
<sonar:sonar key="org.apache:ofbiz"
version="${info.entry.commit(revision)}"
xmlns:sonar="antlib:org.sonar.ant:sonar"/>
<property name="sonar.dynamicAnalysis" value="reuseReports" />
<property name="sonar.cobertura.reportPath"
value="runtime/logs/cobertura-report/coverage.xml"/>
- <property name="sonar.java.source" value="1.6" />
- <property name="sonar.java.target" value="1.6" />
+ <property name="sonar.java.source" value="1.7" />
+ <property name="sonar.java.target" value="1.7" />
<!-- default for jdbc url:
jdbc:mysql://localhost:3306/sonar?useUnicode=true&characterEncoding=utf8-->
<property name="sonar.jdbc.url" value="${sonar.jdbc.url}"/>
<property name="sonar.jdbc.driverClassName"
value="com.mysql.jdbc.Driver" />
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/config/entityengine.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/config/entityengine.xml?rev=1614245&r1=1614244&r2=1614245&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/config/entityengine.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/config/entityengine.xml
Tue Jul 29 03:18:19 2014
@@ -182,6 +182,9 @@ access. For a detailed description see t
isolation-level="ReadCommitted"
pool-minsize="2"
pool-maxsize="250"
+ test-on-borrow="true"
+ pool-jdbc-test-stmt="values 1"
+ soft-min-evictable-idle-time-millis="600000"
time-between-eviction-runs-millis="600000"/>
<!-- <jndi-jdbc jndi-server-name="localjndi"
jndi-name="java:/DerbyDataSource" isolation-level="ReadCommitted"/> -->
</datasource>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/dtd/entity-config.xsd
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/dtd/entity-config.xsd?rev=1614245&r1=1614244&r2=1614245&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/dtd/entity-config.xsd
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/dtd/entity-config.xsd
Tue Jul 29 03:18:19 2014
@@ -457,15 +457,28 @@ under the License.
<xs:attribute type="xs:nonNegativeInteger" name="idle-maxsize">
<xs:annotation>
<xs:documentation>
- Maximum number of idle connections that should remain in
the pool. Defaults to 50% of pool-maxsize.
+ Maximum number of idle connections that should remain in
the pool. Defaults to 50% of pool-maxsize and always greater than pool-minsize.
</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute type="xs:nonNegativeInteger"
name="time-between-eviction-runs-millis" default="600000"/>
- <xs:attribute type="xs:nonNegativeInteger" name="pool-sleeptime"
default="300000">
+ <xs:attribute type="xs:nonNegativeInteger"
name="time-between-eviction-runs-millis" default="600000">
<xs:annotation>
<xs:documentation>
- This parameter is currently not implemented
+ Sets the number of milliseconds between eviction runs for
idle connections.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute type="xs:nonNegativeInteger"
name="soft-min-evictable-idle-time-millis" default="600000">
+ <xs:annotation>
+ <xs:documentation>
+ Sets the minimum amount of time a connection may sit idle
in the pool before it is eligible for eviction.
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute type="xs:nonNegativeInteger" name="pool-sleeptime"
default="120000">
+ <xs:annotation>
+ <xs:documentation>
+ Sets the maximum amount of time (in milliseconds) to wait
for a connection when the pool is exhausted
</xs:documentation>
</xs:annotation>
</xs:attribute>
@@ -493,7 +506,35 @@ under the License.
<xs:attribute type="xs:string" name="pool-jdbc-test-stmt">
<xs:annotation>
<xs:documentation>
- This parameter is currently not implemented
+ Connection validation query
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute type="xs:boolean" name="test-on-create" default="false">
+ <xs:annotation>
+ <xs:documentation>
+ Run validation query when a connection is created in the
pool
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute type="xs:boolean" name="test-on-borrow" default="false">
+ <xs:annotation>
+ <xs:documentation>
+ Run validation query when a connection is borrowed from
pool
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute type="xs:boolean" name="test-on-return" default="false">
+ <xs:annotation>
+ <xs:documentation>
+ Run validation query when a connection is returned to pool
+ </xs:documentation>
+ </xs:annotation>
+ </xs:attribute>
+ <xs:attribute type="xs:boolean" name="test-while-idle" default="false">
+ <xs:annotation>
+ <xs:documentation>
+ Run validation query while connection is in idle in the
pool with frequency set in time-between-eviction-runs-millis
</xs:documentation>
</xs:annotation>
</xs:attribute>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/InlineJdbc.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/InlineJdbc.java?rev=1614245&r1=1614244&r2=1614245&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/InlineJdbc.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/config/model/InlineJdbc.java
Tue Jul 29 03:18:19 2014
@@ -40,11 +40,16 @@ public final class InlineJdbc extends Jd
private final int poolMinsize; // type = xs:nonNegativeInteger
private final int idleMaxsize; // type = xs:nonNegativeInteger
private final int timeBetweenEvictionRunsMillis; // type =
xs:nonNegativeInteger
+ private final int softMinEvictableIdleTimeMillis; // type =
xs:nonNegativeInteger
private final int poolSleeptime; // type = xs:nonNegativeInteger
private final int poolLifetime; // type = xs:nonNegativeInteger
private final int poolDeadlockMaxwait; // type = xs:nonNegativeInteger
private final int poolDeadlockRetrywait; // type = xs:nonNegativeInteger
private final String poolJdbcTestStmt; // type = xs:string
+ private final boolean testOnCreate; // type = xs:boolean
+ private final boolean testOnBorrow; // type = xs:boolean
+ private final boolean testOnReturn; // type = xs:boolean
+ private final boolean testWhileIdle; // type = xs:boolean
private final String poolXaWrapperClass; // type = xs:string
InlineJdbc(Element element) throws GenericEntityConfException {
@@ -107,6 +112,16 @@ public final class InlineJdbc extends Jd
throw new GenericEntityConfException("<inline-jdbc> element
time-between-eviction-runs-millis attribute is invalid" + lineNumberText);
}
}
+ String softMinEvictableIdleTimeMillis =
element.getAttribute("soft-min-evictable-idle-time-millis");
+ if (softMinEvictableIdleTimeMillis.isEmpty()) {
+ this.softMinEvictableIdleTimeMillis = 600000;
+ } else {
+ try {
+ this.softMinEvictableIdleTimeMillis =
Integer.parseInt(softMinEvictableIdleTimeMillis);
+ } catch (Exception e) {
+ throw new GenericEntityConfException("<inline-jdbc> element
soft-min-evictable-idle-time-millis attribute is invalid" + lineNumberText);
+ }
+ }
String poolSleeptime = element.getAttribute("pool-sleeptime");
if (poolSleeptime.isEmpty()) {
this.poolSleeptime = 300000;
@@ -148,6 +163,10 @@ public final class InlineJdbc extends Jd
}
}
this.poolJdbcTestStmt =
element.getAttribute("pool-jdbc-test-stmt").intern();
+ this.testOnCreate =
"true".equals(element.getAttribute("test-on-create"));
+ this.testOnBorrow =
"true".equals(element.getAttribute("test-on-borrow"));
+ this.testOnReturn =
"true".equals(element.getAttribute("test-on-return"));
+ this.testWhileIdle =
"true".equals(element.getAttribute("test-while-idle"));
this.poolXaWrapperClass =
element.getAttribute("pool-xa-wrapper-class").intern();
}
@@ -196,6 +215,11 @@ public final class InlineJdbc extends Jd
return this.timeBetweenEvictionRunsMillis;
}
+ /** Returns the value of the
<code>time-between-eviction-runs-millis</code> attribute. */
+ public int getSoftMinEvictableIdleTimeMillis() {
+ return this.softMinEvictableIdleTimeMillis;
+ }
+
/** Returns the value of the <code>pool-sleeptime</code> attribute. */
public int getPoolSleeptime() {
return this.poolSleeptime;
@@ -221,6 +245,26 @@ public final class InlineJdbc extends Jd
return this.poolJdbcTestStmt;
}
+ /** Returns the value of the <code>test-on-create</code> attribute. */
+ public boolean getTestOnCreate() {
+ return this.testOnCreate;
+ }
+
+ /** Returns the value of the <code>test-on-create</code> attribute. */
+ public boolean getTestOnBorrow() {
+ return this.testOnBorrow;
+ }
+
+ /** Returns the value of the <code>test-on-create</code> attribute. */
+ public boolean getTestOnReturn() {
+ return this.testOnReturn;
+ }
+
+ /** Returns the value of the <code>test-on-create</code> attribute. */
+ public boolean getTestWhileIdle() {
+ return this.testWhileIdle;
+ }
+
/** Returns the value of the <code>pool-xa-wrapper-class</code> attribute.
*/
public String getPoolXaWrapperClass() {
return this.poolXaWrapperClass;
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/connection/DBCPConnectionFactory.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/connection/DBCPConnectionFactory.java?rev=1614245&r1=1614244&r2=1614245&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/connection/DBCPConnectionFactory.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/connection/DBCPConnectionFactory.java
Tue Jul 29 03:18:19 2014
@@ -28,14 +28,15 @@ import java.util.concurrent.ConcurrentHa
import javax.transaction.TransactionManager;
-import org.apache.commons.dbcp.ConnectionFactory;
-import org.apache.commons.dbcp.DriverConnectionFactory;
-import org.apache.commons.dbcp.PoolableConnectionFactory;
-import org.apache.commons.dbcp.managed.LocalXAConnectionFactory;
-import org.apache.commons.dbcp.managed.ManagedDataSource;
-import org.apache.commons.dbcp.managed.PoolableManagedConnectionFactory;
-import org.apache.commons.dbcp.managed.XAConnectionFactory;
-import org.apache.commons.pool.impl.GenericObjectPool;
+import org.apache.commons.dbcp2.ConnectionFactory;
+import org.apache.commons.dbcp2.DriverConnectionFactory;
+import org.apache.commons.dbcp2.PoolableConnectionFactory;
+import org.apache.commons.dbcp2.managed.LocalXAConnectionFactory;
+import org.apache.commons.dbcp2.managed.ManagedDataSource;
+import org.apache.commons.dbcp2.managed.PoolableManagedConnectionFactory;
+import org.apache.commons.dbcp2.managed.XAConnectionFactory;
+import org.apache.commons.pool2.impl.GenericObjectPool;
+import org.apache.commons.pool2.impl.GenericObjectPoolConfig;
import org.ofbiz.base.util.Debug;
import org.ofbiz.entity.GenericEntityConfException;
import org.ofbiz.entity.GenericEntityException;
@@ -76,9 +77,8 @@ public class DBCPConnectionFactory imple
// pool settings
int maxSize = jdbcElement.getPoolMaxsize();
int minSize = jdbcElement.getPoolMinsize();
- int timeBetweenEvictionRunsMillis =
jdbcElement.getTimeBetweenEvictionRunsMillis();
int maxIdle = jdbcElement.getIdleMaxsize();
- // Don't allow a maxIdle of less than pool-minsize
+ // maxIdle must be greater than pool-minsize
maxIdle = maxIdle > minSize ? maxIdle : minSize;
// load the driver
Driver jdbcDriver;
@@ -103,20 +103,10 @@ public class DBCPConnectionFactory imple
// wrap it with a LocalXAConnectionFactory
XAConnectionFactory xacf = new LocalXAConnectionFactory(txMgr, cf);
- // configure the pool settings
- GenericObjectPool pool = new GenericObjectPool();
-
- pool.setTimeBetweenEvictionRunsMillis(timeBetweenEvictionRunsMillis);
- pool.setMaxActive(maxSize);
- pool.setMaxIdle(maxIdle);
- pool.setMinIdle(minSize);
- pool.setMaxWait(120000);
-
// create the pool object factory
- PoolableConnectionFactory factory = new
PoolableManagedConnectionFactory(xacf, pool, null, null, true, true);
- factory.setValidationQuery("select 1 from entity_key_store where
key_name = ''");
+ PoolableConnectionFactory factory = new
PoolableManagedConnectionFactory(xacf, null);
+ factory.setValidationQuery(jdbcElement.getPoolJdbcTestStmt());
factory.setDefaultReadOnly(false);
-
String transIso = jdbcElement.getIsolationLevel();
if (!transIso.isEmpty()) {
if ("Serializable".equals(transIso)) {
@@ -131,10 +121,31 @@ public class DBCPConnectionFactory imple
factory.setDefaultTransactionIsolation(Connection.TRANSACTION_NONE);
}
}
- pool.setFactory(factory);
- // mds = new ManagedDataSource(pool, xacf.getTransactionRegistry());
- mds = new DebugManagedDataSource(pool, xacf.getTransactionRegistry());
// Useful to debug the usage of connections in the pool
+ // configure the pool settings
+ GenericObjectPoolConfig poolConfig = new GenericObjectPoolConfig();
+ poolConfig.setMaxTotal(maxSize);
+ // settings for idle connections
+ poolConfig.setMaxIdle(maxIdle);
+ poolConfig.setMinIdle(minSize);
+
poolConfig.setTimeBetweenEvictionRunsMillis(jdbcElement.getTimeBetweenEvictionRunsMillis());
+ poolConfig.setMinEvictableIdleTimeMillis(-1); // disabled in favour of
setSoftMinEvictableIdleTimeMillis(...)
+
poolConfig.setSoftMinEvictableIdleTimeMillis(jdbcElement.getSoftMinEvictableIdleTimeMillis());
+ poolConfig.setNumTestsPerEvictionRun(maxSize); // test all the idle
connections
+ // settings for when the pool is exhausted
+ poolConfig.setBlockWhenExhausted(true); // the thread requesting the
connection waits if no connection is available
+ poolConfig.setMaxWaitMillis(jdbcElement.getPoolSleeptime()); // throw
an exception if, after getPoolSleeptime() ms, no connection is available for
the requesting thread
+ // settings for the execution of the validation query
+ poolConfig.setTestOnCreate(jdbcElement.getTestOnCreate());
+ poolConfig.setTestOnBorrow(jdbcElement.getTestOnBorrow());
+ poolConfig.setTestOnReturn(jdbcElement.getTestOnReturn());
+ poolConfig.setTestWhileIdle(jdbcElement.getTestWhileIdle());
+
+ GenericObjectPool pool = new GenericObjectPool(factory, poolConfig);
+ factory.setPool(pool);
+
+ mds = new ManagedDataSource(pool, xacf.getTransactionRegistry());
+ //mds = new DebugManagedDataSource(pool,
xacf.getTransactionRegistry()); // Useful to debug the usage of connections in
the pool
mds.setAccessToUnderlyingConnectionAllowed(true);
// cache the pool
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/connection/DebugManagedDataSource.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/connection/DebugManagedDataSource.java?rev=1614245&r1=1614244&r2=1614245&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/connection/DebugManagedDataSource.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/entity/src/org/ofbiz/entity/connection/DebugManagedDataSource.java
Tue Jul 29 03:18:19 2014
@@ -19,11 +19,11 @@
package org.ofbiz.entity.connection;
-import org.apache.commons.dbcp.managed.ManagedDataSource;
-import org.apache.commons.dbcp.managed.TransactionRegistry;
-import org.apache.commons.pool.ObjectPool;
+import org.apache.commons.dbcp2.managed.ManagedDataSource;
+import org.apache.commons.dbcp2.managed.TransactionRegistry;
+import org.apache.commons.pool2.ObjectPool;
-import org.apache.commons.pool.impl.GenericObjectPool;
+import org.apache.commons.pool2.impl.GenericObjectPool;
import org.ofbiz.base.util.Debug;
import java.sql.Connection;
@@ -35,9 +35,6 @@ public class DebugManagedDataSource exte
public static final String module = DebugManagedDataSource.class.getName();
- public DebugManagedDataSource() {
- super();
- }
public DebugManagedDataSource(ObjectPool pool, TransactionRegistry
transactionRegistry) {
super(pool, transactionRegistry);
}
@@ -45,11 +42,11 @@ public class DebugManagedDataSource exte
@Override
public Connection getConnection() throws SQLException {
if (Debug.verboseOn()) {
- if (super._pool instanceof GenericObjectPool) {
- GenericObjectPool objectPool = (GenericObjectPool)super._pool;
- Debug.logVerbose("Borrowing a connection from the pool;
used/total: " + objectPool.getNumActive() + "/" + objectPool.getNumActive() +
objectPool.getNumIdle() + "; min idle/max idle/max total: " +
objectPool.getMinIdle() + "/" + objectPool.getMaxIdle() + "/" +
objectPool.getMaxActive(), module);
+ if (super.getPool() instanceof GenericObjectPool) {
+ GenericObjectPool objectPool =
(GenericObjectPool)super.getPool();
+ Debug.logVerbose("Borrowing a connection from the pool;
used/idle/total: " + objectPool.getNumActive() + "/" + objectPool.getNumIdle()
+ "/" + (objectPool.getNumActive() + objectPool.getNumIdle()) + "; min idle/max
idle/max total: " + objectPool.getMinIdle() + "/" + objectPool.getMaxIdle() +
"/" + objectPool.getMaxTotal(), module);
} else {
- Debug.logVerbose("Borrowing a connection from the pool;
used/total: " + super._pool.getNumActive() + "/" + (super._pool.getNumActive()
+ super._pool.getNumIdle()), module);
+ Debug.logVerbose("Borrowing a connection from the pool;
used/idle/total: " + super.getPool().getNumActive() + "/" +
super.getPool().getNumIdle() + "/" + (super.getPool().getNumActive() +
super.getPool().getNumIdle()), module);
}
}
return super.getConnection();
@@ -57,14 +54,14 @@ public class DebugManagedDataSource exte
public Map<String, Object> getInfo() {
Map<String, Object> dataSourceInfo = new HashMap<String, Object>();
- dataSourceInfo.put("poolNumActive", super._pool.getNumActive());
- dataSourceInfo.put("poolNumIdle", super._pool.getNumIdle());
- dataSourceInfo.put("poolNumTotal", (super._pool.getNumIdle() +
super._pool.getNumActive()));
- if (super._pool instanceof GenericObjectPool) {
- GenericObjectPool objectPool = (GenericObjectPool)super._pool;
- dataSourceInfo.put("poolMaxActive", objectPool.getMaxActive());
+ dataSourceInfo.put("poolNumActive", super.getPool().getNumActive());
+ dataSourceInfo.put("poolNumIdle", super.getPool().getNumIdle());
+ dataSourceInfo.put("poolNumTotal", (super.getPool().getNumIdle() +
super.getPool().getNumActive()));
+ if (super.getPool() instanceof GenericObjectPool) {
+ GenericObjectPool objectPool = (GenericObjectPool)super.getPool();
+ dataSourceInfo.put("poolMaxActive", objectPool.getMaxTotal());
dataSourceInfo.put("poolMaxIdle", objectPool.getMaxIdle());
- dataSourceInfo.put("poolMaxWait", objectPool.getMaxWait());
+ dataSourceInfo.put("poolMaxWait", objectPool.getMaxWaitMillis());
dataSourceInfo.put("poolMinEvictableIdleTimeMillis",
objectPool.getMinEvictableIdleTimeMillis());
dataSourceInfo.put("poolMinIdle", objectPool.getMinIdle());
}
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java?rev=1614245&r1=1614244&r2=1614245&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/framework/minilang/src/org/ofbiz/minilang/method/envops/Iterate.java
Tue Jul 29 03:18:19 2014
@@ -155,8 +155,10 @@ public final class Iterate extends Metho
}
}
} else {
- if (Debug.verboseOn())
- Debug.logVerbose("Cannot iterate over a " +
objList.getClass().getName() + ", doing nothing: " + this, module);
+ if (Debug.verboseOn()) {
+ Debug.logVerbose("Cannot iterate over a " + objList == null ?
"null object" : objList.getClass().getName()
+ + ", doing nothing: " + this, module);
+ }
return true;
}
entryFma.put(methodContext.getEnvMap(), oldEntryValue);
Modified: ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/macros.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/macros.xml?rev=1614245&r1=1614244&r2=1614245&view=diff
==============================================================================
--- ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/macros.xml
(original)
+++ ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/macros.xml Tue Jul
29 03:18:19 2014
@@ -18,17 +18,17 @@ specific language governing permissions
under the License.
-->
<project name="Ant - Macros">
- <condition property="antatleast171">
- <antversion atleast="1.7.1"/>
- </condition>
- <fail unless="antatleast171" message="Please upgrade ant to at least 1.7.1"/>
+ <property name="minimumantversion" value="1.9.0"/>
+
+ <antversion property="antversion" atleast="${minimumantversion}"/>
+ <fail unless="antversion" message="Please upgrade ant to at least
${minimumantversion}. Current ant version is ${ant.version}"/>
<condition property="javaatleast17">
<not>
<matches pattern="^1\.[0-6]($|\..*)" string="${ant.java.version}"/>
</not>
</condition>
- <fail unless="javaatleast17" message="Please upgrade java to at least 1.7"/>
+ <fail unless="javaatleast17" message="Please upgrade java to at least 1.7.
Current Java version is ${ant.java.version}"/>
<dirname property="ofbiz.home.dir" file="${ant.file.Ant - Macros}"/>
<macrodef name="iterate">
@@ -56,9 +56,6 @@ under the License.
<path id="rhino.class.path">
<pathelement location="${ofbiz.home.dir}/extension/rhino/lib/js-1.7.R1.jar"/>
</path>
- <path id="ant.lib.class.path">
- <pathelement
location="${ofbiz.home.dir}/framework/base/lib/ant/ant-nodeps-1.7.1.jar"/>
- </path>
<path id="junit.class.path">
<fileset dir="${ofbiz.home.dir}/framework/base/lib/scripting/"
includes="*.jar"/>
<pathelement
location="${ofbiz.home.dir}/framework/base/lib/ant/ant-apache-bsf-1.7.1.jar"/>
@@ -120,7 +117,7 @@ under the License.
<exclude name="**/FreeMarkerViewRenderer.java"/>
<exclude name="**/JpCacheIncludeTransform.java"/>
</fileset>
- <link href="http://java.sun.com/javase/6/docs/api/"; offline="true"
packagelistLoc="${ofbiz.home.dir}/tools/api-java16"/>
+ <link href="http://java.sun.com/javase/7/docs/api/"; offline="true"
packagelistLoc="${ofbiz.home.dir}/tools/api-java17"/>
</javadoc>
</presetdef>
@@ -191,14 +188,11 @@ under the License.
</classpath>
</groovyc>
</presetdef>
-
<taskdef resource="net/sf/antcontrib/antlib.xml">
<classpath>
<pathelement
location="${ofbiz.home.dir}/framework/base/lib/ant/ant-contrib-1.0b3.jar"/>
</classpath>
</taskdef>
- <taskdef name="javacc"
classname="org.apache.tools.ant.taskdefs.optional.javacc.JavaCC"
classpath="${ofbiz.home.dir}/framework/base/lib/ant/ant-nodeps-1.7.1.jar"/>
- <taskdef name="jjtree"
classname="org.apache.tools.ant.taskdefs.optional.javacc.JJTree"
classpath="${ofbiz.home.dir}/framework/base/lib/ant/ant-nodeps-1.7.1.jar"/>
<macrodef name="ofbiz-javacc">
<attribute name="dir"/>
<attribute name="file"/>
@@ -226,39 +220,6 @@ under the License.
</sequential>
</macrodef>
- <macrodef name="ofbiz-jjtree">
- <attribute name="dir"/>
- <attribute name="file"/>
- <attribute name="prefix" default=""/>
- <sequential>
- <if>
- <not>
- <uptodate
- srcfile="@{prefix}src/@{dir}/@{file}.jjt"
- targetfile="@{prefix}build/gen-src/jjtree/@{dir}/@{file}.jj"/>
- </not>
- <delete dir="@{prefix}build/gen-src/jjtree/@{dir}"/>
- <mkdir dir="@{prefix}build/gen-src/jjtree/@{dir}"/>
- <jjtree target="@{prefix}src/@{dir}/@{file}.jjt"
- javacchome="${ofbiz.home.dir}/lib/build/javacc"
- outputdirectory="@{prefix}build/gen-src/jjtree/@{dir}"/>
- </if>
- <if>
- <not>
- <uptodate
- srcfile="@{prefix}build/gen-src/jjtree/@{dir}/@{file}.jj"
- targetfile="@{prefix}build/gen-src/javacc/@{dir}/@{file}.java"/>
- </not>
- <delete dir="@{prefix}build/gen-src/javacc/@{dir}"/>
- <mkdir dir="@{prefix}build/gen-src/javacc/@{dir}"/>
- <javacc target="@{prefix}build/gen-src/jjtree/@{dir}/@{file}.jj"
- javacchome="${ofbiz.home.dir}/lib/build/javacc"
- outputdirectory="@{prefix}build/gen-src/javacc/@{dir}"/>
- <delete dir="@{prefix}build/classes/@{dir}"/>
- </if>
- </sequential>
- </macrodef>
-
<presetdef name="externalsubant">
<subant inheritall="false">
<propertyset>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/CustomerScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/CustomerScreens.xml?rev=1614245&r1=1614244&r2=1614245&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/CustomerScreens.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/CustomerScreens.xml
Tue Jul 29 03:18:19 2014
@@ -553,7 +553,7 @@ under the License.
<property-map resource="SecurityextUiLabels"
map-name="uiLabelMap" global="true"/>
<set field="titleProperty" value="PageTitleNewCustomer"/>
<set field="layoutSettings.javaScripts[]"
value="/ecommerce/images/profile.js" global="true"/>
- <set field="layoutSettings.javaScripts[]"
value="/ordermgr/images/js/geoAutoCompleter.js" global="true"/>
+ <set field="layoutSettings.javaScripts[]"
value="/ordermgr-js/geoAutoCompleter.js" global="true"/>
</actions>
<widgets>
<decorator-screen name="main-decorator"
location="${parameters.mainDecoratorLocation}">
@@ -616,7 +616,7 @@ under the License.
<set field="partyId" from-field="userLogin.partyId"/>
<set field="layoutSettings.javaScripts[]"
value="/ecommerce/images/profile.js" global="true"/>
- <set field="layoutSettings.javaScripts[]"
value="/ordermgr/images/js/geoAutoCompleter.js" global="true"/>
+ <set field="layoutSettings.javaScripts[]"
value="/ordermgr-js/geoAutoCompleter.js" global="true"/>
<script
location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditShippingAddress.groovy"/>
<script
location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditBillingAddress.groovy"/>
<script
location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/ViewProfile.groovy"/>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/OrderScreens.xml
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/OrderScreens.xml?rev=1614245&r1=1614244&r2=1614245&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/OrderScreens.xml
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/specialpurpose/ecommerce/widget/OrderScreens.xml
Tue Jul 29 03:18:19 2014
@@ -612,7 +612,7 @@ under the License.
<actions>
<set field="titleProperty" value="EcommerceOnePageCheckout"/>
<set field="layoutSettings.javaScripts[]"
value="/ecommerce/images/checkoutProcess.js" global="true"/>
- <set field="layoutSettings.javaScripts[]"
value="/ordermgr/images/js/geoAutoCompleter.js" global="true"/>
+ <set field="layoutSettings.javaScripts[]"
value="/ordermgr-js/geoAutoCompleter.js" global="true"/>
<script
location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditShippingAddress.groovy"/>
<script
location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditBillingAddress.groovy"/>
<script
location="component://ecommerce/webapp/ecommerce/WEB-INF/actions/customer/EditEmailAndTelecomNumber.groovy"/>
Modified:
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/demo-backup/all-manual.sh
URL:
http://svn.apache.org/viewvc/ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/demo-backup/all-manual.sh?rev=1614245&r1=1614244&r2=1614245&view=diff
==============================================================================
---
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/demo-backup/all-manual.sh
(original)
+++
ofbiz/branches/OFBIZ-5312-ofbiz-ecommerce-seo-2013-10-23/tools/demo-backup/all-manual.sh
Tue Jul 29 03:18:19 2014
@@ -31,4 +31,4 @@ cd /home/ofbizDemo/branch12.4
sleep 10
nohup tools/startofbiz.sh &
-cd /home/ofbiz
\ No newline at end of file
+cd /home/ofbizDemo
\ No newline at end of file
