You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by as...@apache.org on 2012/03/17 09:33:38 UTC
svn commit: r1301889 [2/3] - in /ofbiz/branches/release10.04:
applications/accounting/src/org/ofbiz/accounting/finaccount/
applications/accounting/src/org/ofbiz/accounting/invoice/
applications/accounting/src/org/ofbiz/accounting/payment/ applications/...
Modified: ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java?rev=1301889&r1=1301888&r2=1301889&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java (original)
+++ ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/shoppingcart/ShoppingCartServices.java Sat Mar 17 08:33:34 2012
@@ -74,7 +74,7 @@ public class ShoppingCartServices {
clearEmptyGroups = Boolean.TRUE;
}
- Debug.log("From Group - " + fromGroupIndex + " To Group - " + toGroupIndex + "Item - " + itemIndex + "(" + quantity + ")", module);
+ Debug.logInfo("From Group - " + fromGroupIndex + " To Group - " + toGroupIndex + "Item - " + itemIndex + "(" + quantity + ")", module);
if (fromGroupIndex.equals(toGroupIndex)) {
// nothing to do
return ServiceUtil.returnSuccess();
@@ -82,7 +82,7 @@ public class ShoppingCartServices {
cart.positionItemToGroup(itemIndex.intValue(), quantity,
fromGroupIndex.intValue(), toGroupIndex.intValue(), clearEmptyGroups.booleanValue());
- Debug.log("Called cart.positionItemToGroup()", module);
+ Debug.logInfo("Called cart.positionItemToGroup()", module);
return ServiceUtil.returnSuccess();
}
@@ -285,10 +285,10 @@ public class ShoppingCartServices {
if ((overflow == null || !"Y".equals(overflow)) && oppi.hasNext()) {
cpi = cart.addPaymentAmount(paymentId, maxAmount);
- Debug.log("Added Payment: " + paymentId + " / " + maxAmount, module);
+ Debug.logInfo("Added Payment: " + paymentId + " / " + maxAmount, module);
} else {
cpi = cart.addPayment(paymentId);
- Debug.log("Added Payment: " + paymentId + " / [no max]", module);
+ Debug.logInfo("Added Payment: " + paymentId + " / [no max]", module);
}
// for finance account the finAccountId needs to be set
if ("FIN_ACCOUNT".equals(paymentId)) {
@@ -298,7 +298,7 @@ public class ShoppingCartServices {
cart.setBillingAccount(orderHeader.getString("billingAccountId"), orh.getBillingAccountMaxAmount());
}
} else {
- Debug.log("No payment preferences found for order #" + orderId, module);
+ Debug.logInfo("No payment preferences found for order #" + orderId, module);
}
List<GenericValue> orderItemShipGroupList = orh.getOrderItemShipGroups();
Modified: ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java?rev=1301889&r1=1301888&r2=1301889&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java (original)
+++ ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/shoppingcart/shipping/ShippingEvents.java Sat Mar 17 08:33:34 2012
@@ -305,7 +305,7 @@ public class ShippingEvents {
// invoke the service
Map serviceResp = null;
try {
- Debug.log("Service : " + serviceName + " / " + configProps + " -- " + context, module);
+ Debug.logInfo("Service : " + serviceName + " / " + configProps + " -- " + context, module);
// because we don't want to blow up too big or rollback the transaction when this happens, always have it run in its own transaction...
serviceResp = dispatcher.runSync(serviceName, context, 0, true);
} catch (GenericServiceException e) {
Modified: ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java?rev=1301889&r1=1301888&r2=1301889&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java (original)
+++ ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/shoppinglist/ShoppingListServices.java Sat Mar 17 08:33:34 2012
@@ -109,7 +109,7 @@ public class ShoppingListServices {
return ServiceUtil.returnError(UtilProperties.getMessage(resource_error,"OrderUnableToCreateShoppingListRecurrenceInformation",locale));
}
- Debug.log("Next Recurrence - " + UtilDateTime.getTimestamp(recInfo.next()), module);
+ Debug.logInfo("Next Recurrence - " + UtilDateTime.getTimestamp(recInfo.next()), module);
Map result = ServiceUtil.returnSuccess();
result.put("recurrenceInfoId", recInfo.getID());
@@ -582,7 +582,7 @@ public class ShoppingListServices {
}
}
} catch (Exception e) {
- Debug.log("updateShoppingListQuantitiesFromOrder error:"+e.getMessage());
+ Debug.logInfo("updateShoppingListQuantitiesFromOrder error:"+e.getMessage(), module);
}
return result;
}
Modified: ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/thirdparty/paypal/ExpressCheckoutEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/thirdparty/paypal/ExpressCheckoutEvents.java?rev=1301889&r1=1301888&r2=1301889&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/thirdparty/paypal/ExpressCheckoutEvents.java (original)
+++ ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/thirdparty/paypal/ExpressCheckoutEvents.java Sat Mar 17 08:33:34 2012
@@ -67,7 +67,7 @@ public class ExpressCheckoutEvents {
try {
result = dispatcher.runSync(serviceName, inMap);
} catch (GenericServiceException e) {
- Debug.log(e, module);
+ Debug.logInfo(e, module);
request.setAttribute("_EVENT_MESSAGE_", UtilProperties.getMessage(resourceErr, "AccountingPayPalCommunicationError", locale));
return "error";
}
Modified: ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java?rev=1301889&r1=1301888&r2=1301889&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java (original)
+++ ofbiz/branches/release10.04/applications/order/src/org/ofbiz/order/thirdparty/zipsales/ZipSalesServices.java Sat Mar 17 08:33:34 2012
@@ -145,7 +145,7 @@ public class ZipSalesServices {
}
// console log
- Debug.log(newValue.get("zipCode") + "/" + newValue.get("stateCode") + "/" + newValue.get("city") + "/" + newValue.get("county") + "/" + newValue.get("fromDate"));
+ Debug.logInfo(newValue.get("zipCode") + "/" + newValue.get("stateCode") + "/" + newValue.get("city") + "/" + newValue.get("county") + "/" + newValue.get("fromDate"), module);
}
}
@@ -201,7 +201,7 @@ public class ZipSalesServices {
}
// console log
- Debug.log(newValue.get("stateCode") + "/" + newValue.get("city") + "/" + newValue.get("county") + "/" + newValue.get("fromDate"));
+ Debug.logInfo(newValue.get("stateCode") + "/" + newValue.get("city") + "/" + newValue.get("county") + "/" + newValue.get("fromDate"), module);
}
}
}
@@ -467,10 +467,10 @@ public class ZipSalesServices {
BigDecimal taxableAmount = itemAmount;
if (taxShipping) {
- //Debug.log("Taxing shipping", module);
+ //Debug.logInfo("Taxing shipping", module);
taxableAmount = taxableAmount.add(shippingAmount);
} else {
- Debug.log("Shipping is not taxable", module);
+ Debug.logInfo("Shipping is not taxable", module);
}
// calc tax amount
Modified: ofbiz/branches/release10.04/applications/party/src/org/ofbiz/party/party/PartyWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/party/src/org/ofbiz/party/party/PartyWorker.java?rev=1301889&r1=1301888&r2=1301889&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/party/src/org/ofbiz/party/party/PartyWorker.java (original)
+++ ofbiz/branches/release10.04/applications/party/src/org/ofbiz/party/party/PartyWorker.java Sat Mar 17 08:33:34 2012
@@ -272,7 +272,7 @@ public class PartyWorker {
List<String> sort = UtilMisc.toList("-fromDate");
EntityCondition addrCond = EntityCondition.makeCondition(addrExprs, EntityOperator.AND);
List<GenericValue> addresses = EntityUtil.filterByDate(delegator.findList("PartyAndPostalAddress", addrCond, null, sort, null, false));
- //Debug.log("Checking for matching address: " + addrCond.toString() + "[" + addresses.size() + "]", module);
+ //Debug.logInfo("Checking for matching address: " + addrCond.toString() + "[" + addresses.size() + "]", module);
List<GenericValue> validFound = FastList.newInstance();
if (UtilValidate.isNotEmpty(addresses)) {
@@ -283,7 +283,7 @@ public class PartyWorker {
String addr1Target = PartyWorker.makeMatchingString(delegator, address.getString("address1"));
if (addr1Target != null) {
- Debug.log("Comparing address1 : " + addr1Source + " / " + addr1Target, module);
+ Debug.logInfo("Comparing address1 : " + addr1Source + " / " + addr1Target, module);
if (addr1Target.equals(addr1Source)) {
// address 2 field
@@ -291,17 +291,17 @@ public class PartyWorker {
String addr2Source = PartyWorker.makeMatchingString(delegator, address2);
String addr2Target = PartyWorker.makeMatchingString(delegator, address.getString("address2"));
if (addr2Target != null) {
- Debug.log("Comparing address2 : " + addr2Source + " / " + addr2Target, module);
+ Debug.logInfo("Comparing address2 : " + addr2Source + " / " + addr2Target, module);
if (addr2Source.equals(addr2Target)) {
- Debug.log("Matching address2; adding valid address", module);
+ Debug.logInfo("Matching address2; adding valid address", module);
validFound.add(address);
//validParty.put(address.getString("partyId"), address.getString("contactMechId"));
}
}
} else {
if (address.get("address2") == null) {
- Debug.log("No address2; adding valid address", module);
+ Debug.logInfo("No address2; adding valid address", module);
validFound.add(address);
//validParty.put(address.getString("partyId"), address.getString("contactMechId"));
}
Modified: ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/category/CategoryWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/category/CategoryWorker.java?rev=1301889&r1=1301888&r2=1301889&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/category/CategoryWorker.java (original)
+++ ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/category/CategoryWorker.java Sat Mar 17 08:33:34 2012
@@ -147,9 +147,9 @@ public class CategoryWorker {
Debug.logWarning(e.getMessage(), module);
}
if (rollups != null) {
- // Debug.log("Rollup size: " + rollups.size(), module);
+ // Debug.logInfo("Rollup size: " + rollups.size(), module);
for (GenericValue parent: rollups) {
- // Debug.log("Adding child of: " + parent.getString("parentProductCategoryId"), module);
+ // Debug.logInfo("Adding child of: " + parent.getString("parentProductCategoryId"), module);
GenericValue cv = null;
try {
@@ -160,7 +160,7 @@ public class CategoryWorker {
if (cv != null) {
if (excludeEmpty) {
if (!isCategoryEmpty(cv)) {
- //Debug.log("Child : " + cv.getString("productCategoryId") + " is not empty.", module);
+ //Debug.logInfo("Child : " + cv.getString("productCategoryId") + " is not empty.", module);
categories.add(cv);
if (recursive) {
categories.addAll(getRelatedCategoriesRet(request, attributeName, cv.getString("productCategoryId"), limitView, excludeEmpty, recursive));
@@ -181,14 +181,14 @@ public class CategoryWorker {
public static boolean isCategoryEmpty(GenericValue category) {
boolean empty = true;
long members = categoryMemberCount(category);
- //Debug.log("Category : " + category.get("productCategoryId") + " has " + members + " members", module);
+ //Debug.logInfo("Category : " + category.get("productCategoryId") + " has " + members + " members", module);
if (members > 0) {
empty = false;
}
if (empty) {
long rollups = categoryRollupCount(category);
- //Debug.log("Category : " + category.get("productCategoryId") + " has " + rollups + " rollups", module);
+ //Debug.logInfo("Category : " + category.get("productCategoryId") + " has " + rollups + " rollups", module);
if (rollups > 0) {
empty = false;
}
Modified: ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/feature/ProductFeatureServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/feature/ProductFeatureServices.java?rev=1301889&r1=1301888&r2=1301889&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/feature/ProductFeatureServices.java (original)
+++ ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/feature/ProductFeatureServices.java Sat Mar 17 08:33:34 2012
@@ -148,15 +148,15 @@ public class ProductFeatureServices {
"productFeatureId", productFeatureAndAppl,
"productFeatureApplTypeId", "STANDARD_FEATURE");
- //Debug.log("Using findByMap: " + findByMap);
+ //Debug.logInfo("Using findByMap: " + findByMap);
List<GenericValue> standardProductFeatureAndAppls = EntityUtil.filterByDate(delegator.findByAnd("ProductFeatureAppl", findByMap));
if (UtilValidate.isEmpty(standardProductFeatureAndAppls)) {
- // Debug.log("Does NOT have this standard feature");
+ // Debug.logInfo("Does NOT have this standard feature");
hasAllFeatures = false;
break;
} else {
- // Debug.log("DOES have this standard feature");
+ // Debug.logInfo("DOES have this standard feature");
}
}
Modified: ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java?rev=1301889&r1=1301888&r2=1301889&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java (original)
+++ ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/inventory/InventoryServices.java Sat Mar 17 08:33:34 2012
@@ -382,7 +382,7 @@ public class InventoryServices {
return ServiceUtil.returnSuccess();
}
- Debug.log("OOS Inventory Items: " + inventoryItems.size(), module);
+ Debug.logInfo("OOS Inventory Items: " + inventoryItems.size(), module);
for (GenericValue inventoryItem: inventoryItems) {
// get the incomming shipment information for the item
@@ -415,7 +415,7 @@ public class InventoryServices {
continue;
}
- Debug.log("Reservations for item: " + reservations.size(), module);
+ Debug.logInfo("Reservations for item: " + reservations.size(), module);
// available at the time of order
BigDecimal availableBeforeReserved = inventoryItem.getBigDecimal("availableToPromiseTotal");
@@ -436,7 +436,7 @@ public class InventoryServices {
}
}
- Debug.log("Promised Date: " + actualPromiseDate, module);
+ Debug.logInfo("Promised Date: " + actualPromiseDate, module);
// find the next possible ship date
Timestamp nextShipDate = null;
@@ -449,7 +449,7 @@ public class InventoryServices {
}
}
- Debug.log("Next Ship Date: " + nextShipDate, module);
+ Debug.logInfo("Next Ship Date: " + nextShipDate, module);
// create a modified promise date (promise date - 1 day)
Calendar pCal = Calendar.getInstance();
@@ -458,17 +458,17 @@ public class InventoryServices {
Timestamp modifiedPromisedDate = new Timestamp(pCal.getTimeInMillis());
Timestamp now = UtilDateTime.nowTimestamp();
- Debug.log("Promised Date + 1: " + modifiedPromisedDate, module);
- Debug.log("Now: " + now, module);
+ Debug.logInfo("Promised Date + 1: " + modifiedPromisedDate, module);
+ Debug.logInfo("Now: " + now, module);
// check the promised date vs the next ship date
if (nextShipDate == null || nextShipDate.after(actualPromiseDate)) {
if (nextShipDate == null && modifiedPromisedDate.after(now)) {
// do nothing; we are okay to assume it will be shipped on time
- Debug.log("No ship date known yet, but promised date hasn't approached, assuming it will be here on time", module);
+ Debug.logInfo("No ship date known yet, but promised date hasn't approached, assuming it will be here on time", module);
} else {
// we cannot ship by the promised date; need to notify the customer
- Debug.log("We won't ship on time, getting notification info", module);
+ Debug.logInfo("We won't ship on time, getting notification info", module);
Map<String, Timestamp> notifyItems = ordersToUpdate.get(orderId);
if (notifyItems == null) {
notifyItems = FastMap.newInstance();
@@ -486,7 +486,7 @@ public class InventoryServices {
boolean needToCancel = false;
if (nextShipDate == null || nextShipDate.after(farPastPromised)) {
// we cannot ship until >30 days after promised; using cancel rule
- Debug.log("Ship date is >30 past the promised date", module);
+ Debug.logInfo("Ship date is >30 past the promised date", module);
needToCancel = true;
} else if (currentPromiseDate != null && actualPromiseDate.equals(currentPromiseDate)) {
// this is the second notification; using cancel rule
@@ -496,7 +496,7 @@ public class InventoryServices {
// add the info to the cancel map if we need to schedule a cancel
if (needToCancel) {
// queue the item to be cancelled
- Debug.log("Flagging the item to auto-cancel", module);
+ Debug.logInfo("Flagging the item to auto-cancel", module);
Map<String, Timestamp> cancelItems = ordersToCancel.get(orderId);
if (cancelItems == null) {
cancelItems = FastMap.newInstance();
Modified: ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/product/ProductWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/product/ProductWorker.java?rev=1301889&r1=1301888&r2=1301889&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/product/ProductWorker.java (original)
+++ ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/product/ProductWorker.java Sat Mar 17 08:33:34 2012
@@ -1044,7 +1044,7 @@ public class ProductWorker {
}
}
// find variant
- // Debug.log("=====try to find variant for product: " + productId + " and features: " + selectedFeatures);
+ // Debug.logInfo("=====try to find variant for product: " + productId + " and features: " + selectedFeatures);
List<GenericValue> productAssocs = EntityUtil.filterByDate(delegator.findByAnd("ProductAssoc", UtilMisc.toMap("productId", productId, "productAssocTypeId","PRODUCT_VARIANT")));
boolean productFound = false;
nextProd:
@@ -1060,7 +1060,7 @@ nextProd:
break;
}
// if (productFound)
-// Debug.log("=====product found:" + productId + " and features: " + selectedFeatures);
+// Debug.logInfo("=====product found:" + productId + " and features: " + selectedFeatures);
/**
* 1. variant not found so create new variant product and use the virtual product as basis, new one is a variant type and not a virtual type.
@@ -1114,7 +1114,7 @@ nextProd:
GenericValue productAssoc = delegator.makeValue("ProductAssoc", UtilMisc.toMap("productId", productId, "productIdTo", product.getString("productId"), "productAssocTypeId", "PRODUCT_VARIANT"));
productAssoc.put("fromDate", UtilDateTime.nowTimestamp());
productAssoc.create();
- Debug.log("set the productId to: " + product.getString("productId"));
+ Debug.logInfo("set the productId to: " + product.getString("productId"), module);
// copy the supplier
List<GenericValue> supplierProducts = delegator.findByAndCache("SupplierProduct", UtilMisc.toMap("productId", productId));
Modified: ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java?rev=1301889&r1=1301888&r2=1301889&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java (original)
+++ ofbiz/branches/release10.04/applications/product/src/org/ofbiz/product/store/ProductStoreWorker.java Sat Mar 17 08:33:34 2012
@@ -478,7 +478,7 @@ public class ProductStoreWorker {
storeSurveys = EntityUtil.filterByAnd(storeSurveys, UtilMisc.toMap("groupName", groupName));
}
- Debug.log("getSurvey for product " + productId,module);
+ Debug.logInfo("getSurvey for product " + productId,module);
// limit by product
if (!UtilValidate.isEmpty(productId) && !UtilValidate.isEmpty(storeSurveys)) {
for (GenericValue surveyAppl: storeSurveys) {
@@ -495,7 +495,7 @@ public class ProductStoreWorker {
else {
virtualProductId = ProductWorker.getVariantVirtualId(product);
}
- Debug.log("getSurvey for virtual product " + virtualProductId,module);
+ Debug.logInfo("getSurvey for virtual product " + virtualProductId,module);
}
} catch (GenericEntityException e) {
Debug.logError(e, "Problem finding product from productId " + productId, module);
Modified: ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/packing/PackingServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/packing/PackingServices.java?rev=1301889&r1=1301888&r2=1301889&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/packing/PackingServices.java (original)
+++ ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/packing/PackingServices.java Sat Mar 17 08:33:34 2012
@@ -53,7 +53,7 @@ public class PackingServices {
quantity = BigDecimal.ONE;
}
- Debug.log("OrderId [" + orderId + "] ship group [" + shipGroupSeqId + "] Pack input [" + productId + "] @ [" + quantity + "] packageSeq [" + packageSeq + "] weight [" + weight +"]", module);
+ Debug.logInfo("OrderId [" + orderId + "] ship group [" + shipGroupSeqId + "] Pack input [" + productId + "] @ [" + quantity + "] packageSeq [" + packageSeq + "] weight [" + weight +"]", module);
if (weight == null) {
Debug.logWarning("OrderId [" + orderId + "] ship group [" + shipGroupSeqId + "] product [" + productId + "] being packed without a weight, assuming 0", module);
@@ -126,7 +126,7 @@ public class PackingServices {
String qtyStr = qtyInfo.get(rowKey);
String wgtStr = wgtInfo.get(rowKey);
- Debug.log("Item: " + orderItemSeqId + " / Product: " + prdStr + " / Quantity: " + qtyStr + " / Package: " + pkgStr + " / Weight: " + wgtStr, module);
+ Debug.logInfo("Item: " + orderItemSeqId + " / Product: " + prdStr + " / Quantity: " + qtyStr + " / Package: " + pkgStr + " / Weight: " + wgtStr, module);
// array place holders
String[] quantities;
Modified: ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java?rev=1301889&r1=1301888&r2=1301889&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java (original)
+++ ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/packing/PackingSession.java Sat Mar 17 08:33:34 2012
@@ -169,16 +169,16 @@ public class PackingSession implements j
int thisCheck = this.checkLineForAdd(res, orderId, orderItemSeqId, shipGroupSeqId, productId, thisQty, packageSeqId, update);
switch (thisCheck) {
case 2:
- Debug.log("Packing check returned '2' - new pack line will be created!", module);
+ Debug.logInfo("Packing check returned '2' - new pack line will be created!", module);
toCreateMap.put(res, thisQty);
qtyRemain = qtyRemain.subtract(thisQty);
break;
case 1:
- Debug.log("Packing check returned '1' - existing pack line has been updated!", module);
+ Debug.logInfo("Packing check returned '1' - existing pack line has been updated!", module);
qtyRemain = qtyRemain.subtract(thisQty);
break;
case 0:
- Debug.log("Packing check returned '0' - doing nothing.", module);
+ Debug.logInfo("Packing check returned '0' - doing nothing.", module);
break;
}
}
@@ -289,10 +289,10 @@ public class PackingSession implements j
PackingSessionLine line = this.findLine(orderId, orderItemSeqId, shipGroupSeqId, productId, invItemId, packageSeqId);
BigDecimal packedQty = this.getPackedQuantity(orderId, orderItemSeqId, shipGroupSeqId, productId);
- Debug.log("Packed quantity [" + packedQty + "] + [" + quantity + "]", module);
+ Debug.logInfo("Packed quantity [" + packedQty + "] + [" + quantity + "]", module);
if (line == null) {
- Debug.log("No current line found testing [" + invItemId + "] R: " + resQty + " / Q: " + quantity, module);
+ Debug.logInfo("No current line found testing [" + invItemId + "] R: " + resQty + " / Q: " + quantity, module);
if (resQty.compareTo(quantity) < 0) {
return 0;
} else {
@@ -300,7 +300,7 @@ public class PackingSession implements j
}
} else {
BigDecimal newQty = update ? quantity : (line.getQuantity().add(quantity));
- Debug.log("Existing line found testing [" + invItemId + "] R: " + resQty + " / Q: " + newQty, module);
+ Debug.logInfo("Existing line found testing [" + invItemId + "] R: " + resQty + " / Q: " + newQty, module);
if (resQty.compareTo(newQty) < 0) {
return 0;
} else {
@@ -754,7 +754,7 @@ public class PackingSession implements j
}
newShipment.put("partyIdFrom", partyIdFrom);
- Debug.log("Creating new shipment with context: " + newShipment, module);
+ Debug.logInfo("Creating new shipment with context: " + newShipment, module);
Map<String, Object> newShipResp = this.getDispatcher().runSync("createShipment", newShipment);
if (ServiceUtil.isError(newShipResp)) {
@@ -1005,7 +1005,7 @@ public class PackingSession implements j
productId = v.getString("inventoryProductId");
quantity = v.getBigDecimal("totQuantityReserved").setScale(2, BigDecimal.ROUND_HALF_UP);
}
- Debug.log("created item display object quantity: " + quantity + " (" + productId + ")", module);
+ Debug.logInfo("created item display object quantity: " + quantity + " (" + productId + ")", module);
}
public GenericValue getOrderItem() {
Modified: ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/packing/PackingSessionLine.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/packing/PackingSessionLine.java?rev=1301889&r1=1301888&r2=1301889&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/packing/PackingSessionLine.java (original)
+++ ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/packing/PackingSessionLine.java Sat Mar 17 08:33:34 2012
@@ -204,7 +204,7 @@ public class PackingSessionLine implemen
if (picklistBinId != null) {
// find the pick list item
- Debug.log("Looking up picklist item for bin ID #" + picklistBinId, module);
+ Debug.logInfo("Looking up picklist item for bin ID #" + picklistBinId, module);
Delegator delegator = dispatcher.getDelegator();
Map<String, Object> itemLookup = FastMap.newInstance();
itemLookup.put("picklistBinId", picklistBinId);
@@ -214,7 +214,7 @@ public class PackingSessionLine implemen
itemLookup.put("inventoryItemId", this.getInventoryItemId());
GenericValue plItem = delegator.findByPrimaryKey("PicklistItem", itemLookup);
if (plItem != null) {
- Debug.log("Found picklist bin: " + plItem, module);
+ Debug.logInfo("Found picklist bin: " + plItem, module);
BigDecimal itemQty = plItem.getBigDecimal("quantity");
if (itemQty.compareTo(quantity) == 0) {
// set to complete
@@ -229,7 +229,7 @@ public class PackingSessionLine implemen
throw new GeneralException(ServiceUtil.getErrorMessage(issueResp));
}
} else {
- Debug.log("No item was found for lookup: " + itemLookup, module);
+ Debug.logInfo("No item was found for lookup: " + itemLookup, module);
}
} else {
Debug.logWarning("*** NO Picklist Bin ID set; cannot update picklist status!", module);
Modified: ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/picklist/PickListServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/picklist/PickListServices.java?rev=1301889&r1=1301888&r2=1301889&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/picklist/PickListServices.java (original)
+++ ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/picklist/PickListServices.java Sat Mar 17 08:33:34 2012
@@ -75,8 +75,8 @@ public class PickListServices {
Debug.logError(e, module);
return ServiceUtil.returnError(e.getMessage());
}
- Debug.log("Recieved orderIdList - " + orderIdList, module);
- Debug.log("Found orderHeaderList - " + orderHeaderList, module);
+ Debug.logInfo("Recieved orderIdList - " + orderIdList, module);
+ Debug.logInfo("Found orderHeaderList - " + orderHeaderList, module);
}
}
Modified: ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java?rev=1301889&r1=1301888&r2=1301889&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java (original)
+++ ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/shipment/ShipmentServices.java Sat Mar 17 08:33:34 2012
@@ -475,7 +475,7 @@ public class ShipmentServices {
// Grab the estimate and work with it.
GenericValue estimate = estimateList.get(estimateIndex);
- //Debug.log("[ShippingEvents.getShipEstimate] Working with estimate [" + estimateIndex + "]: " + estimate, module);
+ //Debug.logInfo("[ShippingEvents.getShipEstimate] Working with estimate [" + estimateIndex + "]: " + estimate, module);
// flat fees
BigDecimal orderFlat = BigDecimal.ZERO;
Modified: ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java?rev=1301889&r1=1301888&r2=1301889&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java (original)
+++ ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/thirdparty/dhl/DhlServices.java Sat Mar 17 08:33:34 2012
@@ -397,7 +397,7 @@ public class DhlServices {
try {
requestString = UtilXml.writeXmlDocument(requestDocument);
- Debug.log("AccessRequest XML Document:" + requestString);
+ Debug.logInfo("AccessRequest XML Document:" + requestString, module);
} catch (IOException e) {
String ioeErrMsg = "Error writing the AccessRequest XML Document to a String: "
+ e.toString();
@@ -408,8 +408,8 @@ public class DhlServices {
String registerResponseString = null;
try {
registerResponseString = sendDhlRequest(requestString);
- Debug.log("DHL request for DHL Register Account:"
- + registerResponseString);
+ Debug.logInfo("DHL request for DHL Register Account:"
+ + registerResponseString, module);
} catch (DhlConnectException e) {
String uceErrMsg = "Error sending DHL request for DHL Register Account: "
+ e.toString();
@@ -422,8 +422,8 @@ public class DhlServices {
registerResponseDocument = UtilXml.readXmlDocument(
registerResponseString, false);
result = handleDhlRegisterResponse(registerResponseDocument);
- Debug.log("DHL response for DHL Register Account:"
- + registerResponseString);
+ Debug.logInfo("DHL response for DHL Register Account:"
+ + registerResponseString, module);
} catch (SAXException e2) {
String excErrMsg = "Error parsing the RegisterAccountServiceSelectionResponse: "
+ e2.toString();
@@ -807,7 +807,7 @@ public class DhlServices {
// store in db blob
shipmentPackageRouteSeg.setBytes("labelImage", labelBytes);
} else {
- Debug.log("Failed to either decode returned DHL label or no data found in eCommerce/Shipment/Label/Image.");
+ Debug.logInfo("Failed to either decode returned DHL label or no data found in eCommerce/Shipment/Label/Image.", module);
// TODO: VOID
}
Modified: ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java?rev=1301889&r1=1301888&r2=1301889&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java (original)
+++ ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/thirdparty/fedex/FedexServices.java Sat Mar 17 08:33:34 2012
@@ -321,7 +321,7 @@ public class FedexServices {
String fDXSubscriptionReplyString = null;
try {
fDXSubscriptionReplyString = sendFedexRequest(fDXSubscriptionRequestString);
- Debug.log("Fedex response for FDXSubscriptionRequest:" + fDXSubscriptionReplyString);
+ Debug.logInfo("Fedex response for FDXSubscriptionRequest:" + fDXSubscriptionReplyString, module);
} catch (FedexConnectException e) {
String errorMessage = "Error sending Fedex request for FDXSubscriptionRequest: " + e.toString();
Debug.logError(e, errorMessage, module);
@@ -331,7 +331,7 @@ public class FedexServices {
Document fDXSubscriptionReplyDocument = null;
try {
fDXSubscriptionReplyDocument = UtilXml.readXmlDocument(fDXSubscriptionReplyString, false);
- Debug.log("Fedex response for FDXSubscriptionRequest:" + fDXSubscriptionReplyString);
+ Debug.logInfo("Fedex response for FDXSubscriptionRequest:" + fDXSubscriptionReplyString, module);
} catch (SAXException se) {
String errorMessage = "Error parsing the FDXSubscriptionRequest response: " + se.toString();
Debug.logError(se, errorMessage, module);
@@ -911,7 +911,7 @@ public class FedexServices {
// Store in db blob
shipmentPackageRouteSeg.setBytes("labelImage", labelBytes);
} else {
- Debug.log("Failed to either decode returned FedEx label or no data found in Labels/OutboundLabel.");
+ Debug.logInfo("Failed to either decode returned FedEx label or no data found in Labels/OutboundLabel.", module);
// TODO: Cancel the package
}
Modified: ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java?rev=1301889&r1=1301888&r2=1301889&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java (original)
+++ ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/thirdparty/ups/UpsServices.java Sat Mar 17 08:33:34 2012
@@ -608,7 +608,7 @@ public class UpsServices {
fileOut.flush();
fileOut.close();
} catch (IOException e) {
- Debug.log(e, "Could not save UPS XML file: [[[" + xmlString.toString() + "]]] to file: " + outFileName, module);
+ Debug.logInfo(e, "Could not save UPS XML file: [[[" + xmlString.toString() + "]]] to file: " + outFileName, module);
}
}
@@ -628,7 +628,7 @@ public class UpsServices {
fileOut.flush();
fileOut.close();
} catch (IOException e) {
- Debug.log(e, "Could not save UPS XML file: [[[" + xmlString.toString() + "]]] to file: " + outFileName, module);
+ Debug.logInfo(e, "Could not save UPS XML file: [[[" + xmlString.toString() + "]]] to file: " + outFileName, module);
}
}
@@ -867,7 +867,7 @@ public class UpsServices {
fileOut.flush();
fileOut.close();
} catch (IOException e) {
- Debug.log(e, "Could not save UPS XML file: [[[" + xmlString.toString() + "]]] to file: " + outFileName, module);
+ Debug.logInfo(e, "Could not save UPS XML file: [[[" + xmlString.toString() + "]]] to file: " + outFileName, module);
}
}
@@ -887,7 +887,7 @@ public class UpsServices {
fileOut.flush();
fileOut.close();
} catch (IOException e) {
- Debug.log(e, "Could not save UPS XML file: [[[" + xmlString.toString() + "]]] to file: " + outFileName, module);
+ Debug.logInfo(e, "Could not save UPS XML file: [[[" + xmlString.toString() + "]]] to file: " + outFileName, module);
}
}
@@ -1079,7 +1079,7 @@ public class UpsServices {
fileOut.flush();
fileOut.close();
} catch (IOException e) {
- Debug.log(e, "Could not save UPS LabelImage GIF file: [[[" + packageLabelGraphicImageString + "]]] to file: " + outFileName, module);
+ Debug.logInfo(e, "Could not save UPS LabelImage GIF file: [[[" + packageLabelGraphicImageString + "]]] to file: " + outFileName, module);
}
}
if (labelInternationalSignatureGraphicImageBytes != null) {
@@ -1090,7 +1090,7 @@ public class UpsServices {
fileOut.flush();
fileOut.close();
} catch (IOException e) {
- Debug.log(e, "Could not save UPS IntlSign LabelImage GIF file: [[[" + packageLabelInternationalSignatureGraphicImageString + "]]] to file: " + outFileName, module);
+ Debug.logInfo(e, "Could not save UPS IntlSign LabelImage GIF file: [[[" + packageLabelInternationalSignatureGraphicImageString + "]]] to file: " + outFileName, module);
}
}
if (packageLabelHTMLImageStringDecoded != null) {
@@ -1101,7 +1101,7 @@ public class UpsServices {
fileOut.flush();
fileOut.close();
} catch (IOException e) {
- Debug.log(e, "Could not save UPS LabelImage HTML file: [[[" + packageLabelHTMLImageStringDecoded + "]]] to file: " + outFileName, module);
+ Debug.logInfo(e, "Could not save UPS LabelImage HTML file: [[[" + packageLabelHTMLImageStringDecoded + "]]] to file: " + outFileName, module);
}
}
}
@@ -1127,7 +1127,7 @@ public class UpsServices {
file.flush();
file.close();
} catch (IOException e) {
- Debug.log(e, "Could not save UPS International Invoice: [[[" + imgStringDecoded + "]]] to file: " + outFile, module);
+ Debug.logInfo(e, "Could not save UPS International Invoice: [[[" + imgStringDecoded + "]]] to file: " + outFile, module);
}
}
String formGroupId = UtilXml.childElementValue(formElement, "FormGroupId");
@@ -1158,7 +1158,7 @@ public class UpsServices {
fileOut.flush();
fileOut.close();
} catch (IOException e) {
- Debug.log(e, "Could not save UPS High Value Report data: [[[" + fileStringDecoded + "]]] to file: " + outFileName, module);
+ Debug.logInfo(e, "Could not save UPS High Value Report data: [[[" + fileStringDecoded + "]]] to file: " + outFileName, module);
}
}
}
@@ -1270,7 +1270,7 @@ public class UpsServices {
fileOut.flush();
fileOut.close();
} catch (IOException e) {
- Debug.log(e, "Could not save UPS XML file: [[[" + xmlString.toString() + "]]] to file: " + outFileName, module);
+ Debug.logInfo(e, "Could not save UPS XML file: [[[" + xmlString.toString() + "]]] to file: " + outFileName, module);
}
}
@@ -1290,7 +1290,7 @@ public class UpsServices {
fileOut.flush();
fileOut.close();
} catch (IOException e) {
- Debug.log(e, "Could not save UPS XML file: [[[" + xmlString.toString() + "]]] to file: " + outFileName, module);
+ Debug.logInfo(e, "Could not save UPS XML file: [[[" + xmlString.toString() + "]]] to file: " + outFileName, module);
}
}
@@ -1459,7 +1459,7 @@ public class UpsServices {
fileOut.flush();
fileOut.close();
} catch (IOException e) {
- Debug.log(e, "Could not save UPS XML file: [[[" + xmlString.toString() + "]]] to file: " + outFileName, module);
+ Debug.logInfo(e, "Could not save UPS XML file: [[[" + xmlString.toString() + "]]] to file: " + outFileName, module);
}
}
@@ -1479,7 +1479,7 @@ public class UpsServices {
fileOut.flush();
fileOut.close();
} catch (IOException e) {
- Debug.log(e, "Could not save UPS XML file: [[[" + xmlString.toString() + "]]] to file: " + outFileName, module);
+ Debug.logInfo(e, "Could not save UPS XML file: [[[" + xmlString.toString() + "]]] to file: " + outFileName, module);
}
}
@@ -1761,7 +1761,7 @@ public class UpsServices {
}
}
- Debug.log("UPS Rate Map : " + rateMap, module);
+ Debug.logInfo("UPS Rate Map : " + rateMap, module);
Map<String, Object> resp = ServiceUtil.returnSuccess();
resp.put("upsRateCodeMap", rateMap);
@@ -1876,8 +1876,8 @@ public class UpsServices {
Debug.logError(e, "Unable to set timeout to " + timeOutStr + " using default " + timeout);
}
- //Debug.log("UPS Connect URL : " + conStr, module);
- //Debug.log("UPS XML String : " + xmlString, module);
+ //Debug.logInfo("UPS Connect URL : " + conStr, module);
+ //Debug.logInfo("UPS XML String : " + xmlString, module);
HttpClient http = new HttpClient(conStr);
http.setTimeout(timeout * 1000);
@@ -2595,7 +2595,7 @@ public class UpsServices {
fileOut.flush();
fileOut.close();
} catch (IOException e) {
- Debug.log(e, "Could not save UPS XML file: [[[" + xmlString.toString() + "]]] to file: " + outFileName, module);
+ Debug.logInfo(e, "Could not save UPS XML file: [[[" + xmlString.toString() + "]]] to file: " + outFileName, module);
}
}
try {
@@ -2983,7 +2983,7 @@ public class UpsServices {
rateMap.put(serviceCode, new BigDecimal(totalRates));
}
}
- Debug.log("UPS Rate Map : " + rateMap, module);
+ Debug.logInfo("UPS Rate Map : " + rateMap, module);
Map<String, Object> resp = ServiceUtil.returnSuccess();
resp.put("upsRateCodeMap", rateMap);
return resp;
Modified: ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsMockApiServlet.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsMockApiServlet.java?rev=1301889&r1=1301888&r2=1301889&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsMockApiServlet.java (original)
+++ ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsMockApiServlet.java Sat Mar 17 08:33:34 2012
@@ -129,7 +129,7 @@ public class UspsMockApiServlet extends
try {
UtilXml.writeXmlDocument(responseDocument, os, "UTF-8", true, false, 0);
} catch (TransformerException e) {
- Debug.log(e, module);
+ Debug.logInfo(e, module);
return;
}
Modified: ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java?rev=1301889&r1=1301888&r2=1301889&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java (original)
+++ ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServices.java Sat Mar 17 08:33:34 2012
@@ -218,7 +218,7 @@ public class UspsServices {
try {
responseDocument = sendUspsRequest("RateV2", requestDocument);
} catch (UspsRequestException e) {
- Debug.log(e, module);
+ Debug.logInfo(e, module);
return ServiceUtil.returnError("Error sending request for USPS Domestic Rate Calculation service: " + e.getMessage());
}
@@ -238,7 +238,7 @@ public class UspsServices {
BigDecimal packageAmount = new BigDecimal(UtilXml.childElementValue(postageElement, "Rate"));
estimateAmount = estimateAmount.add(packageAmount);
} catch (NumberFormatException e) {
- Debug.log(e, module);
+ Debug.logInfo(e, module);
}
}
@@ -364,7 +364,7 @@ public class UspsServices {
try {
responseDocument = sendUspsRequest("IntlRate", requestDocument);
} catch (UspsRequestException e) {
- Debug.log(e, module);
+ Debug.logInfo(e, module);
return ServiceUtil.returnError("Error sending request for USPS International Rate Calculation service: " + e.getMessage());
}
@@ -382,7 +382,7 @@ public class UspsServices {
Element errorElement = UtilXml.firstChildElement(packageElement, "Error");
if (errorElement != null) {
String errorDescription = UtilXml.childElementValue(errorElement, "Description");
- Debug.log("USPS International Rate Calculation returned a package error: " + errorDescription);
+ Debug.logInfo("USPS International Rate Calculation returned a package error: " + errorDescription, module);
return ServiceUtil.returnError("No rate available at this time");
}
List<? extends Element> serviceElements = UtilXml.childElementList(packageElement, "Service");
@@ -395,7 +395,7 @@ public class UspsServices {
BigDecimal packageAmount = new BigDecimal(UtilXml.childElementValue(serviceElement, "Postage"));
estimateAmount = estimateAmount.add(packageAmount);
} catch (NumberFormatException e) {
- Debug.log("USPS International Rate Calculation returned an unparsable postage amount: " + UtilXml.childElementValue(serviceElement, "Postage"));
+ Debug.logInfo("USPS International Rate Calculation returned an unparsable postage amount: " + UtilXml.childElementValue(serviceElement, "Postage"), module);
return ServiceUtil.returnError("No rate available at this time");
}
}
@@ -439,7 +439,7 @@ public class UspsServices {
try {
responseDocument = sendUspsRequest("TrackV2", requestDocument);
} catch (UspsRequestException e) {
- Debug.log(e, module);
+ Debug.logInfo(e, module);
return ServiceUtil.returnError("Error sending request for USPS Tracking service: " + e.getMessage());
}
@@ -532,7 +532,7 @@ public class UspsServices {
try {
responseDocument = sendUspsRequest("Verify", requestDocument);
} catch (UspsRequestException e) {
- Debug.log(e, module);
+ Debug.logInfo(e, module);
return ServiceUtil.returnFailure("Error sending request for USPS Address Validation service: " + e.getMessage());
}
@@ -613,7 +613,7 @@ public class UspsServices {
try {
responseDocument = sendUspsRequest("CityStateLookup", requestDocument);
} catch (UspsRequestException e) {
- Debug.log(e, module);
+ Debug.logInfo(e, module);
return ServiceUtil.returnFailure("Error sending request for USPS City/State Lookup service: " + e.getMessage());
}
@@ -715,7 +715,7 @@ public class UspsServices {
try {
responseDocument = sendUspsRequest(type, requestDocument);
} catch (UspsRequestException e) {
- Debug.log(e, module);
+ Debug.logInfo(e, module);
return ServiceUtil.returnError("Error sending request for USPS " + type + " Service Standards service: " +
e.getMessage());
}
@@ -814,7 +814,7 @@ public class UspsServices {
try {
responseDocument = sendUspsRequest("Rate", requestDocument);
} catch (UspsRequestException e) {
- Debug.log(e, module);
+ Debug.logInfo(e, module);
return ServiceUtil.returnError("Error sending request for USPS Domestic Rate Calculation service: " + e.getMessage());
}
@@ -1041,7 +1041,7 @@ public class UspsServices {
try {
responseDocument = sendUspsRequest("Rate", requestDocument);
} catch (UspsRequestException e) {
- Debug.log(e, module);
+ Debug.logInfo(e, module);
return ServiceUtil.returnError("Error sending request for USPS Domestic Rate Calculation service: " +
e.getMessage());
}
@@ -1093,7 +1093,7 @@ public class UspsServices {
shipmentRouteSegment.store();
} catch (GenericEntityException gee) {
- Debug.log(gee, module);
+ Debug.logInfo(gee, module);
return ServiceUtil.returnError("Error reading or writing shipment data for the USPS " +
"Domestic Rate Calculation service: " + gee.getMessage());
}
@@ -1288,7 +1288,7 @@ public class UspsServices {
try {
responseDocument = sendUspsRequest("DeliveryConfirmationV2", requestDocument);
} catch (UspsRequestException e) {
- Debug.log(e, module);
+ Debug.logInfo(e, module);
return ServiceUtil.returnError("Error sending request for USPS Delivery Confirmation service: " +
e.getMessage());
}
@@ -1317,7 +1317,7 @@ public class UspsServices {
}
} catch (GenericEntityException gee) {
- Debug.log(gee, module);
+ Debug.logInfo(gee, module);
return ServiceUtil.returnError("Error reading or writing shipment data for the USPS " +
"Delivery Confirmation service: " + gee.getMessage());
}
@@ -1357,10 +1357,10 @@ public class UspsServices {
}
} catch (GenericEntityException e) {
- Debug.log(e, module);
+ Debug.logInfo(e, module);
return ServiceUtil.returnError(e.getMessage());
} catch (IOException e) {
- Debug.log(e, module);
+ Debug.logInfo(e, module);
return ServiceUtil.returnError(e.getMessage());
}
@@ -1519,7 +1519,7 @@ public class UspsServices {
product = shipmentItem.getRelatedOne("Product");
originGeo = product.getRelatedOne("OriginGeo");
} catch (GenericEntityException e) {
- Debug.log(e, module);
+ Debug.logInfo(e, module);
}
UtilXml.addChildElementValue(itemDetail, "Description", product.getString("productName"), packageDocument);
@@ -1540,7 +1540,7 @@ public class UspsServices {
try {
responseDocument = sendUspsRequest(api, requestDocument);
} catch (UspsRequestException e) {
- Debug.log(e, module);
+ Debug.logInfo(e, module);
return ServiceUtil.returnError("Error sending request for USPS Priority Mail International service: " +
e.getMessage());
}
Modified: ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java?rev=1301889&r1=1301888&r2=1301889&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java (original)
+++ ofbiz/branches/release10.04/applications/product/src/org/ofbiz/shipment/thirdparty/usps/UspsServicesTests.java Sat Mar 17 08:33:34 2012
@@ -58,26 +58,26 @@ public class UspsServicesTests extends O
// verify the results
String responseMessage = (String) result.get(ModelService.RESPONSE_MESSAGE);
- Debug.log("[testUspsTrackConfirm] responseMessage: " + responseMessage, module);
+ Debug.logInfo("[testUspsTrackConfirm] responseMessage: " + responseMessage, module);
assertEquals("Service result is success", ModelService.RESPOND_SUCCESS, responseMessage);
String trackingSummary = (String) result.get("trackingSummary");
- Debug.log("[testUspsTrackConfirm] trackingSummary: " + trackingSummary, module);
+ Debug.logInfo("[testUspsTrackConfirm] trackingSummary: " + trackingSummary, module);
assertEquals("trackingSummary is correct",
"Your item was delivered at 8:10 am on June 1 in Wilmington DE 19801.", trackingSummary);
List<String> trackingDetailList = UtilGenerics.checkList(result.get("trackingDetailList"));
assertEquals("trackingDetailList has 3 elements", 3, trackingDetailList.size());
- Debug.log("[testUspsTrackConfirm] trackingDetailList[0]: " + trackingDetailList.get(0), module);
+ Debug.logInfo("[testUspsTrackConfirm] trackingDetailList[0]: " + trackingDetailList.get(0), module);
assertEquals("trackingDetailList element 0 is correct",
"May 30 11:07 am NOTICE LEFT WILMINGTON DE 19801.", trackingDetailList.get(0));
- Debug.log("[testUspsTrackConfirm] trackingDetailList[1]: " + trackingDetailList.get(1), module);
+ Debug.logInfo("[testUspsTrackConfirm] trackingDetailList[1]: " + trackingDetailList.get(1), module);
assertEquals("trackingDetailList element 0 is correct",
"May 30 10:08 am ARRIVAL AT UNIT WILMINGTON DE 19850.", trackingDetailList.get(1));
- Debug.log("[testUspsTrackConfirm] trackingDetailList[2]: " + trackingDetailList.get(2), module);
+ Debug.logInfo("[testUspsTrackConfirm] trackingDetailList[2]: " + trackingDetailList.get(2), module);
assertEquals("trackingDetailList element 0 is correct",
"May 29 9:55 am ACCEPT OR PICKUP EDGEWATER NJ 07020.", trackingDetailList.get(2));
}
@@ -90,27 +90,27 @@ public class UspsServicesTests extends O
// verify the results
String responseMessage = (String) result.get(ModelService.RESPONSE_MESSAGE);
- Debug.log("[testUspsAddressValidation] responseMessage: " + responseMessage, module);
+ Debug.logInfo("[testUspsAddressValidation] responseMessage: " + responseMessage, module);
assertEquals("Service result is success", ModelService.RESPOND_SUCCESS, responseMessage);
String address1 = (String) result.get("address1");
- Debug.log("[testUspsAddressValidation] address1: " + address1, module);
+ Debug.logInfo("[testUspsAddressValidation] address1: " + address1, module);
assertEquals("address1 is correct", "6406 IVY LN", address1);
String city = (String) result.get("city");
- Debug.log("[testUspsAddressValidation] city: " + city, module);
+ Debug.logInfo("[testUspsAddressValidation] city: " + city, module);
assertEquals("city is correct", "GREENBELT", city);
String state = (String) result.get("state");
- Debug.log("[testUspsAddressValidation] state: " + state, module);
+ Debug.logInfo("[testUspsAddressValidation] state: " + state, module);
assertEquals("state is correct", "MD", state);
String zip5 = (String) result.get("zip5");
- Debug.log("[testUspsAddressValidation] zip5: " + zip5, module);
+ Debug.logInfo("[testUspsAddressValidation] zip5: " + zip5, module);
assertEquals("zip5 is correct", "20770", zip5);
String zip4 = (String) result.get("zip4");
- Debug.log("[testUspsAddressValidation] zip4: " + zip4, module);
+ Debug.logInfo("[testUspsAddressValidation] zip4: " + zip4, module);
assertEquals("zip4 is correct", "1440", zip4);
}
@@ -121,15 +121,15 @@ public class UspsServicesTests extends O
// verify the results
String responseMessage = (String) result.get(ModelService.RESPONSE_MESSAGE);
- Debug.log("[testUspsCityStateLookup] responseMessage: " + responseMessage, module);
+ Debug.logInfo("[testUspsCityStateLookup] responseMessage: " + responseMessage, module);
assertEquals("Service result is success", ModelService.RESPOND_SUCCESS, responseMessage);
String city = (String) result.get("city");
- Debug.log("[testUspsCityStateLookup] city: " + city, module);
+ Debug.logInfo("[testUspsCityStateLookup] city: " + city, module);
assertEquals("city is correct", "BEVERLY HILLS", city);
String state = (String) result.get("state");
- Debug.log("[testUspsCityStateLookup] state: " + state, module);
+ Debug.logInfo("[testUspsCityStateLookup] state: " + state, module);
assertEquals("state is correct", "CA", state);
}
@@ -140,11 +140,11 @@ public class UspsServicesTests extends O
// verify the results
String responseMessage = (String) result.get(ModelService.RESPONSE_MESSAGE);
- Debug.log("[testUspsPriorityMailStandard] responseMessage: " + responseMessage, module);
+ Debug.logInfo("[testUspsPriorityMailStandard] responseMessage: " + responseMessage, module);
assertEquals("Service result is success", ModelService.RESPOND_SUCCESS, responseMessage);
String days = (String) result.get("days");
- Debug.log("[testUspsPriorityMailStandard] days: " + days, module);
+ Debug.logInfo("[testUspsPriorityMailStandard] days: " + days, module);
assertEquals("days is correct", "1", days);
}
@@ -155,11 +155,11 @@ public class UspsServicesTests extends O
// verify the results
String responseMessage = (String) result.get(ModelService.RESPONSE_MESSAGE);
- Debug.log("[testUspsPackageServicesStandard] responseMessage: " + responseMessage, module);
+ Debug.logInfo("[testUspsPackageServicesStandard] responseMessage: " + responseMessage, module);
assertEquals("Service result is success", ModelService.RESPOND_SUCCESS, responseMessage);
String days = (String) result.get("days");
- Debug.log("[testUspsPackageServicesStandard] days: " + days, module);
+ Debug.logInfo("[testUspsPackageServicesStandard] days: " + days, module);
assertEquals("days is correct", "2", days);
}
@@ -182,19 +182,19 @@ public class UspsServicesTests extends O
// verify the results
String responseMessage = (String) result.get(ModelService.RESPONSE_MESSAGE);
- Debug.log("[testUspsDomesticRate] responseMessage: " + responseMessage, module);
+ Debug.logInfo("[testUspsDomesticRate] responseMessage: " + responseMessage, module);
assertEquals("Service result is success", ModelService.RESPOND_SUCCESS, responseMessage);
String postage = (String) result.get("postage");
- Debug.log("[testUspsDomesticRate] postage: " + postage, module);
+ Debug.logInfo("[testUspsDomesticRate] postage: " + postage, module);
assertEquals("postage is correct", "7.90", postage);
String restrictionCodes = (String) result.get("restrictionCodes");
- Debug.log("[testUspsDomesticRate] restrictionCodes: " + restrictionCodes, module);
+ Debug.logInfo("[testUspsDomesticRate] restrictionCodes: " + restrictionCodes, module);
assertEquals("restrictionCodes is correct", "B-B1-C-D-U", restrictionCodes);
String restrictionDesc = (String) result.get("restrictionDesc");
- Debug.log("[testUspsDomesticRate] restrictionDesc: " + restrictionDesc, module);
+ Debug.logInfo("[testUspsDomesticRate] restrictionDesc: " + restrictionDesc, module);
assertEquals("restrictionDesc is correct", "B. Form 2976-A", restrictionDesc.substring(0,14));
}
}
Modified: ofbiz/branches/release10.04/applications/securityext/src/org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/securityext/src/org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java?rev=1301889&r1=1301888&r2=1301889&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/securityext/src/org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java (original)
+++ ofbiz/branches/release10.04/applications/securityext/src/org/ofbiz/securityext/thirdparty/truition/TruitionCoReg.java Sat Mar 17 08:33:34 2012
@@ -91,7 +91,7 @@ public class TruitionCoReg {
tru.setPath(cookiePath);
tru.setMaxAge(time);
resp.addCookie(tru);
- Debug.log("Set Truition Cookie [" + tru.getName() + "/" + tru.getDomain() + " @ " + tru.getPath() + "] - " + tru.getValue(), module);
+ Debug.logInfo("Set Truition Cookie [" + tru.getName() + "/" + tru.getDomain() + " @ " + tru.getPath() + "] - " + tru.getValue(), module);
} catch (UnsupportedEncodingException e) {
Debug.logError(e, module);
return "error";
@@ -119,7 +119,7 @@ public class TruitionCoReg {
if (cookieName.equals(cookies[i].getName())) {
cookies[i].setMaxAge(0);
resp.addCookie(cookies[i]);
- Debug.log("Set truition cookie [" + cookieName + " to expire now.", module);
+ Debug.logInfo("Set truition cookie [" + cookieName + " to expire now.", module);
}
}
}
@@ -131,7 +131,7 @@ public class TruitionCoReg {
// redirect URL form field
String redirectUrlName = UtilProperties.getPropertyValue("truition.properties", "truition.redirect.urlName");
String redirectUrl = req.getParameter(redirectUrlName);
- Debug.log("Redirect to : " + redirectUrl, module);
+ Debug.logInfo("Redirect to : " + redirectUrl, module);
if (truitionEnabled() && redirectUrl != null) {
try {
resp.sendRedirect(redirectUrl);
@@ -141,7 +141,7 @@ public class TruitionCoReg {
return "error";
}
- Debug.log("Sending truition redirect - " + redirectUrl, module);
+ Debug.logInfo("Sending truition redirect - " + redirectUrl, module);
return "redirect";
}
return "success";
@@ -164,9 +164,9 @@ public class TruitionCoReg {
String nickName = userLogin.getString("userLoginId");
String password = userLogin.getString("currentPassword");
String partyId = userLogin.getString("partyId");
- Debug.log(logPrefix + "nickName: " + nickName, module);
- Debug.log(logPrefix + "password: " + password, module);
- Debug.log(logPrefix + "partyId: " + partyId, module);
+ Debug.logInfo(logPrefix + "nickName: " + nickName, module);
+ Debug.logInfo(logPrefix + "password: " + password, module);
+ Debug.logInfo(logPrefix + "partyId: " + partyId, module);
GenericValue party = null;
try {
@@ -196,9 +196,9 @@ public class TruitionCoReg {
title = "";
}
}
- Debug.log(logPrefix + "title: " + title, module);
- Debug.log(logPrefix + "firstName: " + firstName, module);
- Debug.log(logPrefix + "lastName: " + lastName, module);
+ Debug.logInfo(logPrefix + "title: " + title, module);
+ Debug.logInfo(logPrefix + "firstName: " + firstName, module);
+ Debug.logInfo(logPrefix + "lastName: " + lastName, module);
// email address
String emailAddress = null;
@@ -214,7 +214,7 @@ public class TruitionCoReg {
} else {
emailAddress = "";
}
- Debug.log(logPrefix + "emailAddress: " + emailAddress, module);
+ Debug.logInfo(logPrefix + "emailAddress: " + emailAddress, module);
// shipping address
String address1 = null;
@@ -250,12 +250,12 @@ public class TruitionCoReg {
}
}
}
- Debug.log(logPrefix + "address1: " + address1, module);
- Debug.log(logPrefix + "address2: " + address2, module);
- Debug.log(logPrefix + "city: " + city, module);
- Debug.log(logPrefix + "state: " + state, module);
- Debug.log(logPrefix + "zipCode: " + zipCode, module);
- Debug.log(logPrefix + "country: " + country, module);
+ Debug.logInfo(logPrefix + "address1: " + address1, module);
+ Debug.logInfo(logPrefix + "address2: " + address2, module);
+ Debug.logInfo(logPrefix + "city: " + city, module);
+ Debug.logInfo(logPrefix + "state: " + state, module);
+ Debug.logInfo(logPrefix + "zipCode: " + zipCode, module);
+ Debug.logInfo(logPrefix + "country: " + country, module);
// phone number
String phoneNumber = null;
@@ -290,7 +290,7 @@ public class TruitionCoReg {
}
}
}
- Debug.log(logPrefix + "phoneNumber: " + phoneNumber, module);
+ Debug.logInfo(logPrefix + "phoneNumber: " + phoneNumber, module);
int retCode = -1;
Modified: ofbiz/branches/release10.04/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java?rev=1301889&r1=1301888&r2=1301889&view=diff
==============================================================================
--- ofbiz/branches/release10.04/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java (original)
+++ ofbiz/branches/release10.04/applications/workeffort/src/org/ofbiz/workeffort/workeffort/WorkEffortServices.java Sat Mar 17 08:33:34 2012
@@ -500,7 +500,7 @@ public class WorkEffortServices {
Collection<String> partyIds = UtilGenerics.checkCollection(context.get("partyIds"));
String facilityId = (String) context.get("facilityId");
String fixedAssetId = (String) context.get("fixedAssetId");
- // Debug.log("======by period for fixedAsset: " + fixedAssetId + " facilityId: " + facilityId + "partyId: " + partyId + " entityExprList:" + (List) context.get("entityExprList"));
+ // Debug.logInfo("======by period for fixedAsset: " + fixedAssetId + " facilityId: " + facilityId + "partyId: " + partyId + " entityExprList:" + (List) context.get("entityExprList"));
String workEffortTypeId = (String) context.get("workEffortTypeId");
Boolean filterOutCanceledEvents = (Boolean) context.get("filterOutCanceledEvents");
if (filterOutCanceledEvents == null) {
@@ -621,7 +621,7 @@ public class WorkEffortServices {
try {
List<GenericValue> tempWorkEfforts = null;
if (UtilValidate.isNotEmpty(partyIdsToUse)) {
- // Debug.log("=====conditions for party: " + eclTotal);
+ // Debug.logInfo("=====conditions for party: " + eclTotal);
tempWorkEfforts = EntityUtil.filterByDate(delegator.findList("WorkEffortAndPartyAssignAndType", eclTotal, null, orderByList, null, false));
} else {
tempWorkEfforts = delegator.findList("WorkEffort", eclTotal, null, orderByList, null, false);
Modified: ofbiz/branches/release10.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java?rev=1301889&r1=1301888&r2=1301889&view=diff
==============================================================================
--- ofbiz/branches/release10.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java (original)
+++ ofbiz/branches/release10.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayEvents.java Sat Mar 17 08:33:34 2012
@@ -193,7 +193,7 @@ public class EbayEvents {
}
}
}
- Debug.log("run in with productIds "+productIds);
+ Debug.logInfo("run in with productIds "+productIds, module);
for (String productId : productIds) {
AddItemCall addItemCall = new AddItemCall(apiContext);
ItemType item = new ItemType();
@@ -1052,7 +1052,7 @@ public class EbayEvents {
revReq.setSellingManagerProductDetails(prodDetailType);
revResp = (ReviseSellingManagerProductResponseType) revProdCall.execute(revReq);
if (revResp != null && "SUCCESS".equals(revResp.getAck().toString())) {
- Debug.log(" Already update quantity on eBay inventory with product id ::"+revResp.getSellingManagerProductDetails().getProductID());
+ Debug.logInfo(" Already update quantity on eBay inventory with product id ::"+revResp.getSellingManagerProductDetails().getProductID(), module);
} else {
EbayStoreHelper.createErrorLogMessage(userLogin, dispatcher, productStoreId, revResp.getAck().toString(), "ReviseSellingManagerProductCall : updateQuantityInventoryProduct", revResp.getErrors(0).getLongMessage());
}
Modified: ofbiz/branches/release10.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java?rev=1301889&r1=1301888&r2=1301889&view=diff
==============================================================================
--- ofbiz/branches/release10.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java (original)
+++ ofbiz/branches/release10.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStore.java Sat Mar 17 08:33:34 2012
@@ -658,7 +658,7 @@ public class EbayStore {
} catch (GenericEntityException e1) {
e1.printStackTrace();
}
- Debug.log("userLoginId is "+userLoginId+" and productStoreId is "+ context.get("productStoreId"));
+ Debug.logInfo("userLoginId is "+userLoginId+" and productStoreId is "+ context.get("productStoreId"), module);
GetStoreCall call = new GetStoreCall(EbayStoreHelper.getApiContext((String)context.get("productStoreId"), locale, delegator));
//call.setSite(EbayHelper.getSiteCodeType((String)context.get("productStoreId"), locale, delegator));
call.setCategoryStructureOnly(false);
@@ -886,7 +886,7 @@ public class EbayStore {
dispatcher.runSync("updateProductStore", inMap);
}
} catch (Exception e) {
- Debug.log("error message"+e);
+ Debug.logError("error message"+e, module);
}
}
Modified: ofbiz/branches/release10.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java?rev=1301889&r1=1301888&r2=1301889&view=diff
==============================================================================
--- ofbiz/branches/release10.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java (original)
+++ ofbiz/branches/release10.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreAutoPreferences.java Sat Mar 17 08:33:34 2012
@@ -868,7 +868,7 @@ public class EbayStoreAutoPreferences {
resp = (AddOrderResponseType) call.execute(req);
if (resp != null && "SUCCESS".equals(resp.getAck().toString())) {
String orderId = resp.getOrderID();
- Debug.log(":: new order id is = " + orderId);
+ Debug.logInfo(":: new order id is = " + orderId, module);
} else {
EbayStoreHelper.createErrorLogMessage(userLogin, dispatcher, productStoreId, resp.getAck().toString(), "Add order : runCombineOrders", resp.getErrors(0).getLongMessage());
}
Modified: ofbiz/branches/release10.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreCategoryFacade.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreCategoryFacade.java?rev=1301889&r1=1301888&r2=1301889&view=diff
==============================================================================
--- ofbiz/branches/release10.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreCategoryFacade.java (original)
+++ ofbiz/branches/release10.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreCategoryFacade.java Sat Mar 17 08:33:34 2012
@@ -230,7 +230,7 @@ public class EbayStoreCategoryFacade {
resp = (GetDescriptionTemplatesResponseType) call.execute(req);
if (resp != null && "SUCCESS".equals(resp.getAck().toString())) {
DescriptionTemplateType[] descriptionTemplateTypeList = resp.getDescriptionTemplate();
- Debug.log("layout of category "+ this.catId +":"+ resp.getLayoutTotal());
+ Debug.logInfo("layout of category "+ this.catId +":"+ resp.getLayoutTotal(), module);
for (DescriptionTemplateType descTemplateType : descriptionTemplateTypeList) {
List<Map<String,Object>> templateList = null;
Map<String,Object> templateGroup = null;
Modified: ofbiz/branches/release10.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java?rev=1301889&r1=1301888&r2=1301889&view=diff
==============================================================================
--- ofbiz/branches/release10.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java (original)
+++ ofbiz/branches/release10.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreHelper.java Sat Mar 17 08:33:34 2012
@@ -692,7 +692,7 @@ public class EbayStoreHelper {
addReq.setOrder(newOrder);
addResp = (AddOrderResponseType) addOrderCall.execute(addReq);
if (addResp != null && "SUCCESS".equals(addResp.getAck().toString())) {
- Debug.log("Upload tracking code to eBay success...");
+ Debug.logInfo("Upload tracking code to eBay success...", module);
} else {
createErrorLogMessage(userLogin, dctx.getDispatcher(), productStoreId, addResp.getAck().toString(), "Update order : uploadTrackingInfoBackToEbay", addResp.getErrors(0).getLongMessage());
}
@@ -721,7 +721,7 @@ public class EbayStoreHelper {
newMap.put("userLogin", userLogin);
dispatcher.runSync("insertErrorMessagesFromEbay", newMap);
} catch (Exception ex) {
- Debug.log("Error from create error log messages : "+ex.getMessage());
+ Debug.logError("Error from create error log messages : "+ex.getMessage(), module);
}
}
}
@@ -738,7 +738,7 @@ public class EbayStoreHelper {
}
}
} catch (Exception ex) {
- Debug.log("Error from get eBay Inventory data : "+ ex.getMessage());
+ Debug.logInfo("Error from get eBay Inventory data : "+ ex.getMessage(), module);
}
return isReserve;
}
Modified: ofbiz/branches/release10.04/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java?rev=1301889&r1=1301888&r2=1301889&view=diff
==============================================================================
--- ofbiz/branches/release10.04/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java (original)
+++ ofbiz/branches/release10.04/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java Sat Mar 17 08:33:34 2012
@@ -514,7 +514,7 @@ public class ProductsExportToGoogle {
Map<String, Object> result = ServiceUtil.returnSuccess();
result.put("newProductsInGoogle", newProductsInGoogle);
result.put("productsRemovedFromGoogle", productsRemovedFromGoogle);
- Debug.log("======returning with result: " + result);
+ Debug.logInfo("======returning with result: " + result, module);
return result;
}
@@ -536,7 +536,7 @@ public class ProductsExportToGoogle {
private static Map<String, Object> readResponseFromGoogle(String msg, List<String> newProductsInGoogle, List<String> productsRemovedFromGoogle,
LocalDispatcher dispatcher, Delegator delegator, Locale locale) {
List<String> message = FastList.newInstance();
- // Debug.log("====get xml response from google: " + msg);
+ // Debug.logInfo("====get xml response from google: " + msg);
try {
Document docResponse = UtilXml.readXmlDocument(msg, true);
Element elemResponse = docResponse.getDocumentElement();
Modified: ofbiz/branches/release10.04/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java?rev=1301889&r1=1301888&r2=1301889&view=diff
==============================================================================
--- ofbiz/branches/release10.04/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java (original)
+++ ofbiz/branches/release10.04/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java Sat Mar 17 08:33:34 2012
@@ -502,7 +502,7 @@ public class GoogleRequestServices {
String orderId = (String) context.get("orderId");
GenericValue order = findGoogleOrder(delegator, orderId);
if (order != null) {
- Debug.log("Returning FAILURE; this IS an Google Checkout order and cannot be modified as requested!", module);
+ Debug.logInfo("Returning FAILURE; this IS an Google Checkout order and cannot be modified as requested!", module);
return ServiceUtil.returnFailure("Google Checkout orders cannot be modified. You may cancel orders/items only!");
}
return ServiceUtil.returnSuccess();
Modified: ofbiz/branches/release10.04/specialpurpose/ldap/src/org/ofbiz/ldap/LdapLoginWorker.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release10.04/specialpurpose/ldap/src/org/ofbiz/ldap/LdapLoginWorker.java?rev=1301889&r1=1301888&r2=1301889&view=diff
==============================================================================
--- ofbiz/branches/release10.04/specialpurpose/ldap/src/org/ofbiz/ldap/LdapLoginWorker.java (original)
+++ ofbiz/branches/release10.04/specialpurpose/ldap/src/org/ofbiz/ldap/LdapLoginWorker.java Sat Mar 17 08:33:34 2012
@@ -221,7 +221,7 @@ public class LdapLoginWorker extends Log
protected static Element getRootElement(HttpServletRequest request) {
if (Debug.infoOn()) {
- Debug.log("Applet config file: " + ldapConfig);
+ Debug.logInfo("Applet config file: " + ldapConfig, module);
}
File configFile = new File(ldapConfig);
FileInputStream configFileIS = null;