svn commit: r1301889 [1/3] - in /ofbiz/branches/release10.04: applications/accounting/src/or
Locked
svn commit: r1301889 [1/3] - in /ofbiz/branches/release10.04: applications/accounting/src/or
 
|
Author: ashish
Date: Sat Mar 17 08:33:34 2012 New Revision: 1301889 URL: http://svn.apache.org/viewvc?rev=1301889&view=rev Log: Bug fix back ported from trunk r1300463. For more details please refer discussion done on developer mailing list with subject line 'svn commit: r1300463 [1/3] - in /ofbiz/trunk: applications/accounting/src/org/ofbiz/accounting/finaccount/ applications/accounting/src/org/ofbiz/accounting/invoice/ applications/accounting/src/org/ofbiz/accounting/payment/ applications/accountin' Log Message from trunk:On production systems you can't suppress Debug.log( message by the use of debug.properties file. It is always good to use Debug.* statements that are having log level setup in debug.properties file. The real problem comes with Debug.log( statement when you are printing any list or map object that contains so many records(or data) in it. Here I am changing all the occurrence of Debug.log( with Debug.logInfo(, Debug.logError( or Debug.logWarning( so that we can have better control of Debug.* statements on production system. :-) Modified: ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountServices.java ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/PcChargeServices.java ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaServices.java ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/ConvertTree.java ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/cms/CmsEvents.java ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/data/DataEvents.java ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/view/SimpleContentViewHandler.java ofbiz/branches/release10.04/applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/order/OrderServices.java ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/thirdparty/paypal/ExpressCheckoutEvents.java ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java ofbiz/branches/release10.04/applications/party/src/org/ofbiz/party/party/PartyWorker.java ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/category/CategoryWorker.java ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/feature/ProductFeatureServices.java ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/product/ProductWorker.java ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/packing/PackingServices.java ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/packing/PackingSessionLine.java ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/picklist/PickListServices.java ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsMockApiServlet.java ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java ofbiz/branches/release10.04/applications/securityext/src/org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java ofbiz/branches/release10.04/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java ofbiz/branches/release10.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java ofbiz/branches/release10.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java ofbiz/branches/release10.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java ofbiz/branches/release10.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreCategoryFacade.java ofbiz/branches/release10.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java ofbiz/branches/release10.04/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java ofbiz/branches/release10.04/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java ofbiz/branches/release10.04/specialpurpose/ldap/src/org/ofbiz/ldap/LdapLoginWorker.java ofbiz/branches/release10.04/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java ofbiz/branches/release10.04/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java ofbiz/branches/release10.04/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java ofbiz/branches/release10.04/specialpurpose/pos/src/org/ofbiz/pos/component/PosButton.java ofbiz/branches/release10.04/specialpurpose/pos/src/org/ofbiz/pos/component/PosButtonWrapper.java ofbiz/branches/release10.04/specialpurpose/pos/src/org/ofbiz/pos/config/ButtonEventConfig.java ofbiz/branches/release10.04/specialpurpose/pos/src/org/ofbiz/pos/device/impl/CashDrawer.java ofbiz/branches/release10.04/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Keyboard.java ofbiz/branches/release10.04/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Msr.java ofbiz/branches/release10.04/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java ofbiz/branches/release10.04/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java ofbiz/branches/release10.04/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java ofbiz/branches/release10.04/specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java ofbiz/branches/release10.04/specialpurpose/pos/src/org/ofbiz/pos/event/TestEvents.java ofbiz/branches/release10.04/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/KeyboardService.java ofbiz/branches/release10.04/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullPosPrinter.java ofbiz/branches/release10.04/specialpurpose/pos/src/org/ofbiz/pos/screen/ClientProfile.java ofbiz/branches/release10.04/specialpurpose/pos/src/org/ofbiz/pos/screen/LoadSale.java ofbiz/branches/release10.04/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java ofbiz/branches/release10.04/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java ofbiz/branches/release10.04/specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java ofbiz/branches/release10.04/specialpurpose/shark/src/org/ofbiz/shark/audit/EntityAuditMgr.java ofbiz/branches/release10.04/specialpurpose/shark/src/org/ofbiz/shark/instance/Activity.java ofbiz/branches/release10.04/specialpurpose/shark/src/org/ofbiz/shark/instance/ActivityVariable.java ofbiz/branches/release10.04/specialpurpose/shark/src/org/ofbiz/shark/instance/Assignment.java ofbiz/branches/release10.04/specialpurpose/shark/src/org/ofbiz/shark/instance/EntityPersistentMgr.java ofbiz/branches/release10.04/specialpurpose/shark/src/org/ofbiz/shark/instance/Process.java ofbiz/branches/release10.04/specialpurpose/shark/src/org/ofbiz/shark/instance/ProcessMgr.java ofbiz/branches/release10.04/specialpurpose/shark/src/org/ofbiz/shark/instance/ProcessVariable.java ofbiz/branches/release10.04/specialpurpose/shark/src/org/ofbiz/shark/instance/Resource.java ofbiz/branches/release10.04/specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityParticipantMap.java ofbiz/branches/release10.04/specialpurpose/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java ofbiz/branches/release10.04/specialpurpose/shark/src/org/ofbiz/shark/requester/LoggingRequester.java ofbiz/branches/release10.04/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java Modified: ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java?rev=1301889&r1=1301888&r2=1301889&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java (original) +++ ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountPaymentServices.java Sat Mar 17 08:33:34 2012 @@ -623,7 +623,7 @@ public class FinAccountPaymentServices { if ((finAccount.getTimestamp("thruDate") != null) && (finAccount.getTimestamp("thruDate").before(UtilDateTime.nowTimestamp()))) { return ServiceUtil.returnError("Financial account has expired as of " + finAccount.getTimestamp("thruDate")); } - Debug.log("Deposit into financial account #" + finAccountId + " [" + amount + "]", module); + Debug.logInfo("Deposit into financial account #" + finAccountId + " [" + amount + "]", module); // get the previous balance BigDecimal previousBalance = finAccount.getBigDecimal("actualBalance"); Modified: ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountServices.java?rev=1301889&r1=1301888&r2=1301889&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountServices.java (original) +++ ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/finaccount/FinAccountServices.java Sat Mar 17 08:33:34 2012 @@ -272,7 +272,7 @@ public class FinAccountServices { } String statusId = finAccount.getString("statusId"); - Debug.log("FinAccount Balance [" + balance + "] Available [" + availableBalance + "] - Status: " + statusId, module); + Debug.logInfo("FinAccount Balance [" + balance + "] Available [" + availableBalance + "] - Status: " + statusId, module); Map<String, Object> result = ServiceUtil.returnSuccess(); result.put("availableBalance", availableBalance); Modified: ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java?rev=1301889&r1=1301888&r2=1301889&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java (original) +++ ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/invoice/InvoiceServices.java Sat Mar 17 08:33:34 2012 @@ -2122,7 +2122,7 @@ public class InvoiceServices { } } } else { - Debug.log("No payments found for Invoice #" + invoiceId, module); + Debug.logInfo("No payments found for Invoice #" + invoiceId, module); } return ServiceUtil.returnSuccess(); Modified: ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java?rev=1301889&r1=1301888&r2=1301889&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java (original) +++ ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/payment/GiftCertificateServices.java Sat Mar 17 08:33:34 2012 @@ -148,7 +148,7 @@ public class GiftCertificateServices { result.put("processResult", Boolean.TRUE); result.put("responseCode", "1"); result.put("referenceNum", refNum); - Debug.log("Create GC Result - " + result, module); + Debug.logInfo("Create GC Result - " + result, module); return result; } @@ -230,7 +230,7 @@ public class GiftCertificateServices { result.put("processResult", Boolean.TRUE); result.put("responseCode", "1"); result.put("referenceNum", refNum); - Debug.log("Add Funds GC Result - " + result, module); + Debug.logInfo("Add Funds GC Result - " + result, module); return result; } @@ -307,7 +307,7 @@ public class GiftCertificateServices { result.put("processResult", procResult); result.put("responseCode", "2"); result.put("referenceNum", refNum); - Debug.log("Redeem GC Result - " + result, module); + Debug.logInfo("Redeem GC Result - " + result, module); return result; } @@ -335,7 +335,7 @@ public class GiftCertificateServices { Map result = ServiceUtil.returnSuccess(); result.put("balance", balance); - Debug.log("GC Balance Result - " + result, module); + Debug.logInfo("GC Balance Result - " + result, module); return result; } @@ -1257,7 +1257,7 @@ public class GiftCertificateServices { } if (finAccount != null) { String dbPin = finAccount.getString("finAccountCode"); - Debug.log("GC Pin Validation: [Sent: " + pinNumber + "] [Actual: " + dbPin + "]", module); + Debug.logInfo("GC Pin Validation: [Sent: " + pinNumber + "] [Actual: " + dbPin + "]", module); if (dbPin != null && dbPin.equals(pinNumber)) { return true; } Modified: ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java?rev=1301889&r1=1301888&r2=1301889&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java (original) +++ ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/payment/PaymentGatewayServices.java Sat Mar 17 08:33:34 2012 @@ -2077,9 +2077,9 @@ public class PaymentGatewayServices { } if (amount.compareTo(ZERO) == 0) { amount = paymentPreference.getBigDecimal("maxAmount"); - Debug.log("resetting payment amount from 0.00 to correctMax amount", module); + Debug.logInfo("resetting payment amount from 0.00 to correctMax amount", module); } - Debug.log("reauth with amount: " + amount, module); + Debug.logInfo("reauth with amount: " + amount, module); // first re-auth the card Map<String, Object> authPayRes = authPayment(dispatcher, userLogin, orh, paymentPreference, amount, true, null); @@ -2523,7 +2523,7 @@ public class PaymentGatewayServices { Debug.logError(e, "Problem creating Payment", module); return ServiceUtil.returnError("Problem creating Payment"); } - //Debug.log("Payment created : " + paymentId, module); + //Debug.logInfo("Payment created : " + paymentId, module); if (paymentId == null) { return ServiceUtil.returnError("Create payment failed"); @@ -3534,7 +3534,7 @@ public class PaymentGatewayServices { cal.setTimeInMillis(txStamp.getTime()); cal.add(Calendar.MINUTE, 2); Timestamp twoMinAfter = new Timestamp(cal.getTimeInMillis()); - Debug.log("Re-Auth Capture Test : Tx Date - " + txStamp + " : 2 Min - " + twoMinAfter + " : Now - " + nowStamp, module); + Debug.logInfo("Re-Auth Capture Test : Tx Date - " + txStamp + " : 2 Min - " + twoMinAfter + " : Now - " + nowStamp, module); if (nowStamp.after(twoMinAfter)) { result.put("captureResult", Boolean.FALSE); Modified: ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java?rev=1301889&r1=1301888&r2=1301889&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java (original) +++ ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/payment/PaymentMethodServices.java Sat Mar 17 08:33:34 2012 @@ -288,14 +288,14 @@ public class PaymentMethodServices { if (updatedCardNumber.startsWith("*")) { // get the masked card number from the db String origCardNumber = creditCard.getString("cardNumber"); - Debug.log("CCInfo: " + creditCard.toString(), module); + Debug.logInfo("CCInfo: " + creditCard.toString(), module); String origMaskedNumber = ""; int cardLength = origCardNumber.length() - 4; for (int i = 0; i < cardLength; i++) { origMaskedNumber = origMaskedNumber + "*"; } origMaskedNumber = origMaskedNumber + origCardNumber.substring(cardLength); - Debug.log(origMaskedNumber); + Debug.logInfo(origMaskedNumber, module); // compare the two masked numbers if (updatedCardNumber.equals(origMaskedNumber)) { @@ -564,7 +564,7 @@ public class PaymentMethodServices { if (cardNumber.startsWith("*")) { // get the masked card number from the db String origCardNumber = giftCard.getString("cardNumber"); - //Debug.log(origCardNumber); + //Debug.logInfo(origCardNumber); String origMaskedNumber = ""; int cardLength = origCardNumber.length() - 4; if (cardLength > 0) { Modified: ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java?rev=1301889&r1=1301888&r2=1301889&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java (original) +++ ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/tax/TaxAuthorityServices.java Sat Mar 17 08:33:34 2012 @@ -454,7 +454,7 @@ public class TaxAuthorityServices { UtilMisc.toList("-fromDate")); taxAuthorityAssocList = EntityUtil.filterByDate(taxAuthorityAssocList, true); GenericValue taxAuthorityAssoc = EntityUtil.getFirst(taxAuthorityAssocList); - // Debug.log("Parent assoc to " + taxAuthGeoId + " : " + taxAuthorityAssoc, module); + // Debug.logInfo("Parent assoc to " + taxAuthGeoId + " : " + taxAuthorityAssoc, module); if (taxAuthorityAssoc != null) { handlePartyTaxExempt(adjValue, billToPartyIdSet, taxAuthorityAssoc.getString("taxAuthGeoId"), taxAuthorityAssoc.getString("taxAuthPartyId"), taxAmount, nowTimestamp, delegator); } Modified: ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java?rev=1301889&r1=1301888&r2=1301889&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java (original) +++ ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/clearcommerce/CCPaymentServices.java Sat Mar 17 08:33:34 2012 @@ -787,7 +787,7 @@ public class CCPaymentServices { GenericValue countryGeo = address.getRelatedOneCache("CountryGeo"); UtilXml.addChildElementValue(addressElement, "Country", countryGeo.getString("geoSecCode"), document); } catch (GenericEntityException gee) { - Debug.log(gee, "Error finding related Geo for countryGeoId: " + countryGeoId, module); + Debug.logInfo(gee, "Error finding related Geo for countryGeoId: " + countryGeoId, module); } } } @@ -901,7 +901,7 @@ public class CCPaymentServices { try { response = http.post(); } catch (HttpClientException hce) { - Debug.log(hce, module); + Debug.logInfo(hce, module); throw new ClearCommerceException("ClearCommerce connection problem", hce); } Modified: ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java?rev=1301889&r1=1301888&r2=1301889&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java (original) +++ ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/cybersource/IcsPaymentServices.java Sat Mar 17 08:33:34 2012 @@ -264,7 +264,7 @@ public class IcsPaymentServices { if (UtilValidate.isNotEmpty(keysFile)) { props.put("alternateKeyFilename", keysFile); } - Debug.log("Created CyberSource Properties : " + props, module); + Debug.logInfo("Created CyberSource Properties : " + props, module); return props; } Modified: ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/PcChargeServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/PcChargeServices.java?rev=1301889&r1=1301888&r2=1301889&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/PcChargeServices.java (original) +++ ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/PcChargeServices.java Sat Mar 17 08:33:34 2012 @@ -421,7 +421,7 @@ public class PcChargeServices { props.put("host", host); props.put("port", port); props.put("autoBill", autoBill); - Debug.log("Returning properties - " + props, module); + Debug.logInfo("Returning properties - " + props, module); return props; } Modified: ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java?rev=1301889&r1=1301888&r2=1301889&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java (original) +++ ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaApi.java Sat Mar 17 08:33:34 2012 @@ -176,7 +176,7 @@ public class RitaApi { if (mode == MODE_IN) { String stream = this.toString() + "..\r\n"; - Debug.log("Sending - \n" + stream, module); + Debug.logInfo("Sending - \n" + stream, module); String urlString = "http://" + host + ":" + port; HttpClient http = new HttpClient(urlString); http.setDebug(true); @@ -204,7 +204,7 @@ public class RitaApi { // read the response while ((line = br.readLine()) != null) { - Debug.log(line, module); + Debug.logInfo(line, module); if (!line.trim().equals(".")) { String[] lineSplit = line.trim().split(" "); if (lineSplit != null && lineSplit.length == 2) { @@ -216,7 +216,7 @@ public class RitaApi { break; } } - Debug.log("Reading finished.", module); + Debug.logInfo("Reading finished.", module); // send session finished signal ps.print("..\r\n"); @@ -238,7 +238,7 @@ public class RitaApi { String[] lines = resp.split("\n"); for (int i = 0; i < lines.length; i++) { - Debug.log(lines[i], module); + Debug.logInfo(lines[i], module); if (!lines[i].trim().equals(".")) { String[] lineSplit = lines[i].trim().split(" ", 2); if (lineSplit != null && lineSplit.length == 2) { Modified: ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaServices.java?rev=1301889&r1=1301888&r2=1301889&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaServices.java (original) +++ ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/gosoftware/RitaServices.java Sat Mar 17 08:33:34 2012 @@ -80,7 +80,7 @@ public class RitaServices { // send the transaction RitaApi out = null; try { - Debug.log("Sending request to RiTA", module); + Debug.logInfo("Sending request to RiTA", module); out = api.send(); } catch (IOException e) { Debug.logError(e, module); @@ -522,7 +522,7 @@ public class RitaServices { props.put("ssl", ssl); props.put("autoBill", autoBill); props.put("forceTx", forceTx); - Debug.log("Returning properties - " + props, module); + Debug.logInfo("Returning properties - " + props, module); return props; } Modified: ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java?rev=1301889&r1=1301888&r2=1301889&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java (original) +++ ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/orbital/OrbitalPaymentServices.java Sat Mar 17 08:33:34 2012 @@ -362,9 +362,9 @@ public class OrbitalPaymentServices { //Display the request if ("AUTH_ONLY".equals(transType)) { - Debug.log("\nAuth Request:\n ======== " + request.getXML()); + Debug.logInfo("\nAuth Request:\n ======== " + request.getXML()); } else if ("AUTH_CAPTURE".equals(transType)) { - Debug.log("\nAuth Capture Request:\n ======== " + request.getXML()); + Debug.logInfo("\nAuth Capture Request:\n ======== " + request.getXML()); } results.put("processAmount", amount); } catch (InitializationException ie) { @@ -404,7 +404,7 @@ public class OrbitalPaymentServices { } } //Display the request - Debug.log("\nCapture Request:\n ======== " + request.getXML()); + Debug.logInfo("\nCapture Request:\n ======== " + request.getXML()); results.put("captureAmount", amount); } catch (InitializationException ie) { Debug.logInfo("Unable to initialize request object", module); @@ -436,7 +436,7 @@ public class OrbitalPaymentServices { request.setFieldValue("Exp", UtilFormatOut.checkNull(expDate)); request.setFieldValue("Comments", "This is a credit card refund"); - Debug.log("\nRefund Request:\n ======== " + request.getXML()); + Debug.logInfo("\nRefund Request:\n ======== " + request.getXML()); results.put("refundAmount", amount); } catch (InitializationException ie) { Debug.logInfo("Unable to initialize request object", module); @@ -460,7 +460,7 @@ public class OrbitalPaymentServices { request.setFieldValue("OrderID", UtilFormatOut.checkNull(orderId)); //Display the request - Debug.log("\nRelease Request:\n ======== " + request.getXML()); + Debug.logInfo("\nRelease Request:\n ======== " + request.getXML()); results.put("releaseAmount", amount); } catch (InitializationException ie) { Debug.logInfo("Unable to initialize request object", module); Modified: ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java?rev=1301889&r1=1301888&r2=1301889&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java (original) +++ ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/paypal/PayPalServices.java Sat Mar 17 08:33:34 2012 @@ -578,7 +578,7 @@ public class PayPalServices { } } catch (GenericServiceException e) { // Not the end of the world, we'll carry on - Debug.log(e.getMessage()); + Debug.logInfo(e.getMessage()); } } Modified: ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java?rev=1301889&r1=1301888&r2=1301889&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java (original) +++ ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/sagepay/SagePayUtil.java Sat Mar 17 08:33:34 2012 @@ -152,7 +152,7 @@ public class SagePayUtil } } } - Debug.log("SagePay Response Data : " + responseData); + Debug.logInfo("SagePay Response Data : " + responseData, module); return responseData; } @@ -173,7 +173,7 @@ public class SagePayUtil postParameters.add(new BasicNameValuePair(key, value)); } - Debug.log("SagePay PostParameters - " + postParameters); + Debug.logInfo("SagePay PostParameters - " + postParameters, module); HttpEntity postEntity = new UrlEncodedFormEntity(postParameters); httpPost.setEntity(postEntity); Modified: ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java?rev=1301889&r1=1301888&r2=1301889&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java (original) +++ ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkApi.java Sat Mar 17 08:33:34 2012 @@ -102,9 +102,9 @@ public class ValueLinkApi { } if (debug) { - Debug.log("New ValueLinkApi instance created", module); - Debug.log("Merchant ID : " + merchantId, module); - Debug.log("Terminal ID : " + terminalId, module); + Debug.logInfo("New ValueLinkApi instance created", module); + Debug.logInfo("Merchant ID : " + merchantId, module); + Debug.logInfo("Terminal ID : " + terminalId, module); } } @@ -192,7 +192,7 @@ public class ValueLinkApi { } if (debug) { - Debug.log("encryptPin : " + pin + " / " + encryptedEanHex, module); + Debug.logInfo("encryptPin : " + pin + " / " + encryptedEanHex, module); } return encryptedEanHex; @@ -222,7 +222,7 @@ public class ValueLinkApi { } if (debug) { - Debug.log("decryptPin : " + pin + " / " + decryptedPinString, module); + Debug.logInfo("decryptPin : " + pin + " / " + decryptedPinString, module); } return decryptedPinString; @@ -247,7 +247,7 @@ public class ValueLinkApi { */ public Map send(String url, Map request) throws HttpClientException { if (debug) { - Debug.log("Request : " + url + " / " + request, module); + Debug.logInfo("Request : " + url + " / " + request, module); } // read the timeout value @@ -312,7 +312,7 @@ public class ValueLinkApi { return this.outputKeyCreation(loop, kekOnly, kekTest); } } else { - Debug.log("Returned a null KeyPair", module); + Debug.logInfo("Returned a null KeyPair", module); return this.outputKeyCreation(loop, kekOnly, kekTest); } } else { @@ -409,7 +409,7 @@ public class ValueLinkApi { // initialize the parameter spec DHPublicKey publicKey = (DHPublicKey) this.getValueLinkPublicKey(); DHParameterSpec dhParamSpec = publicKey.getParams(); - //Debug.log(dhParamSpec.getP().toString() + " / " + dhParamSpec.getG().toString(), module); + //Debug.logInfo(dhParamSpec.getP().toString() + " / " + dhParamSpec.getG().toString(), module); // create the public/private key pair using parameters defined by valuelink KeyPairGenerator keyGen = KeyPairGenerator.getInstance("DH"); @@ -438,7 +438,7 @@ public class ValueLinkApi { byte[] secretKey = ka.generateSecret(); if (debug) { - Debug.log("Secret Key : " + StringUtil.toHexString(secretKey) + " / " + secretKey.length, module); + Debug.logInfo("Secret Key : " + StringUtil.toHexString(secretKey) + " / " + secretKey.length, module); } // generate 3DES from secret key using VL algorithm (KEK) @@ -449,7 +449,7 @@ public class ValueLinkApi { byte[] kek = copyBytes(des2, first8, 0); if (debug) { - Debug.log("Generated KEK : " + StringUtil.toHexString(kek) + " / " + kek.length, module); + Debug.logInfo("Generated KEK : " + StringUtil.toHexString(kek) + " / " + kek.length, module); } return kek; @@ -530,7 +530,7 @@ public class ValueLinkApi { byte[] des3 = copyBytes(desByte1, copyBytes(desByte2, desByte3, 0), 0); return generateMwk(des3); } else { - Debug.log("Null DES keys returned", module); + Debug.logInfo("Null DES keys returned", module); } return null; @@ -543,7 +543,7 @@ public class ValueLinkApi { */ public byte[] generateMwk(byte[] desBytes) { if (debug) { - Debug.log("DES Key : " + StringUtil.toHexString(desBytes) + " / " + desBytes.length, module); + Debug.logInfo("DES Key : " + StringUtil.toHexString(desBytes) + " / " + desBytes.length, module); } SecretKeyFactory skf1 = null; SecretKey mwk = null; @@ -607,10 +607,10 @@ public class ValueLinkApi { newMwk = copyBytes(random, newMwk, 0); if (debug) { - Debug.log("Random 8 byte : " + StringUtil.toHexString(random), module); - Debug.log("Encrypted 0's : " + StringUtil.toHexString(encryptedZeros), module); - Debug.log("Decrypted MWK : " + StringUtil.toHexString(mwkdes3.getEncoded()) + " / " + mwkdes3.getEncoded().length, module); - Debug.log("Encrypted MWK : " + StringUtil.toHexString(newMwk) + " / " + newMwk.length, module); + Debug.logInfo("Random 8 byte : " + StringUtil.toHexString(random), module); + Debug.logInfo("Encrypted 0's : " + StringUtil.toHexString(encryptedZeros), module); + Debug.logInfo("Decrypted MWK : " + StringUtil.toHexString(mwkdes3.getEncoded()) + " / " + mwkdes3.getEncoded().length, module); + Debug.logInfo("Encrypted MWK : " + StringUtil.toHexString(newMwk) + " / " + newMwk.length, module); } return newMwk; @@ -658,7 +658,7 @@ public class ValueLinkApi { } if (debug) { - Debug.log("Current Working Key Index : " + this.mwkIndex, module); + Debug.logInfo("Current Working Key Index : " + this.mwkIndex, module); } return this.mwkIndex; @@ -729,7 +729,7 @@ public class ValueLinkApi { request.put("EncryptID", this.getWorkingKeyIndex()); if (debug) { - Debug.log("Created Initial Request Map : " + request, module); + Debug.logInfo("Created Initial Request Map : " + request, module); } return request; @@ -841,8 +841,8 @@ public class ValueLinkApi { } if (debug) { - Debug.log("Raw MWK : " + StringUtil.toHexString(getMwk()), module); - Debug.log("MWK : " + StringUtil.toHexString(mwk.getEncoded()), module); + Debug.logInfo("Raw MWK : " + StringUtil.toHexString(getMwk()), module); + Debug.logInfo("MWK : " + StringUtil.toHexString(mwk.getEncoded()), module); } return mwk; @@ -854,8 +854,8 @@ public class ValueLinkApi { } if (debug) { - Debug.log("Raw KEK : " + StringUtil.toHexString(getKek()), module); - Debug.log("KEK : " + StringUtil.toHexString(kek.getEncoded()), module); + Debug.logInfo("Raw KEK : " + StringUtil.toHexString(getKek()), module); + Debug.logInfo("KEK : " + StringUtil.toHexString(kek.getEncoded()), module); } return kek; @@ -908,7 +908,7 @@ public class ValueLinkApi { protected Map parseResponse(String response) { if (debug) { - Debug.log("Raw Response : " + response, module); + Debug.logInfo("Raw Response : " + response, module); } // covert to all lowercase and trim off the html header @@ -956,7 +956,7 @@ public class ValueLinkApi { } if (debug) { - Debug.log("Response Map : " + responseMap, module); + Debug.logInfo("Response Map : " + responseMap, module); } return responseMap; @@ -964,7 +964,7 @@ public class ValueLinkApi { private List parseHistoryResponse(String response) { if (debug) { - Debug.log("Raw History : " + response, module); + Debug.logInfo("Raw History : " + response, module); } // covert to all lowercase and trim off the html header @@ -984,7 +984,7 @@ public class ValueLinkApi { testResponse = testResponse.trim(); if (testResponse.length() == 0) { if (debug) { - Debug.log("History did not contain any fields, returning null", module); + Debug.logInfo("History did not contain any fields, returning null", module); } return null; } @@ -1005,7 +1005,7 @@ public class ValueLinkApi { } if (debug) { - Debug.log("History Map : " + valueMap, module); + Debug.logInfo("History Map : " + valueMap, module); } return valueMap; Modified: ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java?rev=1301889&r1=1301888&r2=1301889&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java (original) +++ ofbiz/branches/release10.04/applications/accounting/src/org/ofbiz/accounting/thirdparty/valuelink/ValueLinkServices.java Sat Mar 17 08:33:34 2012 @@ -64,11 +64,11 @@ public class ValueLinkServices { Boolean kekOnly = context.get("kekOnly") != null ? (Boolean) context.get("kekOnly") : Boolean.FALSE; String kekTest = (String) context.get("kekTest"); - Debug.log("KEK Only : " + kekOnly.booleanValue(), module); + Debug.logInfo("KEK Only : " + kekOnly.booleanValue(), module); StringBuffer buf = vl.outputKeyCreation(kekOnly.booleanValue(), kekTest); String output = buf.toString(); - Debug.log(":: Key Generation Output ::\n\n" + output, module); + Debug.logInfo(":: Key Generation Output ::\n\n" + output, module); Map result = ServiceUtil.returnSuccess(); result.put("output", output); @@ -118,7 +118,7 @@ public class ValueLinkServices { buf.append("======== End Test Bytes ").append(desc).append(" ========\n\n"); String output = buf.toString(); - Debug.log(":: KEK Test Output ::\n\n" + output, module); + Debug.logInfo(":: KEK Test Output ::\n\n" + output, module); Map result = ServiceUtil.returnSuccess(); result.put("output", output); @@ -163,7 +163,7 @@ public class ValueLinkServices { Debug.logError(e, "Problem communicating with VL"); return ServiceUtil.returnError("Unable to update MWK"); } - Debug.log("Response : " + response, module); + Debug.logInfo("Response : " + response, module); // on success update the database / reload the cached api if (response != null) { @@ -261,7 +261,7 @@ public class ValueLinkServices { result.put("expireDate", response.get("expiredate")); result.put("cardClass", response.get("cardclass")); result.put("referenceNum", response.get("traceno")); - Debug.log("Activate Result : " + result, module); + Debug.logInfo("Activate Result : " + result, module); return result; } else { return ServiceUtil.returnError("Empty response returned from ValueLink"); @@ -315,7 +315,7 @@ public class ValueLinkServices { result.put("expireDate", response.get("expiredate")); result.put("cardClass", response.get("cardclass")); result.put("referenceNum", response.get("traceno")); - Debug.log("Link Result : " + result, module); + Debug.logInfo("Link Result : " + result, module); return result; } else { return ServiceUtil.returnError("Empty response returned from ValueLink"); @@ -371,7 +371,7 @@ public class ValueLinkServices { result.put("expireDate", response.get("expiredate")); result.put("cardClass", response.get("cardclass")); result.put("referenceNum", response.get("traceno")); - Debug.log("Disable Result : " + result, module); + Debug.logInfo("Disable Result : " + result, module); return result; } else { return ServiceUtil.returnError("Empty response returned from ValueLink"); @@ -438,7 +438,7 @@ public class ValueLinkServices { result.put("cardClass", response.get("cardclass")); result.put("cashBack", vl.getAmount((String) response.get("cashback"))); result.put("referenceNum", response.get("traceno")); - Debug.log("Redeem Result : " + result, module); + Debug.logInfo("Redeem Result : " + result, module); return result; } else { return ServiceUtil.returnError("Empty response returned from ValueLink"); @@ -504,7 +504,7 @@ public class ValueLinkServices { result.put("expireDate", response.get("expiredate")); result.put("cardClass", response.get("cardclass")); result.put("referenceNum", response.get("traceno")); - Debug.log("Reload Result : " + result, module); + Debug.logInfo("Reload Result : " + result, module); return result; } else { return ServiceUtil.returnError("Empty response returned from ValueLink"); @@ -560,7 +560,7 @@ public class ValueLinkServices { result.put("expireDate", response.get("expiredate")); result.put("cardClass", response.get("cardclass")); result.put("referenceNum", response.get("traceno")); - Debug.log("Balance Result : " + result, module); + Debug.logInfo("Balance Result : " + result, module); return result; } else { return ServiceUtil.returnError("Empty response returned from ValueLink"); @@ -615,7 +615,7 @@ public class ValueLinkServices { result.put("expireDate", response.get("expiredate")); result.put("cardClass", response.get("cardclass")); result.put("referenceNum", response.get("traceno")); - Debug.log("History Result : " + result, module); + Debug.logInfo("History Result : " + result, module); return result; } else { return ServiceUtil.returnError("Empty response returned from ValueLink"); @@ -681,7 +681,7 @@ public class ValueLinkServices { result.put("expireDate", response.get("expiredate")); result.put("cardClass", response.get("cardclass")); result.put("referenceNum", response.get("traceno")); - Debug.log("Refund Result : " + result, module); + Debug.logInfo("Refund Result : " + result, module); return result; } else { return ServiceUtil.returnError("Empty response returned from ValueLink"); @@ -710,7 +710,7 @@ public class ValueLinkServices { public static Map timeOutReversal(DispatchContext dctx, Map context) { String vlInterface = (String) context.get("Interface"); - Debug.log("704 Interface : " + vlInterface, module); + Debug.logInfo("704 Interface : " + vlInterface, module); if (vlInterface != null) { if (vlInterface.startsWith("Activate")) { if (vlInterface.equals("Activate/Rollback")) { @@ -753,7 +753,7 @@ public class ValueLinkServices { ServiceXaWrapper xaw = new ServiceXaWrapper(dctx); xaw.setRollbackService("vlTimeOutReversal", context); //xaw.setCommitService("vlTimeOutReversal", context); - Debug.log("Set 704 context : " + context, module); + Debug.logInfo("Set 704 context : " + context, module); try { xaw.enlist(); } catch (XAException e) { Modified: ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/ConvertTree.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/ConvertTree.java?rev=1301889&r1=1301888&r2=1301889&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/ConvertTree.java (original) +++ ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/ConvertTree.java Sat Mar 17 08:33:34 2012 @@ -129,7 +129,7 @@ In order ta make this service active add contentName = "", contentNameInprogress = "", data = line.substring(3,size); - //Debug.log("======Data======"+data); + //Debug.logInfo("======Data======"+data); size = data.length(); List<GenericValue> contents = null; @@ -190,7 +190,7 @@ In order ta make this service active add delegator.create(Entity); hasFolder = false; } else { - //Debug.log("Content Name = [ "+contentId+"] already exist.");//ShoW log file + //Debug.logInfo("Content Name = [ "+contentId+"] already exist.");//ShoW log file hasFolder = true; } //Relation Content @@ -208,7 +208,7 @@ In order ta make this service active add dispatcher.runSync("createContentAssoc", contentAssoc); rootContent=contentId; } else { - //Debug.log("ContentAssoc [contentId= "+contentId+",contentIdTo="+rootContent+"] already exist.");//ShoW log file + //Debug.logInfo("ContentAssoc [contentId= "+contentId+",contentIdTo="+rootContent+"] already exist.");//ShoW log file rootContent=contentId; } contentName = ""; @@ -276,7 +276,7 @@ In order ta make this service active add boolean contentNameMatch = false; if (subContents.charAt(index) == check.charAt(0)) {//store data contentName = contentName + contentNameInprogress; - //Debug.log("subcontentName---->"+contentName); + //Debug.logInfo("subcontentName---->"+contentName); if (contentName.length()>100) { contentName = contentName.substring(0,100); } @@ -299,7 +299,7 @@ In order ta make this service active add Map<String,Object> data = FastMap.newInstance(); data.put("userLogin", userLogin); String dataResourceId = (dispatcher.runSync("createDataResource",data)).get("dataResourceId").toString(); - //Debug.log("==dataResourceId"+dataResourceId); + //Debug.logInfo("==dataResourceId"+dataResourceId); //create Content contentId = delegator.getNextSeqId("Content"); @@ -359,7 +359,7 @@ In order ta make this service active add Map<String,Object> data = FastMap.newInstance(); data.put("userLogin", userLogin); String dataResourceId = (dispatcher.runSync("createDataResource",data)).get("dataResourceId").toString(); - //Debug.log("==dataResourceId"+dataResourceId); + //Debug.logInfo("==dataResourceId"+dataResourceId); //create Content contentId = delegator.getNextSeqId("Content"); Modified: ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/cms/CmsEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/cms/CmsEvents.java?rev=1301889&r1=1301888&r2=1301889&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/cms/CmsEvents.java (original) +++ ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/cms/CmsEvents.java Sat Mar 17 08:33:34 2012 @@ -142,7 +142,7 @@ public class CmsEvents { if (pathInfo.endsWith("/")) { pathInfo = pathInfo.substring(0, pathInfo.length() - 1); } - Debug.log("Path INFO for Alias: " + pathInfo, module); + Debug.logInfo("Path INFO for Alias: " + pathInfo, module); GenericValue pathAlias = null; try { Modified: ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/data/DataEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/data/DataEvents.java?rev=1301889&r1=1301888&r2=1301889&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/data/DataEvents.java (original) +++ ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/data/DataEvents.java Sat Mar 17 08:33:34 2012 @@ -168,7 +168,7 @@ public class DataEvents { // hack for IE and mime types if (userAgent.indexOf("MSIE") > -1) { - Debug.log("Found MSIE changing mime type from - " + mimeType, module); + Debug.logInfo("Found MSIE changing mime type from - " + mimeType, module); mimeType = "application/octet-stream"; } @@ -201,7 +201,7 @@ public class DataEvents { stream = (InputStream) resourceData.get("stream"); length = (Long) resourceData.get("length"); } - Debug.log("Got resource data stream: " + length + " bytes", module); + Debug.logInfo("Got resource data stream: " + length + " bytes", module); // stream the content to the browser if (stream != null && length != null) { @@ -231,7 +231,7 @@ public class DataEvents { Delegator delegator = (Delegator) request.getAttribute("delegator"); Map<String, Object> parameters = UtilHttp.getParameterMap(request); - Debug.log("Img UserAgent - " + request.getHeader("User-Agent"), module); + Debug.logInfo("Img UserAgent - " + request.getHeader("User-Agent"), module); String dataResourceId = (String) parameters.get("imgId"); if (UtilValidate.isEmpty(dataResourceId)) { @@ -270,7 +270,7 @@ public class DataEvents { // hack for IE and mime types String userAgent = request.getHeader("User-Agent"); if (userAgent.indexOf("MSIE") > -1) { - Debug.log("Found MSIE changing mime type from - " + mimeType, module); + Debug.logInfo("Found MSIE changing mime type from - " + mimeType, module); mimeType = "application/octet-stream"; } Modified: ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java?rev=1301889&r1=1301888&r2=1301889&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java (original) +++ ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/data/DataResourceWorker.java Sat Mar 17 08:33:34 2012 @@ -536,7 +536,7 @@ public class DataResourceWorker impleme latestDir = makeNewDirectory(parent); } - Debug.log("Directory Name : " + latestDir.getName(), module); + Debug.logInfo("Directory Name : " + latestDir.getName(), module); return latestDir.getAbsolutePath().replace('\\','/'); } Modified: ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java?rev=1301889&r1=1301888&r2=1301889&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java (original) +++ ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/survey/PdfSurveyServices.java Sat Mar 17 08:33:34 2012 @@ -335,7 +335,7 @@ public class PdfSurveyServices { // Debug code to get the values for setting TDP // String[] sa = fs.getAppearanceStates("TDP"); // for (int i=0;i<sa.length;i++) - // Debug.log("Appearance="+sa[i]); + // Debug.logInfo("Appearance="+sa[i]); Iterator iter = map.keySet().iterator(); while (iter.hasNext()) { @@ -380,7 +380,7 @@ public class PdfSurveyServices { // Debug code to get the values for setting TDP // String[] sa = fs.getAppearanceStates("TDP"); // for (int i=0;i<sa.length;i++) - // Debug.log("Appearance="+sa[i]); + // Debug.logInfo("Appearance="+sa[i]); Iterator iter = map.keySet().iterator(); while (iter.hasNext()) { Modified: ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/view/SimpleContentViewHandler.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/view/SimpleContentViewHandler.java?rev=1301889&r1=1301888&r2=1301889&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/view/SimpleContentViewHandler.java (original) +++ ofbiz/branches/release10.04/applications/content/src/org/ofbiz/content/view/SimpleContentViewHandler.java Sat Mar 17 08:33:34 2012 @@ -131,7 +131,7 @@ public class SimpleContentViewHandler ex // hack for IE and mime types //String userAgent = request.getHeader("User-Agent"); //if (userAgent.indexOf("MSIE") > -1) { - // Debug.log("Found MSIE changing mime type from - " + mimeTypeId, module); + // Debug.logInfo("Found MSIE changing mime type from - " + mimeTypeId, module); // mimeTypeId = "application/octet-stream"; //} // setup chararcter encoding and content type Modified: ofbiz/branches/release10.04/applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java?rev=1301889&r1=1301888&r2=1301889&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java (original) +++ ofbiz/branches/release10.04/applications/marketing/src/org/ofbiz/marketing/marketing/MarketingServices.java Sat Mar 17 08:33:34 2012 @@ -92,11 +92,11 @@ public class MarketingServices { } } catch (GenericEntityException e) { String error = UtilProperties.getMessage(resourceOrder, "checkhelper.problems_reading_database", locale); - Debug.log(e, error + e.getMessage(), module); + Debug.logInfo(e, error + e.getMessage(), module); return ServiceUtil.returnError(error); } catch (GenericServiceException e) { String error = UtilProperties.getMessage(resourceMarketing, "MarketingServiceError", locale); - Debug.log(e, error + e.getMessage(), module); + Debug.logInfo(e, error + e.getMessage(), module); return ServiceUtil.returnError(error); } return ServiceUtil.returnSuccess(); Modified: ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java?rev=1301889&r1=1301888&r2=1301889&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java (original) +++ ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/order/OrderLookupServices.java Sat Mar 17 08:33:34 2012 @@ -553,7 +553,7 @@ public class OrderLookupServices { } if (Debug.verboseOn()) { - Debug.log("Find order query: " + cond.toString()); + Debug.logInfo("Find order query: " + cond.toString(), module); } List orderList = FastList.newInstance(); Modified: ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java?rev=1301889&r1=1301888&r2=1301889&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java (original) +++ ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/order/OrderReadHelper.java Sat Mar 17 08:33:34 2012 @@ -2443,7 +2443,7 @@ public class OrderReadHelper { while (itemIter != null && itemIter.hasNext()) { GenericValue orderItem = itemIter.next(); BigDecimal itemTotal = getOrderItemSubTotal(orderItem, adjustments); - // Debug.log("Item : " + orderItem.getString("orderId") + " / " + orderItem.getString("orderItemSeqId") + " = " + itemTotal, module); + // Debug.logInfo("Item : " + orderItem.getString("orderId") + " / " + orderItem.getString("orderItemSeqId") + " = " + itemTotal, module); if (workEfforts != null && orderItem.getString("orderItemTypeId").compareTo("RENTAL_ORDER_ITEM") == 0) { Iterator<GenericValue> weIter = UtilMisc.toIterator(workEfforts); @@ -2453,7 +2453,7 @@ public class OrderReadHelper { itemTotal = itemTotal.multiply(getWorkEffortRentalQuantity(workEffort)).setScale(scale, rounding); break; } -// Debug.log("Item : " + orderItem.getString("orderId") + " / " + orderItem.getString("orderItemSeqId") + " = " + itemTotal, module); +// Debug.logInfo("Item : " + orderItem.getString("orderId") + " / " + orderItem.getString("orderItemSeqId") + " = " + itemTotal, module); } } result = result.add(itemTotal).setScale(scale, rounding); Modified: ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java?rev=1301889&r1=1301888&r2=1301889&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java (original) +++ ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/order/OrderReturnServices.java Sat Mar 17 08:33:34 2012 @@ -133,7 +133,7 @@ public class OrderReturnServices { if (delegator == null || returnId == null || returnItemSeqId == null) { throw new IllegalArgumentException("Method parameters cannot contain nulls"); } - Debug.log("Finding the initial item cost for return item : " + returnId + " / " + returnItemSeqId, module); + Debug.logInfo("Finding the initial item cost for return item : " + returnId + " / " + returnItemSeqId, module); // the cost holder BigDecimal itemCost = BigDecimal.ZERO; @@ -146,14 +146,14 @@ public class OrderReturnServices { Debug.logError(e, module); throw new GeneralRuntimeException(e.getMessage()); } - Debug.log("Return item value object - " + returnItem, module); + Debug.logInfo("Return item value object - " + returnItem, module); // check for an orderItem association if (returnItem != null) { String orderId = returnItem.getString("orderId"); String orderItemSeqId = returnItem.getString("orderItemSeqId"); if (orderItemSeqId != null && orderId != null) { - Debug.log("Found order item reference", module); + Debug.logInfo("Found order item reference", module); // locate the item issuance(s) for this order item List itemIssue = null; try { @@ -163,7 +163,7 @@ public class OrderReturnServices { throw new GeneralRuntimeException(e.getMessage()); } if (UtilValidate.isNotEmpty(itemIssue)) { - Debug.log("Found item issuance reference", module); + Debug.logInfo("Found item issuance reference", module); // just use the first one for now; maybe later we can find a better way to determine which was the // actual item being returned; maybe by serial number GenericValue issue = EntityUtil.getFirst(itemIssue); @@ -175,7 +175,7 @@ public class OrderReturnServices { throw new GeneralRuntimeException(e.getMessage()); } if (inventoryItem != null) { - Debug.log("Located inventory item - " + inventoryItem.getString("inventoryItemId"), module); + Debug.logInfo("Located inventory item - " + inventoryItem.getString("inventoryItemId"), module); if (inventoryItem.get("unitCost") != null) { itemCost = inventoryItem.getBigDecimal("unitCost"); } else { @@ -186,7 +186,7 @@ public class OrderReturnServices { } } - Debug.log("Initial item cost - " + itemCost, module); + Debug.logInfo("Initial item cost - " + itemCost, module); return itemCost; } @@ -1442,7 +1442,7 @@ public class OrderReturnServices { GenericValue item = (GenericValue) itemsIter.next(); Map returnItemMap = UtilMisc.toMap("returnItemResponseId", responseId, "returnId", item.get("returnId"), "returnItemSeqId", item.get("returnItemSeqId"), "statusId", returnItemStatusId, "userLogin", userLogin); - //Debug.log("Updating item status", module); + //Debug.logInfo("Updating item status", module); try { serviceResults = dispatcher.runSync("updateReturnItem", returnItemMap); if (ServiceUtil.isError(serviceResults)) { @@ -1453,7 +1453,7 @@ public class OrderReturnServices { return ServiceUtil.returnError(UtilProperties.getMessage(resource_error,"OrderProblemUpdatingReturnItemReturnItemResponseId", locale)); } - //Debug.log("Item status and return status history created", module); + //Debug.logInfo("Item status and return status history created", module); } // Create the payment applications for the return invoice @@ -2401,7 +2401,7 @@ public class OrderReturnServices { if ((returnItemSeqId != null) && !("_NA_".equals(returnItemSeqId))) { returnItem = delegator.findByPrimaryKey("ReturnItem", UtilMisc.toMap("returnId", returnId, "returnItemSeqId", returnItemSeqId)); - Debug.log("returnId:" + returnId + ",returnItemSeqId:" + returnItemSeqId); + Debug.logInfo("returnId:" + returnId + ",returnItemSeqId:" + returnItemSeqId, module); orderItem = returnItem.getRelatedOne("OrderItem"); } else { // we don't have the returnItemSeqId but before we consider this Modified: ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/order/OrderServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/order/OrderServices.java?rev=1301889&r1=1301888&r2=1301889&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/order/OrderServices.java (original) +++ ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/order/OrderServices.java Sat Mar 17 08:33:34 2012 @@ -1657,21 +1657,21 @@ public class OrderServices { BigDecimal shippingTotal = null; if (UtilValidate.isEmpty(orh.getValidOrderItems(shipGroupSeqId))) { shippingTotal = ZERO; - Debug.log("No valid order items found - " + shippingTotal, module); + Debug.logInfo("No valid order items found - " + shippingTotal, module); } else { shippingTotal = UtilValidate.isEmpty(shippingEstMap.get("shippingTotal")) ? ZERO : (BigDecimal)shippingEstMap.get("shippingTotal"); shippingTotal = shippingTotal.setScale(orderDecimals, orderRounding); - Debug.log("Got new shipping estimate - " + shippingTotal, module); + Debug.logInfo("Got new shipping estimate - " + shippingTotal, module); } if (Debug.infoOn()) { - Debug.log("New Shipping Total [" + orderId + " / " + shipGroupSeqId + "] : " + shippingTotal, module); + Debug.logInfo("New Shipping Total [" + orderId + " / " + shipGroupSeqId + "] : " + shippingTotal, module); } BigDecimal currentShipping = OrderReadHelper.getAllOrderItemsAdjustmentsTotal(orh.getOrderItemAndShipGroupAssoc(shipGroupSeqId), orh.getAdjustments(), false, false, true); currentShipping = currentShipping.add(OrderReadHelper.calcOrderAdjustments(orh.getOrderHeaderAdjustments(shipGroupSeqId), orh.getOrderItemsSubTotal(), false, false, true)); if (Debug.infoOn()) { - Debug.log("Old Shipping Total [" + orderId + " / " + shipGroupSeqId + "] : " + currentShipping, module); + Debug.logInfo("Old Shipping Total [" + orderId + " / " + shipGroupSeqId + "] : " + currentShipping, module); } List errorMessageList = (List) shippingEstMap.get(ModelService.ERROR_MESSAGE_LIST); @@ -1757,15 +1757,15 @@ public class OrderServices { while (itemIter.hasNext()) { GenericValue item = (GenericValue) itemIter.next(); String statusId = item.getString("statusId"); - //Debug.log("Item Status: " + statusId, module); + //Debug.logInfo("Item Status: " + statusId, module); if (!"ITEM_CANCELLED".equals(statusId)) { - //Debug.log("Not set to cancel", module); + //Debug.logInfo("Not set to cancel", module); allCanceled = false; if (!"ITEM_COMPLETED".equals(statusId)) { - //Debug.log("Not set to complete", module); + //Debug.logInfo("Not set to complete", module); allComplete = false; if (!"ITEM_APPROVED".equals(statusId)) { - //Debug.log("Not set to approve", module); + //Debug.logInfo("Not set to approve", module); allApproved = false; break; } @@ -2863,8 +2863,8 @@ public class OrderServices { cal.add(Calendar.DAY_OF_YEAR, daysTillCancel); Date cancelDate = cal.getTime(); Date nowDate = new Date(); - //Debug.log("Cancel Date : " + cancelDate, module); - //Debug.log("Current Date : " + nowDate, module); + //Debug.logInfo("Cancel Date : " + cancelDate, module); + //Debug.logInfo("Current Date : " + nowDate, module); if (cancelDate.equals(nowDate) || nowDate.after(cancelDate)) { // cancel the order item(s) Map svcCtx = UtilMisc.toMap("orderId", orderId, "statusId", "ITEM_CANCELLED", "userLogin", userLogin); @@ -3475,7 +3475,7 @@ public class OrderServices { Debug.logError(e, module); return ServiceUtil.returnError(e.getMessage()); } - Debug.log("Set item quantity: [" + itemSeqId + "] " + qty, module); + Debug.logInfo("Set item quantity: [" + itemSeqId + "] " + qty, module); if (cartItem.getIsModifiedPrice()) // set price cartItem.setBasePrice(priceSave); @@ -3487,7 +3487,7 @@ public class OrderServices { price = new BigDecimal(priceStr).setScale(orderDecimals, orderRounding); cartItem.setBasePrice(price); cartItem.setIsModifiedPrice(true); - Debug.log("Set item price: [" + itemSeqId + "] " + price, module); + Debug.logInfo("Set item price: [" + itemSeqId + "] " + price, module); } } @@ -3497,7 +3497,7 @@ public class OrderServices { String description = (String) itemDescriptionMap.get(itemSeqId); if (UtilValidate.isNotEmpty(description)) { cartItem.setName(description); - Debug.log("Set item description: [" + itemSeqId + "] " + description, module); + Debug.logInfo("Set item description: [" + itemSeqId + "] " + description, module); } else { return ServiceUtil.returnError("Item description must not be empty"); } @@ -3510,7 +3510,7 @@ public class OrderServices { attrValue = (String) itemAttributesMap.get(attrName + ":" + itemSeqId); if (UtilValidate.isNotEmpty(attrName)) { cartItem.setOrderItemAttribute(attrName, attrValue); - Debug.log("Set item attribute Name: [" + itemSeqId + "] " + attrName + " , Value:" + attrValue, module); + Debug.logInfo("Set item attribute Name: [" + itemSeqId + "] " + attrName + " , Value:" + attrValue, module); } } } @@ -3567,10 +3567,10 @@ public class OrderServices { // set the group qty ShoppingCartItem cartItem = cart.findCartItem(itemInfo[0]); if (cartItem != null) { - Debug.log("Shipping info (before) for group #" + (groupIdx-1) + " [" + cart.getShipmentMethodTypeId(groupIdx-1) + " / " + cart.getCarrierPartyId(groupIdx-1) + "]", module); + Debug.logInfo("Shipping info (before) for group #" + (groupIdx-1) + " [" + cart.getShipmentMethodTypeId(groupIdx-1) + " / " + cart.getCarrierPartyId(groupIdx-1) + "]", module); cart.setItemShipGroupQty(cartItem, groupQty, groupIdx - 1); - Debug.log("Set ship group qty: [" + itemInfo[0] + " / " + itemInfo[1] + " (" + (groupIdx-1) + ")] " + groupQty, module); - Debug.log("Shipping info (after) for group #" + (groupIdx-1) + " [" + cart.getShipmentMethodTypeId(groupIdx-1) + " / " + cart.getCarrierPartyId(groupIdx-1) + "]", module); + Debug.logInfo("Set ship group qty: [" + itemInfo[0] + " / " + itemInfo[1] + " (" + (groupIdx-1) + ")] " + groupQty, module); + Debug.logInfo("Shipping info (after) for group #" + (groupIdx-1) + " [" + cart.getShipmentMethodTypeId(groupIdx-1) + " / " + cart.getCarrierPartyId(groupIdx-1) + "]", module); } } @@ -3816,7 +3816,7 @@ public class OrderServices { for (int gi = 0; gi < shipGroups; gi++) { String shipmentMethodTypeId = cart.getShipmentMethodTypeId(gi); String carrierPartyId = cart.getCarrierPartyId(gi); - Debug.log("Getting ship estimate for group #" + gi + " [" + shipmentMethodTypeId + " / " + carrierPartyId + "]", module); + Debug.logInfo("Getting ship estimate for group #" + gi + " [" + shipmentMethodTypeId + " / " + carrierPartyId + "]", module); Map result = ShippingEvents.getShipGroupEstimate(dispatcher, delegator, cart, gi); if (("SALES_ORDER".equals(cart.getOrderType())) && (ServiceUtil.isError(result))) { Debug.logError(ServiceUtil.getErrorMessage(result), module); @@ -4006,7 +4006,7 @@ public class OrderServices { } } } - Debug.log("To Store Contains: " + toStore, module); + Debug.logInfo("To Store Contains: " + toStore, module); // remove any order item attributes that were set to empty try { @@ -4068,7 +4068,7 @@ public class OrderServices { String orderTypeId = cart.getOrderType(); List resErrorMessages = new LinkedList(); try { - Debug.log("Calling reserve inventory...", module); + Debug.logInfo("Calling reserve inventory...", module); reserveInventory(delegator, dispatcher, userLogin, locale, orderItemShipGroupAssoc, dropShipGroupIds, itemValuesBySeqId, orderTypeId, productStoreId, resErrorMessages); } catch (GeneralException e) { @@ -4102,7 +4102,7 @@ public class OrderServices { GenericValue productStore = ProductStoreWorker.getProductStore(productStoreId, delegator); Map paymentResp = null; try { - Debug.log("Calling process payments...", module); + Debug.logInfo("Calling process payments...", module); //Debug.set(Debug.VERBOSE, true); paymentResp = CheckOutHelper.processPayment(orderId, orh.getOrderGrandTotal(), orh.getCurrency(), productStore, userLogin, false, false, dispatcher, delegator); //Debug.set(Debug.VERBOSE, false); @@ -4144,7 +4144,7 @@ public class OrderServices { public static Map shoppingCartRemoteTest(DispatchContext dctx, Map context) { ShoppingCart cart = (ShoppingCart) context.get("cart"); - Debug.log("Product ID : " + cart.findCartItem(0).getProductId(), module); + Debug.logInfo("Product ID : " + cart.findCartItem(0).getProductId(), module); return ServiceUtil.returnSuccess(); } Modified: ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java?rev=1301889&r1=1301888&r2=1301889&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java (original) +++ ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/shoppingcart/CheckOutEvents.java Sat Mar 17 08:33:34 2012 @@ -835,7 +835,7 @@ public class CheckOutEvents { // payment option; if offline we skip the payment screen methodType = request.getParameter("paymentMethodType"); if ("offline".equals(methodType)) { - Debug.log("Changing mode from->to: " + mode + "->payment", module); + Debug.logInfo("Changing mode from->to: " + mode + "->payment", module); mode = "payment"; } singleUsePayment = request.getParameter("singleUsePayment"); Modified: ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java?rev=1301889&r1=1301888&r2=1301889&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java (original) +++ ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCart.java Sat Mar 17 08:33:34 2012 @@ -4815,8 +4815,8 @@ public class ShoppingCart implements Ite opp.set("statusId", "PAYMENT_RECEIVED"); } } - Debug.log("ShipGroup [" + csi.getShipGroupSeqId() +"]", module); - Debug.log("Creating OrderPaymentPreference - " + opp, module); + Debug.logInfo("ShipGroup [" + csi.getShipGroupSeqId() +"]", module); + Debug.logInfo("Creating OrderPaymentPreference - " + opp, module); values.add(opp); } } else if ("N".equals(splitPayPrefPerShpGrp)) { @@ -4854,7 +4854,7 @@ public class ShoppingCart implements Ite opp.set("statusId", "PAYMENT_RECEIVED"); } } - Debug.log("Creating OrderPaymentPreference - " + opp, module); + Debug.logInfo("Creating OrderPaymentPreference - " + opp, module); values.add(opp); } } Modified: ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java?rev=1301889&r1=1301888&r2=1301889&view=diff ============================================================================== --- ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java (original) +++ ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartItem.java Sat Mar 17 08:33:34 2012 @@ -1547,7 +1547,7 @@ public class ShoppingCartItem implements } public void setOrderItemSeqId(String orderItemSeqId) { - Debug.log("Setting orderItemSeqId - " + orderItemSeqId, module); + Debug.logInfo("Setting orderItemSeqId - " + orderItemSeqId, module); this.orderItemSeqId = orderItemSeqId; } @@ -2005,7 +2005,7 @@ public class ShoppingCartItem implements } } rentalValue = rentalValue.add(new BigDecimal("100")); // add final 100 percent for first person - // Debug.log("rental parameters....Nbr of persons:" + getReservPersons() + " extra% 2nd person:" + getReserv2ndPPPerc()+ " extra% Nth person:" + getReservNthPPPerc() + " total rental adjustment:" + rentalValue/100 * getReservLength()); + // Debug.logInfo("rental parameters....Nbr of persons:" + getReservPersons() + " extra% 2nd person:" + getReserv2ndPPPerc()+ " extra% Nth person:" + getReservNthPPPerc() + " total rental adjustment:" + rentalValue/100 * getReservLength()); return rentalValue.movePointLeft(2).multiply(getReservLength()); // return total rental adjustment } |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |