svn commit: r1301874 [3/3] - in /ofbiz/branches/release11.04: applications/accounting/src/or
Locked
svn commit: r1301874 [3/3] - in /ofbiz/branches/release11.04: applications/accounting/src/or
 
|
Modified: ofbiz/branches/release11.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java
URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java (original) +++ ofbiz/branches/release11.04/specialpurpose/ebaystore/src/org/ofbiz/ebaystore/EbayStoreOrder.java Sat Mar 17 07:05:15 2012 @@ -543,7 +543,7 @@ public class EbayStoreOrder { String productId = orderItem.get("productId").toString(); GenericValue product = delegator.findOne("Product", UtilMisc.toMap("productId", productId), false); if (UtilValidate.isEmpty(product)) { - Debug.log("The product having ID (" + productId + ") is misssing in the system.", module); + Debug.logInfo("The product having ID (" + productId + ") is misssing in the system.", module); } BigDecimal qty = new BigDecimal(orderItem.get("quantity").toString()); String itemPrice = orderItem.get("transactionPrice").toString(); Modified: ofbiz/branches/release11.04/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java (original) +++ ofbiz/branches/release11.04/specialpurpose/googlebase/src/org/ofbiz/googlebase/ProductsExportToGoogle.java Sat Mar 17 07:05:15 2012 @@ -633,7 +633,7 @@ public class ProductsExportToGoogle { result.put("newProductsInGoogle", newProductsInGoogle); result.put("productsRemovedFromGoogle", productsRemovedFromGoogle); result.put("localeString", localeString); - //Debug.log("======returning with result: " + result); + //Debug.logInfo("======returning with result: " + result); return result; } @@ -655,7 +655,7 @@ public class ProductsExportToGoogle { private static Map<String, Object> readResponseFromGoogle(String msg, List<String> newProductsInGoogle, List<String> productsRemovedFromGoogle, LocalDispatcher dispatcher, Delegator delegator, Locale locale, String localeString) { 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/release11.04/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java (original) +++ ofbiz/branches/release11.04/specialpurpose/googlecheckout/src/org/ofbiz/googlecheckout/GoogleRequestServices.java Sat Mar 17 07:05:15 2012 @@ -504,7 +504,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.logWarning("Returning FAILURE; this IS an Google Checkout order and cannot be modified as requested!", module); return ServiceUtil.returnFailure(UtilProperties.getMessage(resource, "GoogleCheckoutOrderCannotBeModified", locale)); } return ServiceUtil.returnSuccess(); Modified: ofbiz/branches/release11.04/specialpurpose/ldap/src/org/ofbiz/ldap/LdapLoginWorker.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/ldap/src/org/ofbiz/ldap/LdapLoginWorker.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/ldap/src/org/ofbiz/ldap/LdapLoginWorker.java (original) +++ ofbiz/branches/release11.04/specialpurpose/ldap/src/org/ofbiz/ldap/LdapLoginWorker.java Sat Mar 17 07:05:15 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; Modified: ofbiz/branches/release11.04/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java (original) +++ ofbiz/branches/release11.04/specialpurpose/oagis/src/org/ofbiz/oagis/OagisInventoryServices.java Sat Mar 17 07:05:15 2012 @@ -394,7 +394,7 @@ public class OagisInventoryServices { Map<String, Object> omiPkMap = UtilMisc.toMap("logicalId", (Object) logicalId, "component", component, "task", task, "referenceId", referenceId); // always log this to make messages easier to find - Debug.log("Processing oagisReceiveAcknowledgeDeliveryPo for message ID [" + omiPkMap + "]", module); + Debug.logInfo("Processing oagisReceiveAcknowledgeDeliveryPo for message ID [" + omiPkMap + "]", module); // before getting into this check to see if we've tried once and had an error, if so set isErrorRetry even if it wasn't passed in GenericValue previousOagisMessageInfo = null; @@ -694,7 +694,7 @@ public class OagisInventoryServices { Map<String, Object> omiPkMap = UtilMisc.toMap("logicalId", (Object) logicalId, "component", component, "task", task, "referenceId", referenceId); // always log this to make messages easier to find - Debug.log("Processing oagisReceiveAcknowledgeDeliveryRma for message ID [" + omiPkMap + "]", module); + Debug.logInfo("Processing oagisReceiveAcknowledgeDeliveryRma for message ID [" + omiPkMap + "]", module); // before getting into this check to see if we've tried once and had an error, if so set isErrorRetry even if it wasn't passed in GenericValue previousOagisMessageInfo = null; @@ -1205,7 +1205,7 @@ public class OagisInventoryServices { Map<String, Object> omiPkMap = UtilMisc.toMap("logicalId", (Object) logicalId, "component", component, "task", task, "referenceId", referenceId); // always log this to make messages easier to find - Debug.log("Processing oagisReceiveAcknowledgeDeliveryStatus for message ID [" + omiPkMap + "]", module); + Debug.logInfo("Processing oagisReceiveAcknowledgeDeliveryStatus for message ID [" + omiPkMap + "]", module); // before getting into this check to see if we've tried once and had an error, if so set isErrorRetry even if it wasn't passed in GenericValue previousOagisMessageInfo = null; Modified: ofbiz/branches/release11.04/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java (original) +++ ofbiz/branches/release11.04/specialpurpose/oagis/src/org/ofbiz/oagis/OagisShipmentServices.java Sat Mar 17 07:05:15 2012 @@ -132,7 +132,7 @@ public class OagisShipmentServices { Map<String, String> omiPkMap = UtilMisc.toMap("logicalId", logicalId, "component", component, "task", task, "referenceId", referenceId); // always log this to make messages easier to find - Debug.log("Processing oagisReceiveShowShipment for shipmentId [" + shipmentId + "] message ID [" + omiPkMap + "]", module); + Debug.logInfo("Processing oagisReceiveShowShipment for shipmentId [" + shipmentId + "] message ID [" + omiPkMap + "]", module); // before getting into this check to see if we've tried once and had an error, if so set isErrorRetry even if it wasn't passed in GenericValue previousOagisMessageInfo = null; Modified: ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java (original) +++ ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/PosTransaction.java Sat Mar 17 07:05:15 2012 @@ -331,12 +331,12 @@ public class PosTransaction implements S List<GenericValue> paymentPrefs = session.getDelegator().findByAnd("OrderPaymentPreference", fields); if (UtilValidate.isNotEmpty(paymentPrefs)) { - //Debug.log("Found some prefs - " + paymentPrefs.size(), module); + //Debug.logInfo("Found some prefs - " + paymentPrefs.size(), module); if (paymentPrefs.size() > 1) { Debug.logError("Multiple OrderPaymentPreferences found for the same payment method!", module); } else { paymentPref = EntityUtil.getFirst(paymentPrefs); - //Debug.log("Got the first pref - " + paymentPref, module); + //Debug.logInfo("Got the first pref - " + paymentPref, module); } } else { Debug.logError("No OrderPaymentPreference found - " + fields, module); @@ -344,7 +344,7 @@ public class PosTransaction implements S } catch (GenericEntityException e) { Debug.logError(e, module); } - //Debug.log("PaymentPref - " + paymentPref, module); + //Debug.logInfo("PaymentPref - " + paymentPref, module); Map<String, Object> payInfo = FastMap.newInstance(); @@ -364,7 +364,7 @@ public class PosTransaction implements S Debug.logError("Payment preference is empty!", module); return payInfo; } - //Debug.log("AuthTrans - " + authTrans, module); + //Debug.logInfo("AuthTrans - " + authTrans, module); if ("PaymentMethodType".equals(infValue.getEntityName())) { payInfo.put("description", infValue.get("description", locale)); @@ -714,7 +714,7 @@ public class PosTransaction implements S Iterator<GenericValue> i = values.iterator(); while (i.hasNext() && isExternal) { GenericValue v = i.next(); - //Debug.log("Testing [" + paymentMethodTypeId + "] - " + v, module); + //Debug.logInfo("Testing [" + paymentMethodTypeId + "] - " + v, module); if (!externalCode.equals(v.getString("paymentServiceTypeEnumId"))) { isExternal = false; } @@ -833,7 +833,7 @@ public class PosTransaction implements S if (UtilValidate.isEmpty(this.orderId)) { // if order does not exist output.print(UtilProperties.getMessage(resource, "PosSaving", locale)); Map<String, Object> orderRes = ch.createOrder(session.getUserLogin()); - //Debug.log("Create Order Resp : " + orderRes, module); + //Debug.logInfo("Create Order Resp : " + orderRes, module); if (orderRes != null && ServiceUtil.isError(orderRes)) { throw new GeneralException(ServiceUtil.getErrorMessage(orderRes)); @@ -1116,7 +1116,7 @@ public class PosTransaction implements S svcCtx.put("expYear", expYear); svcCtx.put("cardType", UtilValidate.getCardType(cardNumber)); - //Debug.log("Create CC : " + svcCtx, module); + //Debug.logInfo("Create CC : " + svcCtx, module); Map<String, Object> svcRes = null; try { svcRes = dispatcher.runSync("createCreditCard", svcCtx); @@ -1233,7 +1233,7 @@ public class PosTransaction implements S } if (svcRes == null) { - Debug.log(UtilProperties.getMessage("EcommerceUiLabels", "EcommerceNoShoppingListsCreate", locale), module); + Debug.logInfo(UtilProperties.getMessage("EcommerceUiLabels", "EcommerceNoShoppingListsCreate", locale), module); } else if (ServiceUtil.isError(svcRes)) { Debug.logError(ServiceUtil.getErrorMessage(svcRes) + " - " + svcRes, module); } else{ @@ -1278,7 +1278,7 @@ public class PosTransaction implements S } if (shoppingLists == null) { - Debug.log(UtilProperties.getMessage("EcommerceUiLabels", "EcommerceNoShoppingListsCreate", locale), module); + Debug.logInfo(UtilProperties.getMessage("EcommerceUiLabels", "EcommerceNoShoppingListsCreate", locale), module); } return shoppingLists; } @@ -1350,7 +1350,7 @@ public class PosTransaction implements S } if (svcRes == null) { - Debug.log(UtilProperties.getMessage("EcommerceUiLabels", "EcommerceNoShoppingListsCreate", locale), module); + Debug.logInfo(UtilProperties.getMessage("EcommerceUiLabels", "EcommerceNoShoppingListsCreate", locale), module); } else if (ServiceUtil.isError(svcRes)) { Debug.logError(ServiceUtil.getErrorMessage(svcRes) + " - " + svcRes, module); } else{ Modified: ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/component/PosButton.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/component/PosButton.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/component/PosButton.java (original) +++ ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/component/PosButton.java Sat Mar 17 07:05:15 2012 @@ -139,7 +139,7 @@ public class PosButton { } catch (Throwable t) { } if (cl == null) { - Debug.log("No context classloader available; using class classloader", module); + Debug.logInfo("No context classloader available; using class classloader", module); try { cl = this.getClass().getClassLoader(); } catch (Throwable t) { Modified: ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/component/PosButtonWrapper.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/component/PosButtonWrapper.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/component/PosButtonWrapper.java (original) +++ ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/component/PosButtonWrapper.java Sat Mar 17 07:05:15 2012 @@ -154,7 +154,7 @@ public class PosButtonWrapper { xbutton.setRolloverEnabled(false); xbutton.setText(newContent.toString()); - //Debug.log("Button [" + name + "] = " + xbutton.getText(), module); + //Debug.logInfo("Button [" + name + "] = " + xbutton.getText(), module); } public String wrapText(String text, String newLine, int padding) { Modified: ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/config/ButtonEventConfig.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/config/ButtonEventConfig.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/config/ButtonEventConfig.java (original) +++ ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/config/ButtonEventConfig.java Sat Mar 17 07:05:15 2012 @@ -165,7 +165,7 @@ public class ButtonEventConfig implement public void invoke(PosScreen pos, AWTEvent event) throws ButtonEventNotFound, ButtonEventException { ClassLoader cl = Thread.currentThread().getContextClassLoader(); if (cl == null) { - Debug.log("Unable to obtain the context classloader", module); + Debug.logInfo("Unable to obtain the context classloader", module); cl = this.getClass().getClassLoader(); } Modified: ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/device/impl/CashDrawer.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/device/impl/CashDrawer.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/device/impl/CashDrawer.java (original) +++ ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/device/impl/CashDrawer.java Sat Mar 17 07:05:15 2012 @@ -95,7 +95,7 @@ public class CashDrawer extends GenericD } public void run() { - Debug.log("Starting Waiter Thread", module); + Debug.logInfo("Starting Waiter Thread", module); this.startTime = System.currentTimeMillis(); while (waiting) { boolean isOpen = true; @@ -119,7 +119,7 @@ public class CashDrawer extends GenericD } } this.startTime = -1; - Debug.log("Waiter finished", module); + Debug.logInfo("Waiter finished", module); } } Modified: ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Keyboard.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Keyboard.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Keyboard.java (original) +++ ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Keyboard.java Sat Mar 17 07:05:15 2012 @@ -54,10 +54,10 @@ public class Keyboard extends GenericDev keyboard.addDataListener(new DataEventAdaptor() { @Override public void dataOccurred(jpos.events.DataEvent event) { - Debug.log("POSKeyboard DataEvent - " + event.getWhen(), module); + Debug.logInfo("POSKeyboard DataEvent - " + event.getWhen(), module); try { int keyCode = keyboard.getPOSKeyData(); - Debug.log("Received KeyCode From POSKeyboard DataEvent : " + keyCode, module); + Debug.logInfo("Received KeyCode From POSKeyboard DataEvent : " + keyCode, module); // -1 is not valid if (keyCode == -1) { @@ -66,14 +66,14 @@ public class Keyboard extends GenericDev // check for button mapping if (PosScreen.currentScreen.isLocked() && 500 != keyCode) { - Debug.log("PosScreen is locked; not running POSKeyboard Event!", module); + Debug.logInfo("PosScreen is locked; not running POSKeyboard Event!", module); return; } List<String> buttonEvents = ButtonEventConfig.findButtonKeyAssign(keyCode); if (UtilValidate.isNotEmpty(buttonEvents)) { - Debug.log("Key -> Button Mapping(s) Found [" + keyCode + "]", module); + Debug.logInfo("Key -> Button Mapping(s) Found [" + keyCode + "]", module); try { ButtonEventConfig.invokeButtonEvents(buttonEvents, PosScreen.currentScreen); } catch (ButtonEventConfig.ButtonEventNotFound e) { Modified: ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Msr.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Msr.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Msr.java (original) +++ ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Msr.java Sat Mar 17 07:05:15 2012 @@ -101,7 +101,7 @@ public class Msr extends GenericDevice { @Override public void errorOccurred(jpos.events.ErrorEvent event) { - Debug.log("Error Occurred : " + event.getErrorCodeExtended(), module); + Debug.logInfo("Error Occurred : " + event.getErrorCodeExtended(), module); PosScreen.currentScreen.showDialog("dialog/error/cardreaderror"); try { msr.clearInput(); @@ -171,7 +171,7 @@ public class Msr extends GenericDevice { PosScreen pos = PosScreen.currentScreen.showPage("paypanel", false); pos.getInput().setFunction("TOTAL", ""); pos.refresh(); - Debug.log("Switched to paypanel.xml; triggered TOTAL function", module); + Debug.logInfo("Switched to paypanel.xml; triggered TOTAL function", module); } } } Modified: ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java (original) +++ ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/device/impl/Receipt.java Sat Mar 17 07:05:15 2012 @@ -118,7 +118,7 @@ public class Receipt extends GenericDevi } catch (JposException e) { Debug.logError(e, "Exception while setting jpos.POSPrinter.transactionPrint to transaction mode ", module); } - Debug.log("Print Report Requested", module); + Debug.logInfo("Print Report Requested", module); String[] report = this.readReportTemplate(resource); if (report != null) { @@ -150,7 +150,7 @@ public class Receipt extends GenericDevi } public void printReceipt(PosTransaction trans, boolean printStoreCopy) { - Debug.log("Print Receipt Requested : " + trans.getTransactionId(), module); + Debug.logInfo("Print Receipt Requested : " + trans.getTransactionId(), module); POSPrinter printer = (POSPrinter) control; this.lastTransaction = trans; Modified: ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java (original) +++ ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/event/ManagerEvents.java Sat Mar 17 07:05:15 2012 @@ -216,7 +216,7 @@ public class ManagerEvents { state.set("actualEndingGc", new BigDecimal(closeInfo[3])); state.set("actualEndingOther", new BigDecimal(closeInfo[4])); state.set("endingTxId", trans.getTransactionId()); - Debug.log("Updated State - " + state, module); + Debug.logInfo("Updated State - " + state, module); try { state.store(); state.refresh(); Modified: ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java (original) +++ ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/event/PaymentEvents.java Sat Mar 17 07:05:15 2012 @@ -42,7 +42,7 @@ public class PaymentEvents { // all cash transactions are NO_PAYMENT; no need to check try { BigDecimal amount = processAmount(trans, pos, null); - Debug.log("Processing [Cash] Amount : " + amount, module); + Debug.logInfo("Processing [Cash] Amount : " + amount, module); // add the payment trans.addPayment("CASH", amount, null, null); @@ -140,7 +140,7 @@ public class PaymentEvents { input.setFunction("CREDIT"); pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosCredNo",Locale.getDefault())); } else { - Debug.log("Credit Func Info : " + crtInfo[1], module); + Debug.logInfo("Credit Func Info : " + crtInfo[1], module); if (msrInfo == null && (creditExpirationInfo == null)) { //test credit card if (UtilValidate.isNotEmpty(input.value()) && UtilValidate.isCreditCard(input.value())) { @@ -149,7 +149,7 @@ public class PaymentEvents { input.setFunction("CREDITEXP"); pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosCredex",Locale.getDefault())); } else { - Debug.log("Invalid card number - " + input.value(), module); + Debug.logInfo("Invalid card number - " + input.value(), module); clearInputPaymentFunctions(pos); input.clearInput(); pos.showDialog("dialog/error/invalidcardnumber"); @@ -163,7 +163,7 @@ public class PaymentEvents { input.setFunction("SECURITYCODE"); pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosSecurityCode",Locale.getDefault())); } else { - Debug.log("Invalid expiration date", module); + Debug.logInfo("Invalid expiration date", module); clearInputPaymentFunctions(pos); input.clearInput(); pos.showDialog("dialog/error/invalidexpirationdate"); @@ -217,7 +217,7 @@ public class PaymentEvents { try { String[] totalInfo = input.getFunction("TOTAL"); amount = processAmount(trans, pos, totalInfo[1]); - Debug.log("Processing Credit Card Amount : " + amount, module); + Debug.logInfo("Processing Credit Card Amount : " + amount, module); } catch (GeneralException e) { Debug.logError("Exception caught calling processAmount.", module); Debug.logError(e.getMessage(), module); @@ -247,7 +247,7 @@ public class PaymentEvents { pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosCredex",Locale.getDefault())); break; default: - Debug.log("Hit the default switch case [" + allInfo + "] refreshing.", module); + Debug.logInfo("Hit the default switch case [" + allInfo + "] refreshing.", module); input.clearFunction("MSRINFO"); pos.getOutput().print(UtilProperties.getMessage(PosTransaction.resource,"PosCredNo",Locale.getDefault())); break; @@ -261,7 +261,7 @@ public class PaymentEvents { try { BigDecimal amount = processAmount(trans, pos, null); - Debug.log("Processing [" + paymentMethodTypeId + "] Amount : " + amount, module); + Debug.logInfo("Processing [" + paymentMethodTypeId + "] Amount : " + amount, module); // add the payment trans.addPayment(paymentMethodTypeId, amount, null, null); @@ -284,7 +284,7 @@ public class PaymentEvents { try { BigDecimal amount = processAmount(trans, pos, amountStr); - Debug.log("Processing [" + paymentMethodTypeId + "] Amount : " + amount, module); + Debug.logInfo("Processing [" + paymentMethodTypeId + "] Amount : " + amount, module); // add the payment trans.addPayment(paymentMethodTypeId, amount, refNum, null); @@ -397,9 +397,9 @@ public class PaymentEvents { throw new GeneralException(); } amount = amount.movePointLeft(2); // convert to decimal - Debug.log("Set amount / 100 : " + amount, module); + Debug.logInfo("Set amount / 100 : " + amount, module); } else { - Debug.log("Amount is empty; assumption is full amount : " + trans.getTotalDue(), module); + Debug.logInfo("Amount is empty; assumption is full amount : " + trans.getTotalDue(), module); amount = trans.getTotalDue(); if (amount.compareTo(BigDecimal.ZERO) <= 0) { throw new GeneralException(); @@ -407,7 +407,7 @@ public class PaymentEvents { } return amount; } else { - Debug.log("TOTAL function NOT set", module); + Debug.logInfo("TOTAL function NOT set", module); throw new GeneralException(); } } Modified: ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java (original) +++ ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/event/SecurityEvents.java Sat Mar 17 07:05:15 2012 @@ -135,7 +135,7 @@ public class SecurityEvents { } } } else { - Debug.log("Login function called but not prepared as a function!", module); + Debug.logInfo("Login function called but not prepared as a function!", module); } } } Modified: ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/event/TestEvents.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/event/TestEvents.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/event/TestEvents.java (original) +++ ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/event/TestEvents.java Sat Mar 17 07:05:15 2012 @@ -34,7 +34,7 @@ public class TestEvents { public static synchronized void logSelectedIndex(PosScreen pos) { Journal journal = pos.getJournal(); - Debug.log("Selected IDX - " + journal.getSelectedIdx(), module); + Debug.logInfo("Selected IDX - " + journal.getSelectedIdx(), module); } public static synchronized void testMsr(PosScreen pos) { Modified: ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/KeyboardService.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/KeyboardService.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/KeyboardService.java (original) +++ ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/KeyboardService.java Sat Mar 17 07:05:15 2012 @@ -148,7 +148,7 @@ public class KeyboardService extends Bas this.fireEvent(event); } } else { - Debug.log("Last Event is null??", module); + Debug.logInfo("Last Event is null??", module); } } Modified: ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullPosPrinter.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullPosPrinter.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullPosPrinter.java (original) +++ ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/jpos/service/NullPosPrinter.java Sat Mar 17 07:05:15 2012 @@ -482,7 +482,7 @@ public class NullPosPrinter extends Base private void printALine(String s) { printerBuffer = printerBuffer.append(s); if (s.indexOf(NullPosPrinter.PAPER_CUT) > 0) { - Debug.log(printerBuffer.toString(), module); + Debug.logInfo(printerBuffer.toString(), module); printerBuffer = new StringBuffer(); } } @@ -517,7 +517,7 @@ public class NullPosPrinter extends Base } public void transactionPrint(int i, int i1) throws JposException { - Debug.log("transactionPrint:\n\n", module); + Debug.logInfo("transactionPrint:\n\n", module); } public void validateData(int i, String s) throws JposException { Modified: ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/screen/ClientProfile.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/screen/ClientProfile.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/screen/ClientProfile.java (original) +++ ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/screen/ClientProfile.java Sat Mar 17 07:05:15 2012 @@ -344,7 +344,7 @@ public class ClientProfile extends XPage } catch (Throwable t) { } if (cl == null) { - Debug.log("No context classloader available; using class classloader", module); + Debug.logInfo("No context classloader available; using class classloader", module); try { cl = this.getClass().getClassLoader(); } catch (Throwable t) { Modified: ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/screen/LoadSale.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/screen/LoadSale.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/screen/LoadSale.java (original) +++ ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/screen/LoadSale.java Sat Mar 17 07:05:15 2012 @@ -228,7 +228,7 @@ public class LoadSale extends XPage { } catch (Throwable t) { } if (cl == null) { - Debug.log("No context classloader available; using class classloader", module); + Debug.logInfo("No context classloader available; using class classloader", module); try { cl = this.getClass().getClassLoader(); } catch (Throwable t) { Modified: ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java (original) +++ ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/screen/PosDialog.java Sat Mar 17 07:05:15 2012 @@ -234,7 +234,7 @@ public class PosDialog { } else if (this.closeBtn != null) { this.closeBtn.setText("<html><center>" + text + "</center></html>"); } else { - Debug.log("PosDialog output edit box is NULL!", module); + Debug.logInfo("PosDialog output edit box is NULL!", module); } } Modified: ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java (original) +++ ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/screen/PosScreen.java Sat Mar 17 07:05:15 2012 @@ -164,40 +164,40 @@ public class PosScreen extends XPage imp } public void logInfo() { - Debug.log("App Frame :", module); - Debug.log("name - " + appFrame.getName(), module); - Debug.log("title - " + appFrame.getTitle(), module); - Debug.log("active - " + appFrame.isActive(), module); - Debug.log("enabled - " + appFrame.isEnabled(), module); - Debug.log("visible - " + appFrame.isVisible(), module); - Debug.log("showing - " + appFrame.isShowing(), module); - Debug.log("opaque - " + appFrame.isOpaque(), module); - Debug.log("focusable - " + appFrame.isFocusable(), module); - Debug.log("focused - " + appFrame.isFocused(), module); - Debug.log("hasFocus - " + appFrame.hasFocus(), module); - - Debug.log("", module); - Debug.log("App Window :", module); - Debug.log("name - " + appWin.getName(), module); - Debug.log("active - " + appWin.isActive(), module); - Debug.log("enabled - " + appWin.isEnabled(), module); - Debug.log("visible - " + appWin.isVisible(), module); - Debug.log("showing - " + appWin.isShowing(), module); - Debug.log("opaque - " + appWin.isOpaque(), module); - Debug.log("focusable - " + appWin.isFocusable(), module); - Debug.log("focused - " + appWin.isFocused(), module); - Debug.log("hasFocus - " + appWin.hasFocus(), module); - - Debug.log("", module); - - Debug.log("POS Screen :", module); - Debug.log("name - " + this.getName(), module); - Debug.log("enabled - " + this.isEnabled(), module); - Debug.log("visible - " + this.isVisible(), module); - Debug.log("showing - " + this.isShowing(), module); - Debug.log("opaque - " + this.isOpaque(), module); - Debug.log("focusable - " + this.isFocusable(), module); - Debug.log("focused - " + this.hasFocus(), module); + Debug.logInfo("App Frame :", module); + Debug.logInfo("name - " + appFrame.getName(), module); + Debug.logInfo("title - " + appFrame.getTitle(), module); + Debug.logInfo("active - " + appFrame.isActive(), module); + Debug.logInfo("enabled - " + appFrame.isEnabled(), module); + Debug.logInfo("visible - " + appFrame.isVisible(), module); + Debug.logInfo("showing - " + appFrame.isShowing(), module); + Debug.logInfo("opaque - " + appFrame.isOpaque(), module); + Debug.logInfo("focusable - " + appFrame.isFocusable(), module); + Debug.logInfo("focused - " + appFrame.isFocused(), module); + Debug.logInfo("hasFocus - " + appFrame.hasFocus(), module); + + Debug.logInfo("", module); + Debug.logInfo("App Window :", module); + Debug.logInfo("name - " + appWin.getName(), module); + Debug.logInfo("active - " + appWin.isActive(), module); + Debug.logInfo("enabled - " + appWin.isEnabled(), module); + Debug.logInfo("visible - " + appWin.isVisible(), module); + Debug.logInfo("showing - " + appWin.isShowing(), module); + Debug.logInfo("opaque - " + appWin.isOpaque(), module); + Debug.logInfo("focusable - " + appWin.isFocusable(), module); + Debug.logInfo("focused - " + appWin.isFocused(), module); + Debug.logInfo("hasFocus - " + appWin.hasFocus(), module); + + Debug.logInfo("", module); + + Debug.logInfo("POS Screen :", module); + Debug.logInfo("name - " + this.getName(), module); + Debug.logInfo("enabled - " + this.isEnabled(), module); + Debug.logInfo("visible - " + this.isVisible(), module); + Debug.logInfo("showing - " + this.isShowing(), module); + Debug.logInfo("opaque - " + this.isOpaque(), module); + Debug.logInfo("focusable - " + this.isFocusable(), module); + Debug.logInfo("focused - " + this.hasFocus(), module); } public void refresh() { @@ -360,7 +360,7 @@ public class PosScreen extends XPage imp // PosDialog Callback method public void receiveDialogCb(PosDialog dialog) { - Debug.log("Dialog closed; refreshing screen", module); + Debug.logInfo("Dialog closed; refreshing screen", module); this.refresh(); } @@ -368,7 +368,7 @@ public class PosScreen extends XPage imp public void run() { while (monitorRunning) { if (!isLocked && (System.currentTimeMillis() - lastActivity) > MAX_INACTIVITY) { - Debug.log("POS terminal auto-lock activated", module); + Debug.logInfo("POS terminal auto-lock activated", module); PosScreen.currentScreen.showPage("pospanel").setLock(true); } try { @@ -382,14 +382,14 @@ public class PosScreen extends XPage imp public void focusGained(FocusEvent event) { if (Debug.verboseOn()) { String from = event != null && event.getOppositeComponent() != null ? event.getOppositeComponent().getName() : "??"; - Debug.log(event.getSource() + " focus gained from " + from, module); + Debug.logInfo(event.getSource() + " focus gained from " + from, module); } } public void focusLost(FocusEvent event) { if (Debug.verboseOn()) { String to = event != null && event.getOppositeComponent() != null ? event.getOppositeComponent().getName() : "??"; - Debug.log(event.getSource() + " focus lost to " + to, module); + Debug.logInfo(event.getSource() + " focus lost to " + to, module); } } Modified: ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java (original) +++ ofbiz/branches/release11.04/specialpurpose/pos/src/org/ofbiz/pos/screen/SaveSale.java Sat Mar 17 07:05:15 2012 @@ -156,7 +156,7 @@ public class SaveSale extends XPage { } catch (Throwable t) { } if (cl == null) { - Debug.log("No context classloader available; using class classloader", module); + Debug.logInfo("No context classloader available; using class classloader", module); try { cl = this.getClass().getClassLoader(); } catch (Throwable t) { Modified: ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/audit/EntityAuditMgr.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/audit/EntityAuditMgr.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/audit/EntityAuditMgr.java (original) +++ ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/audit/EntityAuditMgr.java Sat Mar 17 07:05:15 2012 @@ -151,23 +151,23 @@ public class EntityAuditMgr implements E processHistory.addAll(getCreateProcessEvents(processId)); processHistory.addAll(getProcessDataEvents(processId)); processHistory.addAll(getProcessStateEvents(processId)); - if (Debug.verboseOn()) Debug.log(":: restoreProcessHistory :: " + processHistory.size(), module); + if (Debug.verboseOn()) Debug.logInfo(":: restoreProcessHistory :: " + processHistory.size(), module); return processHistory; } public List restoreActivityHistory(String processId, String activityId, SharkTransaction trans) throws EventAuditException { - if (Debug.verboseOn()) Debug.log(":: restoreActivityHistory ::", module); + if (Debug.verboseOn()) Debug.logInfo(":: restoreActivityHistory ::", module); List activityHistory = new ArrayList(); activityHistory.addAll(getAssignmentEvents(processId, activityId)); activityHistory.addAll(getActivityDataEvents(processId, activityId)); activityHistory.addAll(getActivityStateEvents(processId, activityId)); - if (Debug.verboseOn()) Debug.log(":: restoreActivityHistory :: " + activityHistory.size(), module); + if (Debug.verboseOn()) Debug.logInfo(":: restoreActivityHistory :: " + activityHistory.size(), module); return activityHistory; } // process history private List getCreateProcessEvents(String processId) throws EventAuditException { - if (Debug.verboseOn()) Debug.log(":: getCreateProcessEvents ::", module); + if (Debug.verboseOn()) Debug.logInfo(":: getCreateProcessEvents ::", module); Delegator delegator = SharkContainer.getDelegator(); List createProcessEvents = new ArrayList(); List lookupList = null; @@ -190,7 +190,7 @@ public class EntityAuditMgr implements E } private List getProcessStateEvents(String processId) throws EventAuditException { - if (Debug.verboseOn()) Debug.log(":: getProcessStateEvents ::", module); + if (Debug.verboseOn()) Debug.logInfo(":: getProcessStateEvents ::", module); Delegator delegator = SharkContainer.getDelegator(); List stateEvents = new ArrayList(); List lookupList = null; @@ -213,7 +213,7 @@ public class EntityAuditMgr implements E } private List getProcessDataEvents(String processId) throws EventAuditException { - if (Debug.verboseOn()) Debug.log(":: getProcessDataEvents ::", module); + if (Debug.verboseOn()) Debug.logInfo(":: getProcessDataEvents ::", module); Delegator delegator = SharkContainer.getDelegator(); List dataEvents = new ArrayList(); List lookupList = null; @@ -237,7 +237,7 @@ public class EntityAuditMgr implements E // activity history private List getAssignmentEvents(String processId, String activityId) throws EventAuditException { - if (Debug.verboseOn()) Debug.log(":: getAssignmentEvents ::", module); + if (Debug.verboseOn()) Debug.logInfo(":: getAssignmentEvents ::", module); Delegator delegator = SharkContainer.getDelegator(); List assignmentEvents = new ArrayList(); List lookupList = null; @@ -260,7 +260,7 @@ public class EntityAuditMgr implements E } private List getActivityStateEvents(String processId, String activityId) throws EventAuditException { - if (Debug.verboseOn()) Debug.log(":: getActivityStateEvents ::", module); + if (Debug.verboseOn()) Debug.logInfo(":: getActivityStateEvents ::", module); Delegator delegator = SharkContainer.getDelegator(); List stateEvents = new ArrayList(); List lookupList = null; @@ -283,7 +283,7 @@ public class EntityAuditMgr implements E } private List getActivityDataEvents(String processId, String activityId) throws EventAuditException { - if (Debug.verboseOn()) Debug.log(":: getActivityDataEvents ::", module); + if (Debug.verboseOn()) Debug.logInfo(":: getActivityDataEvents ::", module); Delegator delegator = SharkContainer.getDelegator(); List dataEvents = new ArrayList(); List lookupList = null; Modified: ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/instance/Activity.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/instance/Activity.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/instance/Activity.java (original) +++ ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/instance/Activity.java Sat Mar 17 07:05:15 2012 @@ -226,7 +226,7 @@ public class Activity extends InstanceEn public void remove() throws GenericEntityException { if (!newValue) { delegator.removeValue(activity); - Debug.log("**** REMOVED : " + this, module); + Debug.logInfo("**** REMOVED : " + this, module); } } Modified: ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/instance/ActivityVariable.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/instance/ActivityVariable.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/instance/ActivityVariable.java (original) +++ ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/instance/ActivityVariable.java Sat Mar 17 07:05:15 2012 @@ -63,7 +63,7 @@ public class ActivityVariable extends In super(mgr, delegator); this.newValue = true; this.activityVariable = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfActivityVariable, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.activityVariableId, delegator.getNextSeqId(org.ofbiz.shark.SharkConstants.WfActivityVariable))); - Debug.log("******* New activity variable created", module); + Debug.logInfo("******* New activity variable created", module); } public static ActivityVariable getInstance(EntityPersistentMgr mgr, GenericValue activityVariable) { Modified: ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/instance/Assignment.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/instance/Assignment.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/instance/Assignment.java (original) +++ ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/instance/Assignment.java Sat Mar 17 07:05:15 2012 @@ -60,7 +60,7 @@ public class Assignment extends Instance super(mgr, delegator); this.newValue = true; this.assignment = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfAssignment); - Debug.log("******* New assignment created", module); + Debug.logInfo("******* New assignment created", module); } public static Assignment getInstance(EntityPersistentMgr mgr, GenericValue assignment) { @@ -88,7 +88,7 @@ public class Assignment extends Instance public void setActivityId(String actId) { assignment.set(org.ofbiz.shark.SharkConstants.activityId, actId); - Debug.log("Set activityId on assignment : " + actId, module); + Debug.logInfo("Set activityId on assignment : " + actId, module); // set the processId - kludge /* should not be needed anymore try { @@ -108,7 +108,7 @@ public class Assignment extends Instance public void setResourceUsername(String username) { assignment.set(org.ofbiz.shark.SharkConstants.userName, username); - Debug.log("Set userName on assignment : " + username, module); + Debug.logInfo("Set userName on assignment : " + username, module); } public String getResourceUsername() { @@ -117,7 +117,7 @@ public class Assignment extends Instance public void setProcessId(String procId) { assignment.set(org.ofbiz.shark.SharkConstants.processId, procId); - Debug.log("Set processId on assignment : " + procId, module); + Debug.logInfo("Set processId on assignment : " + procId, module); } public String getProcessId() { @@ -139,7 +139,7 @@ public class Assignment extends Instance } else { delegator.store(assignment); } - Debug.log("Stored assignment : " + assignment, module); + Debug.logInfo("Stored assignment : " + assignment, module); } public void reload() throws GenericEntityException { @@ -151,7 +151,7 @@ public class Assignment extends Instance public void remove() throws GenericEntityException { if (!newValue) { delegator.removeValue(assignment); - Debug.log("**** REMOVED : " + this, module); + Debug.logInfo("**** REMOVED : " + this, module); } } Modified: ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/instance/EntityPersistentMgr.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/instance/EntityPersistentMgr.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/instance/EntityPersistentMgr.java (original) +++ ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/instance/EntityPersistentMgr.java Sat Mar 17 07:05:15 2012 @@ -176,7 +176,7 @@ public class EntityPersistentMgr impleme } public boolean restore(ProcessVariablePersistenceInterface processVariablePersistenceInterface, SharkTransaction trans) throws PersistenceException { - if (Debug.verboseOn()) Debug.log(":: ProcessVariablePersistenceInterface ::", module); + if (Debug.verboseOn()) Debug.logInfo(":: ProcessVariablePersistenceInterface ::", module); if (processVariablePersistenceInterface == null) { return false; } @@ -190,7 +190,7 @@ public class EntityPersistentMgr impleme } public boolean restore(ActivityVariablePersistenceInterface activityVariablePersistenceInterface, SharkTransaction trans) throws PersistenceException { - if (Debug.verboseOn()) Debug.log(":: ActivityVariablePersistenceInterface ::", module); + if (Debug.verboseOn()) Debug.logInfo(":: ActivityVariablePersistenceInterface ::", module); if (activityVariablePersistenceInterface == null) { return false; } @@ -205,7 +205,7 @@ public class EntityPersistentMgr impleme public void deleteProcessMgr(String mgrName, SharkTransaction trans) throws PersistenceException { - if (Debug.infoOn()) Debug.log(":: deleteProcessMgr ::", module); + if (Debug.infoOn()) Debug.logInfo(":: deleteProcessMgr ::", module); try { ((ProcessMgr) restoreProcessMgr(mgrName, trans)).remove(); } catch (GenericEntityException e) { @@ -216,7 +216,7 @@ public class EntityPersistentMgr impleme public void deleteProcess(String processId, boolean admin, SharkTransaction trans) throws PersistenceException { Delegator delegator = SharkContainer.getDelegator(); if (admin) { - if (Debug.infoOn()) Debug.log(":: deleteProcess ::", module); + if (Debug.infoOn()) Debug.logInfo(":: deleteProcess ::", module); Process process = (Process) this.restoreProcess(processId, trans); List activities = this.getAllActivitiesForProcess(processId, trans); if (activities != null) { @@ -242,7 +242,7 @@ public class EntityPersistentMgr impleme } public void deleteActivity(String activityId, SharkTransaction trans) throws PersistenceException { - if (Debug.infoOn()) Debug.log(":: deleteActivity ::", module); + if (Debug.infoOn()) Debug.logInfo(":: deleteActivity ::", module); Activity activity = (Activity) this.restoreActivity(activityId, trans); List assignments = this.getAllAssignmentsForActivity(activityId, trans); if (assignments != null) { @@ -265,7 +265,7 @@ public class EntityPersistentMgr impleme } public void deleteResource(String userName, SharkTransaction trans) throws PersistenceException { - if (Debug.infoOn()) Debug.log(":: deleteResource ::", module); + if (Debug.infoOn()) Debug.logInfo(":: deleteResource ::", module); try { ((Resource) restoreResource(userName, trans)).remove(); } catch (GenericEntityException e) { @@ -274,7 +274,7 @@ public class EntityPersistentMgr impleme } public void deleteAssignment(String activityId, String userName, SharkTransaction trans) throws PersistenceException { - if (Debug.infoOn()) Debug.log(":: deleteAssignment ::", module); + if (Debug.infoOn()) Debug.logInfo(":: deleteAssignment ::", module); try { ((Assignment) restoreAssignment(activityId, userName, trans)).remove(); } catch (GenericEntityException e) { @@ -283,7 +283,7 @@ public class EntityPersistentMgr impleme } public void deleteAndJoinEntries(String procId, String asDefId, String aDefId, SharkTransaction trans) throws PersistenceException { - if (Debug.infoOn()) Debug.log(":: deleteAndJoinEntries ::", module); + if (Debug.infoOn()) Debug.logInfo(":: deleteAndJoinEntries ::", module); Delegator delegator = SharkContainer.getDelegator(); try { delegator.removeByAnd(org.ofbiz.shark.SharkConstants.WfAndJoin, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.processId, procId, @@ -352,7 +352,7 @@ public class EntityPersistentMgr impleme } public List getAllProcessMgrs(SharkTransaction trans) throws PersistenceException { - if (Debug.verboseOn()) Debug.log(":: getAllProcessMgrs ::", module); + if (Debug.verboseOn()) Debug.logInfo(":: getAllProcessMgrs ::", module); Delegator delegator = SharkContainer.getDelegator(); List createdList = new ArrayList(); List lookupList = null; @@ -382,7 +382,7 @@ public class EntityPersistentMgr impleme } public List getAllResources(SharkTransaction trans) throws PersistenceException { - if (Debug.verboseOn()) Debug.log(":: getAllResources ::", module); + if (Debug.verboseOn()) Debug.logInfo(":: getAllResources ::", module); Delegator delegator = SharkContainer.getDelegator(); List createdList = new ArrayList(); List lookupList = null; @@ -402,7 +402,7 @@ public class EntityPersistentMgr impleme } public List getAllAssignments(SharkTransaction trans) throws PersistenceException { - if (Debug.verboseOn()) Debug.log(":: getAllAssignments ::", module); + if (Debug.verboseOn()) Debug.logInfo(":: getAllAssignments ::", module); Delegator delegator = SharkContainer.getDelegator(); List createdList = new ArrayList(); List lookupList = null; @@ -421,7 +421,7 @@ public class EntityPersistentMgr impleme return createdList; } public List getAllActivities(SharkTransaction trans) throws PersistenceException { - if (Debug.verboseOn()) Debug.log(":: getAllActivities ::", module); + if (Debug.verboseOn()) Debug.logInfo(":: getAllActivities ::", module); Delegator delegator = SharkContainer.getDelegator(); List createdList = new ArrayList(); List lookupList = null; @@ -441,12 +441,12 @@ public class EntityPersistentMgr impleme } public List getAllProcessesForMgr(String mgrName, SharkTransaction trans) throws PersistenceException { - if (Debug.verboseOn()) Debug.log(":: getAllProcessesForMgr ::", module); + if (Debug.verboseOn()) Debug.logInfo(":: getAllProcessesForMgr ::", module); return this.getProcessesForMgr(mgrName, null, trans); } public List getProcessesForMgr(String mgrName, String state, SharkTransaction trans) throws PersistenceException { - if (Debug.verboseOn()) Debug.log(":: getProcessesForMgr ::", module); + if (Debug.verboseOn()) Debug.logInfo(":: getProcessesForMgr ::", module); Delegator delegator = SharkContainer.getDelegator(); List createdList = new ArrayList(); List lookupList = null; @@ -681,7 +681,7 @@ public class EntityPersistentMgr impleme } public List getAllVariablesForProcess(String processId, SharkTransaction trans) throws PersistenceException { - if (Debug.verboseOn()) Debug.log(":: getAllVariablesForProcess ::", module); + if (Debug.verboseOn()) Debug.logInfo(":: getAllVariablesForProcess ::", module); Delegator delegator = SharkContainer.getDelegator(); List createdList = new ArrayList(); List lookupList = null; @@ -692,22 +692,22 @@ public class EntityPersistentMgr impleme throw new PersistenceException(e); } if (UtilValidate.isNotEmpty(lookupList)) { - Debug.log("Lookup list contains : " + lookupList.size(), module); + Debug.logInfo("Lookup list contains : " + lookupList.size(), module); Iterator i = lookupList.iterator(); while (i.hasNext()) { GenericValue v = (GenericValue) i.next(); createdList.add(ProcessVariable.getInstance(this, v)); } } else { - Debug.log("Lookup list empty", module); + Debug.logInfo("Lookup list empty", module); } - if (Debug.verboseOn()) Debug.log("Returning list : " + createdList.size(), module); + if (Debug.verboseOn()) Debug.logInfo("Returning list : " + createdList.size(), module); return createdList; } public List getAllVariablesForActivity(String activityId, SharkTransaction trans) throws PersistenceException { - if (Debug.verboseOn()) Debug.log(":: getAllVariablesForActivity ::", module); + if (Debug.verboseOn()) Debug.logInfo(":: getAllVariablesForActivity ::", module); Delegator delegator = SharkContainer.getDelegator(); List createdList = new ArrayList(); List lookupList = null; @@ -781,7 +781,7 @@ public class EntityPersistentMgr impleme } public List getAllIdsForProcessesWithExpiriedDeadlines(long l, SharkTransaction trans) throws PersistenceException { - if (Debug.infoOn()) Debug.log(":: getAllIdsForProcessesWithExpiriedDeadlines ::", module); + if (Debug.infoOn()) Debug.logInfo(":: getAllIdsForProcessesWithExpiriedDeadlines ::", module); Delegator delegator = SharkContainer.getDelegator(); List processIds = new ArrayList(); @@ -948,7 +948,7 @@ public class EntityPersistentMgr impleme Debug.logInfo(">>>>>>>>>>>>>>>>>>>>>>> getAssignmentsWhere(SharkTransaction trans, String sqlWhere)",module); Debug.logInfo(">>>>>>>>>>>>>>>>>>>>>>> sqlWhere = " + sqlWhere ,module); if (sqlWhere != null) { - Debug.log("Call : Attempt to call getAssignmentsWhere() - " + sqlWhere, module); + Debug.logInfo("Call : Attempt to call getAssignmentsWhere() - " + sqlWhere, module); throw new PersistenceException("Method not available to this implementation! (" + sqlWhere + ")"); } return this.getAllAssignments(trans); @@ -1003,7 +1003,7 @@ public class EntityPersistentMgr impleme return returnList; } public List getAllProcesses(SharkTransaction trans) throws PersistenceException { - if (Debug.verboseOn()) Debug.log(":: getAllProcesses ::", module); + if (Debug.verboseOn()) Debug.logInfo(":: getAllProcesses ::", module); Delegator delegator = SharkContainer.getDelegator(); List createdList = new ArrayList(); List lookupList = null; Modified: ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/instance/Process.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/instance/Process.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/instance/Process.java (original) +++ ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/instance/Process.java Sat Mar 17 07:05:15 2012 @@ -80,11 +80,11 @@ public class Process extends InstanceEnt public static Process getInstance(EntityPersistentMgr mgr, String processId) throws PersistenceException { Process proc = new Process(mgr, SharkContainer.getDelegator(), processId); if (proc.isLoaded()) { - Debug.log("Returning loaded Process", module); + Debug.logInfo("Returning loaded Process", module); return proc; } - Debug.log("Returning null Process ID : " + processId, module); - if (processId == null) Debug.log(new Exception(), module); + Debug.logInfo("Returning null Process ID : " + processId, module); + if (processId == null) Debug.logInfo(new Exception(), module); return null; } @@ -231,7 +231,7 @@ public class Process extends InstanceEnt public void remove() throws GenericEntityException { if (!newValue) { delegator.removeValue(process); - Debug.log("**** REMOVED : " + this, module); + Debug.logInfo("**** REMOVED : " + this, module); } delegator.removeByAnd(org.ofbiz.shark.SharkConstants.WfRequester, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.processId, this.getId())); } Modified: ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/instance/ProcessMgr.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/instance/ProcessMgr.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/instance/ProcessMgr.java (original) +++ ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/instance/ProcessMgr.java Sat Mar 17 07:05:15 2012 @@ -144,7 +144,7 @@ public class ProcessMgr extends Instance public void remove() throws GenericEntityException { if (!newValue) { delegator.removeValue(processMgr); - Debug.log("**** REMOVED : " + this, module); + Debug.logInfo("**** REMOVED : " + this, module); } } Modified: ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/instance/ProcessVariable.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/instance/ProcessVariable.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/instance/ProcessVariable.java (original) +++ ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/instance/ProcessVariable.java Sat Mar 17 07:05:15 2012 @@ -61,7 +61,7 @@ public class ProcessVariable extends Ins super(mgr, delegator); this.newValue = true; this.processVariable = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfProcessVariable, UtilMisc.toMap(org.ofbiz.shark.SharkConstants.processVariableId, delegator.getNextSeqId(org.ofbiz.shark.SharkConstants.WfProcessVariable))); - Debug.log("******* New process variable created", module); + Debug.logInfo("******* New process variable created", module); } public static ProcessVariable getInstance(EntityPersistentMgr mgr, GenericValue processVariable) { Modified: ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/instance/Resource.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/instance/Resource.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/instance/Resource.java (original) +++ ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/instance/Resource.java Sat Mar 17 07:05:15 2012 @@ -119,7 +119,7 @@ public class Resource extends InstanceEn public void remove() throws GenericEntityException { if (!newValue) { delegator.removeValue(resource); - Debug.log("**** REMOVED : " + this, module); + Debug.logInfo("**** REMOVED : " + this, module); } } } Modified: ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityParticipantMap.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityParticipantMap.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityParticipantMap.java (original) +++ ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/mapping/EntityParticipantMap.java Sat Mar 17 07:05:15 2012 @@ -152,7 +152,7 @@ public class EntityParticipantMap implem } public void remove() throws RootException { - Debug.log("::Remove Participant Map::", module); + Debug.logInfo("::Remove Participant Map::", module); if (!newValue) { try { delegator.removeValue(participant); Modified: ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java (original) +++ ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/repository/EntityRepositoryMgr.java Sat Mar 17 07:05:15 2012 @@ -73,7 +73,7 @@ public class EntityRepositoryMgr impleme } public void deleteXPDL(RepositoryTransaction t, String xpdlId, String xpdlVersion) throws RepositoryException { - Debug.log("XPDL Delete : " + xpdlId + "/" + xpdlVersion, module); + Debug.logInfo("XPDL Delete : " + xpdlId + "/" + xpdlVersion, module); Delegator delegator = SharkContainer.getDelegator(); GenericValue value = this.getXpdlValue(xpdlId, xpdlVersion, false); if (value != null) { @@ -87,7 +87,7 @@ public class EntityRepositoryMgr impleme } public void moveToHistory(RepositoryTransaction t, String xpdlId, String xpdlVersion) throws RepositoryException { - Debug.log("XPDL Move to History : " + xpdlId + "/" + xpdlVersion, module); + Debug.logInfo("XPDL Move to History : " + xpdlId + "/" + xpdlVersion, module); Delegator delegator = SharkContainer.getDelegator(); GenericValue value = this.getXpdlValue(xpdlId, xpdlVersion, false); value.set(org.ofbiz.shark.SharkConstants.isHistorical, "Y"); @@ -100,7 +100,7 @@ public class EntityRepositoryMgr impleme } public void deleteFromHistory(RepositoryTransaction t, String xpdlId, String xpdlVersion) throws RepositoryException { - Debug.log("XPDL Delete from History: " + xpdlId + "/" + xpdlVersion, module); + Debug.logInfo("XPDL Delete from History: " + xpdlId + "/" + xpdlVersion, module); GenericValue value = this.getXpdlValue(xpdlId, xpdlVersion, true); if (value != null) { try { @@ -112,7 +112,7 @@ public class EntityRepositoryMgr impleme } public void clearRepository(RepositoryTransaction t) throws RepositoryException { - Debug.log("XPDL Clear Repository", module); + Debug.logInfo("XPDL Clear Repository", module); Delegator delegator = SharkContainer.getDelegator(); try { delegator.removeAll(org.ofbiz.shark.SharkConstants.WfRepository); @@ -123,7 +123,7 @@ public class EntityRepositoryMgr impleme public String getCurrentVersion(RepositoryTransaction t, String xpdlId) throws RepositoryException { - Debug.log("XPDL get current version : " + xpdlId, module); + Debug.logInfo("XPDL get current version : " + xpdlId, module); List lookupList = this.getXpdlValues(xpdlId, null, false); GenericValue value = EntityUtil.getFirst(lookupList); if (value != null) { @@ -142,7 +142,7 @@ public class EntityRepositoryMgr impleme } public byte[] getXPDL(RepositoryTransaction t, String xpdlId) throws RepositoryException { - Debug.log("XPDL Get : " + xpdlId, module); + Debug.logInfo("XPDL Get : " + xpdlId, module); List lookupList = this.getXpdlValues(xpdlId, null, false); GenericValue value = EntityUtil.getFirst(lookupList); if (value != null) { @@ -153,7 +153,7 @@ public class EntityRepositoryMgr impleme } public byte[] getXPDL(RepositoryTransaction t, String xpdlId, String xpdlVersion) throws RepositoryException { - Debug.log("XPDL Get : " + xpdlId + "/" + xpdlVersion, module); + Debug.logInfo("XPDL Get : " + xpdlId + "/" + xpdlVersion, module); GenericValue value = this.getXpdlValue(xpdlId, xpdlVersion, false); if (value != null) { return value.getBytes(org.ofbiz.shark.SharkConstants.xpdlData); @@ -177,25 +177,25 @@ public class EntityRepositoryMgr impleme public boolean doesXPDLExist(RepositoryTransaction t, String xpdlId) throws RepositoryException { List xpdls = this.getXpdlValues(xpdlId, null, false); - Debug.log("Does XPDL [" + xpdlId + "] Exist - " + xpdls + "(" + (UtilValidate.isNotEmpty(xpdls) ? true : false) + ")", module); + Debug.logInfo("Does XPDL [" + xpdlId + "] Exist - " + xpdls + "(" + (UtilValidate.isNotEmpty(xpdls) ? true : false) + ")", module); return (UtilValidate.isNotEmpty(xpdls) ? true : false); } public boolean doesXPDLExist(RepositoryTransaction t, String xpdlId, String xpdlVersion) throws RepositoryException { GenericValue xpdl = this.getXpdlValue(xpdlId, xpdlVersion, false); - Debug.log("Does XPDL [" + xpdlId + "/" + xpdlVersion + "] Exist - " + xpdl + "(" + (xpdl != null) + ")", module); + Debug.logInfo("Does XPDL [" + xpdlId + "/" + xpdlVersion + "] Exist - " + xpdl + "(" + (xpdl != null) + ")", module); return (xpdl != null); } public List getExistingXPDLIds(RepositoryTransaction t) throws RepositoryException { - Debug.log("Get Existing XPDL IDs", module); + Debug.logInfo("Get Existing XPDL IDs", module); List lookupList = this.getXpdlValues(null, null, true); List idList = new ArrayList(); if (UtilValidate.isNotEmpty(lookupList)) { Iterator i = lookupList.iterator(); while (i.hasNext()) { GenericValue v = (GenericValue) i.next(); - Debug.log("Checking - " + v, module); + Debug.logInfo("Checking - " + v, module); String id = v.getString(org.ofbiz.shark.SharkConstants.xpdlId); if (!idList.contains(id)) { idList.add(id); @@ -206,7 +206,7 @@ public class EntityRepositoryMgr impleme } public List getReferringXPDLIds(RepositoryTransaction t, String referredXPDLId) throws RepositoryException { - Debug.log("Get XPDL Reference IDs", module); + Debug.logInfo("Get XPDL Reference IDs", module); Delegator delegator = SharkContainer.getDelegator(); List referringIds = new ArrayList(); List refs = null; @@ -227,7 +227,7 @@ public class EntityRepositoryMgr impleme } public List getReferringXPDLVersions(RepositoryTransaction t, String referredXPDLId, String referringXPDLId) throws RepositoryException { - Debug.log("Get Referring XPDL Versions", module); + Debug.logInfo("Get Referring XPDL Versions", module); Delegator delegator = SharkContainer.getDelegator(); List referringVers = new ArrayList(); List refs = null; @@ -247,7 +247,7 @@ public class EntityRepositoryMgr impleme } public List getReferredXPDLIds(RepositoryTransaction t, String referringXPDLId, String referringXPDLVersion) throws RepositoryException { - Debug.log("Get Referring XPDL IDs", module); + Debug.logInfo("Get Referring XPDL IDs", module); Delegator delegator = SharkContainer.getDelegator(); List referringIds = new ArrayList(); List refs = null; @@ -323,7 +323,7 @@ public class EntityRepositoryMgr impleme byte[] serializedPkg, long xpdlClassVer) throws RepositoryException { - Debug.log("XPDL Upload : " + xpdlId, module); + Debug.logInfo("XPDL Upload : " + xpdlId, module); //try {throw new Exception ("XPDL Upload");} catch (Exception e) {e.printStackTrace();}; String newVersion = null; try { @@ -342,7 +342,7 @@ public class EntityRepositoryMgr impleme v.setBytes(org.ofbiz.shark.SharkConstants.serializedPkg,serializedPkg); v.setBytes(org.ofbiz.shark.SharkConstants.xpdlData, xpdl); delegator.create(v); - Debug.log("Created Value - " + v, module); + Debug.logInfo("Created Value - " + v, module); } catch (GenericEntityException e) { throw new RepositoryException(e); } @@ -363,7 +363,7 @@ public class EntityRepositoryMgr impleme public byte[] getSerializedXPDLObject(RepositoryTransaction arg0, String arg1, String arg2) throws RepositoryException { - Debug.log("XPDL Get : " + arg1, module); + Debug.logInfo("XPDL Get : " + arg1, module); List lookupList = this.getXpdlValues(arg1, null, false); GenericValue value = EntityUtil.getFirst(lookupList); if (value != null) { @@ -378,7 +378,7 @@ public class EntityRepositoryMgr impleme String referringXPDLVersion, int referredXPDLNumber) throws RepositoryException { - Debug.log("Add XPDL Reference", module); + Debug.logInfo("Add XPDL Reference", module); Delegator delegator = SharkContainer.getDelegator(); GenericValue ref = delegator.makeValue(org.ofbiz.shark.SharkConstants.WfRepositoryRef); ref.set(org.ofbiz.shark.SharkConstants.xpdlId, referringXPDLId); Modified: ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/requester/LoggingRequester.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/requester/LoggingRequester.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/requester/LoggingRequester.java (original) +++ ofbiz/branches/release11.04/specialpurpose/shark/src/org/ofbiz/shark/requester/LoggingRequester.java Sat Mar 17 07:05:15 2012 @@ -55,7 +55,7 @@ public class LoggingRequester extends Ab // ------------------- public void receive_event(WfEventAudit event) throws BaseException, InvalidPerformer { - Debug.log("Received event - " + event.event_type(), module); + Debug.logInfo("Received event - " + event.event_type(), module); } public void receive_event(SharkTransaction sharkTransaction, WfEventAudit event) throws BaseException, InvalidPerformer { Modified: ofbiz/branches/release11.04/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java URL: http://svn.apache.org/viewvc/ofbiz/branches/release11.04/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java?rev=1301874&r1=1301873&r2=1301874&view=diff ============================================================================== --- ofbiz/branches/release11.04/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java (original) +++ ofbiz/branches/release11.04/specialpurpose/webpos/src/org/ofbiz/webpos/transaction/WebPosTransaction.java Sat Mar 17 07:05:15 2012 @@ -191,7 +191,7 @@ public class WebPosTransaction { public BigDecimal processSale() throws GeneralException { //TODO insert check if not enough funds - Debug.log("process sale", module); + Debug.logInfo("process sale", module); BigDecimal grandTotal = this.getGrandTotal(); BigDecimal paymentAmt = this.getPaymentTotal(); if (grandTotal.compareTo(paymentAmt) > 0) { @@ -202,14 +202,14 @@ public class WebPosTransaction { getCart().setOrderPartyId(partyId); // validate payment methods - Debug.log("Validating payment methods", module); + Debug.logInfo("Validating payment methods", module); Map<String, ? extends Object> valRes = ch.validatePaymentMethods(); if (valRes != null && ServiceUtil.isError(valRes)) { throw new GeneralException(ServiceUtil.getErrorMessage(valRes)); } // store the "order" - Debug.log("Store order", module); + Debug.logInfo("Store order", module); Map<String, ? extends Object> orderRes = ch.createOrder(webPosSession.getUserLogin()); if (orderRes != null && ServiceUtil.isError(orderRes)) { @@ -219,7 +219,7 @@ public class WebPosTransaction { } // process the payment(s) - Debug.log("Processing the payment(s)", module); + Debug.logInfo("Processing the payment(s)", module); Map<String, ? extends Object> payRes = null; try { payRes = ch.processPayment(ProductStoreWorker.getProductStore(webPosSession.getProductStoreId(), webPosSession.getDelegator()), webPosSession.getUserLogin(), true); @@ -328,7 +328,7 @@ public class WebPosTransaction { Iterator<GenericValue> i = values.iterator(); while (i.hasNext() && isExternal) { GenericValue v = i.next(); - //Debug.log("Testing [" + paymentMethodTypeId + "] - " + v, module); + //Debug.logInfo("Testing [" + paymentMethodTypeId + "] - " + v, module); if (!externalCode.equals(v.getString("paymentServiceTypeEnumId"))) { isExternal = false; } @@ -378,7 +378,7 @@ public class WebPosTransaction { throw new GeneralException(); } } else { - Debug.log("Amount is empty; assumption is full amount : " + this.getTotalDue(), module); + Debug.logInfo("Amount is empty; assumption is full amount : " + this.getTotalDue(), module); amount = this.getTotalDue(); if (amount.compareTo(BigDecimal.ZERO) <= 0) { throw new GeneralException(); @@ -390,7 +390,7 @@ public class WebPosTransaction { public synchronized void processNoPayment(String paymentMethodTypeId) { try { BigDecimal amount = processAmount(null); - Debug.log("Processing [" + paymentMethodTypeId + "] Amount : " + amount, module); + Debug.logInfo("Processing [" + paymentMethodTypeId + "] Amount : " + amount, module); // add the payment addPayment(paymentMethodTypeId, amount, null, null); @@ -407,7 +407,7 @@ public class WebPosTransaction { try { BigDecimal amount = processAmount(amountStr); - Debug.log("Processing [" + paymentMethodTypeId + "] Amount : " + amount, module); + Debug.logInfo("Processing [" + paymentMethodTypeId + "] Amount : " + amount, module); // add the payment addPayment(paymentMethodTypeId, amount, refNum, null); @@ -451,7 +451,7 @@ public class WebPosTransaction { } public void setPaymentRefNum(int paymentIndex, String refNum, String authCode) { - Debug.log("setting payment index reference number " + paymentIndex + " / " + refNum + " / " + authCode, module); + Debug.logInfo("setting payment index reference number " + paymentIndex + " / " + refNum + " / " + authCode, module); ShoppingCart.CartPaymentInfo inf = getCart().getPaymentInfo(paymentIndex); inf.refNum[0] = refNum; inf.refNum[1] = authCode; @@ -459,7 +459,7 @@ public class WebPosTransaction { /* CVV2 code should be entered when a card can't be swiped */ public void setPaymentSecurityCode(String paymentId, String refNum, String securityCode) { - Debug.log("setting payment security code " + paymentId, module); + Debug.logInfo("setting payment security code " + paymentId, module); int paymentIndex = getCart().getPaymentInfoIndex(paymentId, refNum); ShoppingCart.CartPaymentInfo inf = getCart().getPaymentInfo(paymentIndex); inf.securityCode = securityCode; @@ -468,7 +468,7 @@ public class WebPosTransaction { /* Track2 data should be sent to processor when a card is swiped. */ public void setPaymentTrack2(String paymentId, String refNum, String securityCode) { - Debug.log("setting payment security code " + paymentId, module); + Debug.logInfo("setting payment security code " + paymentId, module); int paymentIndex = getCart().getPaymentInfoIndex(paymentId, refNum); ShoppingCart.CartPaymentInfo inf = getCart().getPaymentInfo(paymentIndex); inf.securityCode = securityCode; @@ -477,7 +477,7 @@ public class WebPosTransaction { /* Postal code should be entered when a card can't be swiped */ public void setPaymentPostalCode(String paymentId, String refNum, String postalCode) { - Debug.log("setting payment security code " + paymentId, module); + Debug.logInfo("setting payment security code " + paymentId, module); int paymentIndex = getCart().getPaymentInfoIndex(paymentId, refNum); ShoppingCart.CartPaymentInfo inf = getCart().getPaymentInfo(paymentIndex); inf.postalCode = postalCode; |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |