Update of /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/wstore In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6969/src/main/servlet/org/compiere/wstore Modified Files: Click.java CheckOutServlet.java RequestTypeTag.java WorkflowTag.java NoteServlet.java AdvertisementServlet.java Info.java Counter.java CheckOutLinkTag.java ProductServlet.java PriceListTag.java PriceListProduct.java RegistrationServlet.java PaymentServlet.java InfoLinkTag.java SingleItem.java InfoServlet.java ExpenseServlet.java BasketServlet.java PriceList.java LocationTag.java InvoiceServlet.java OrderServlet.java WebBasketLine.java MessageTag.java ProductCategoryListTag.java WebBasket.java JSPEnv.java LoginServlet.java WorkflowServlet.java WebOrder.java WebUser.java AssetServlet.java LoginLinkTag.java RfQServlet.java RequestServlet.java Log Message: . Index: Click.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/wstore/Click.java,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** Click.java 30 Aug 2004 06:02:38 -0000 1.6 --- Click.java 5 Jan 2005 04:33:55 -0000 1.7 *************** *** 8,12 **** * The Original Code is Compiere ERP & CRM Smart Business Solution * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc. ! * Portions created by Jorg Janke are Copyright (C) 1999-2003 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): ______________________________________. --- 8,12 ---- * The Original Code is Compiere ERP & CRM Smart Business Solution * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc. ! * Portions created by Jorg Janke are Copyright (C) 1999-2005 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): ______________________________________. *************** *** 14,22 **** package org.compiere.wstore; - import javax.servlet.*; - import javax.servlet.http.*; import java.io.*; import java.util.*; ! import org.compiere.model.*; import org.compiere.util.*; --- 14,21 ---- package org.compiere.wstore; import java.io.*; import java.util.*; ! import javax.servlet.*; ! import javax.servlet.http.*; import org.compiere.model.*; import org.compiere.util.*; *************** *** 37,41 **** { /** Logging */ ! private Logger log = Logger.getCLogger(getClass()); /** Name */ --- 36,40 ---- { /** Logging */ ! private CLogger log = CLogger.getCLogger(getClass()); /** Name */ *************** *** 75,79 **** public void destroy() { ! log.debug("destroy"); } // destroy --- 74,78 ---- public void destroy() { ! log.fine("destroy"); } // destroy *************** *** 97,106 **** response.sendRedirect(url); response.flushBuffer(); ! log.debug("redirect - " + url); // Save Click saveClick(request, url); // ! log.debug(url + " - " + (System.currentTimeMillis()-time) + "ms"); } // doGet --- 96,105 ---- response.sendRedirect(url); response.flushBuffer(); ! log.fine("redirect - " + url); // Save Click saveClick(request, url); // ! log.fine(url + " - " + (System.currentTimeMillis()-time) + "ms"); } // doGet Index: CheckOutServlet.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/wstore/CheckOutServlet.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** CheckOutServlet.java 30 Aug 2004 06:02:38 -0000 1.10 --- CheckOutServlet.java 5 Jan 2005 04:33:55 -0000 1.11 *************** *** 8,12 **** * The Original Code is Compiere ERP & CRM Smart Business Solution * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc. ! * Portions created by Jorg Janke are Copyright (C) 1999-2003 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): ______________________________________. --- 8,12 ---- * The Original Code is Compiere ERP & CRM Smart Business Solution * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc. ! * Portions created by Jorg Janke are Copyright (C) 1999-2005 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): ______________________________________. *************** *** 14,21 **** package org.compiere.wstore; import javax.servlet.*; import javax.servlet.http.*; - import java.io.*; - import org.compiere.util.*; --- 14,20 ---- package org.compiere.wstore; + import java.io.*; import javax.servlet.*; import javax.servlet.http.*; import org.compiere.util.*; *************** *** 30,34 **** { /** Logging */ ! private Logger log = Logger.getCLogger(getClass()); /** Name */ static public final String NAME = "checkOutServlet"; --- 29,33 ---- { /** Logging */ ! private CLogger log = CLogger.getCLogger(getClass()); /** Name */ static public final String NAME = "checkOutServlet"; *************** *** 64,68 **** public void destroy() { ! log.debug("destroy"); } // destroy --- 63,67 ---- public void destroy() { ! log.fine("destroy"); } // destroy Index: RequestTypeTag.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/wstore/RequestTypeTag.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** RequestTypeTag.java 20 Jun 2003 14:45:18 -0000 1.7 --- RequestTypeTag.java 5 Jan 2005 04:33:55 -0000 1.8 *************** *** 8,12 **** * The Original Code is Compiere ERP & CRM Smart Business Solution * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc. ! * Portions created by Jorg Janke are Copyright (C) 1999-2003 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): ______________________________________. --- 8,12 ---- * The Original Code is Compiere ERP & CRM Smart Business Solution * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc. ! * Portions created by Jorg Janke are Copyright (C) 1999-2005 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): ______________________________________. *************** *** 14,28 **** package org.compiere.wstore; - import java.util.*; import java.sql.*; import javax.servlet.http.*; import javax.servlet.jsp.*; import javax.servlet.jsp.tagext.*; - import org.apache.ecs.xhtml.*; ! import org.apache.log4j.Logger; ! ! import org.compiere.util.Env; ! import org.compiere.util.DB; /** --- 14,25 ---- package org.compiere.wstore; import java.sql.*; + import java.util.*; import javax.servlet.http.*; import javax.servlet.jsp.*; import javax.servlet.jsp.tagext.*; import org.apache.ecs.xhtml.*; ! import java.util.logging.*; ! import org.compiere.util.*; /** *************** *** 38,42 **** { /** Logger */ ! private Logger log = Logger.getLogger (getClass()); /** --- 35,39 ---- { /** Logger */ ! private CLogger log = CLogger.getCLogger (getClass()); /** *************** *** 73,77 **** int AD_Client_ID = Env.getContextAsInt(ctx, "#AD_Client_ID"); if (AD_Client_ID == 0) ! log.error("getOptions - AD_Client_ID not found"); else log.info("getOptions - AD_Client_ID=" + AD_Client_ID); --- 70,74 ---- int AD_Client_ID = Env.getContextAsInt(ctx, "#AD_Client_ID"); if (AD_Client_ID == 0) ! log.log(Level.SEVERE, "getOptions - AD_Client_ID not found"); else log.info("getOptions - AD_Client_ID=" + AD_Client_ID); *************** *** 99,103 **** catch (Exception e) { ! log.error("getOptions", e); } finally --- 96,100 ---- catch (Exception e) { ! log.log(Level.SEVERE, "getOptions", e); } finally *************** *** 116,120 **** option options[] = new option [list.size()]; list.toArray(options); ! log.debug("getOptions = #" + options.length); return options; } // getOptions --- 113,117 ---- option options[] = new option [list.size()]; list.toArray(options); ! log.fine("getOptions = #" + options.length); return options; } // getOptions Index: WorkflowTag.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/wstore/WorkflowTag.java,v retrieving revision 1.1 retrieving revision 1.2 diff -C2 -d -r1.1 -r1.2 *** WorkflowTag.java 20 Apr 2004 13:50:59 -0000 1.1 --- WorkflowTag.java 5 Jan 2005 04:33:55 -0000 1.2 *************** *** 8,12 **** * The Original Code is Compiere ERP & CRM Business Solution * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc. ! * Portions created by Jorg Janke are Copyright (C) 1999-2004 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): ______________________________________. --- 8,12 ---- * The Original Code is Compiere ERP & CRM Business Solution * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc. ! * Portions created by Jorg Janke are Copyright (C) 1999-2005 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): ______________________________________. *************** *** 18,25 **** import javax.servlet.jsp.*; import javax.servlet.jsp.tagext.*; - import org.apache.ecs.xhtml.*; import org.apache.taglibs.standard.tag.el.core.*; - import org.compiere.util.*; import org.compiere.wf.*; --- 18,23 ---- *************** *** 38,42 **** { /** Logging */ ! private Logger log = Logger.getCLogger(getClass()); /** Activity ID */ --- 36,40 ---- { /** Logging */ ! private CLogger log = CLogger.getCLogger(getClass()); /** Activity ID */ *************** *** 77,86 **** catch (Exception e) { ! log.error ("doStartTag - Activity" + e); } MWFActivity act = new MWFActivity (ctx, AD_WF_Activity_ID); if (AD_WF_Activity_ID == 0 || act == null || act.getID() != AD_WF_Activity_ID) { ! log.error ("doStartTag - Activity Not found - " + m_activityID_el + " (" + info + ")"); return (SKIP_BODY); } --- 75,84 ---- catch (Exception e) { ! log.severe ("doStartTag - Activity" + e); } MWFActivity act = new MWFActivity (ctx, AD_WF_Activity_ID); if (AD_WF_Activity_ID == 0 || act == null || act.getID() != AD_WF_Activity_ID) { ! log.severe ("doStartTag - Activity Not found - " + m_activityID_el + " (" + info + ")"); return (SKIP_BODY); } Index: NoteServlet.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/wstore/NoteServlet.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** NoteServlet.java 1 Nov 2004 03:16:06 -0000 1.7 --- NoteServlet.java 5 Jan 2005 04:33:55 -0000 1.8 *************** *** 8,12 **** * The Original Code is Compiere ERP & CRM Business Solution * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc. ! * Portions created by Jorg Janke are Copyright (C) 1999-2004 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): ______________________________________. --- 8,12 ---- * The Original Code is Compiere ERP & CRM Business Solution * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc. ! * Portions created by Jorg Janke are Copyright (C) 1999-2005 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): ______________________________________. *************** *** 14,22 **** package org.compiere.wstore; - import javax.servlet.*; - import javax.servlet.http.*; import java.io.*; import java.util.*; ! import org.compiere.model.*; import org.compiere.util.*; --- 14,21 ---- package org.compiere.wstore; import java.io.*; import java.util.*; ! import javax.servlet.*; ! import javax.servlet.http.*; import org.compiere.model.*; import org.compiere.util.*; *************** *** 31,35 **** { /** Logging */ ! private Logger log = Logger.getCLogger(getClass()); /** Name */ static public final String NAME = "NoteServlet"; --- 30,34 ---- { /** Logging */ ! private CLogger log = CLogger.getCLogger(getClass()); /** Name */ static public final String NAME = "NoteServlet"; *************** *** 63,67 **** public void destroy() { ! log.debug("destroy"); } // destroy --- 62,66 ---- public void destroy() { ! log.fine("destroy"); } // destroy *************** *** 121,125 **** if (AD_Note_ID == 0) { ! log.debug("streamAttachment - no AD_Note_ID)"); return "No Notice ID"; } --- 120,124 ---- if (AD_Note_ID == 0) { ! log.fine("streamAttachment - no AD_Note_ID)"); return "No Notice ID"; } *************** *** 127,131 **** if (attachmentIndex == 0) { ! log.debug("streamAttachment - no index)"); return "No Request Attachment index"; } --- 126,130 ---- if (attachmentIndex == 0) { ! log.fine("streamAttachment - no index)"); return "No Request Attachment index"; } *************** *** 137,141 **** if (doc.getAD_Note_ID() != AD_Note_ID) { ! log.debug("streamAttachment - Note not found - ID=" + AD_Note_ID); return "Notice not found"; } --- 136,140 ---- if (doc.getAD_Note_ID() != AD_Note_ID) { ! log.fine("streamAttachment - Note not found - ID=" + AD_Note_ID); return "Notice not found"; } *************** *** 144,148 **** if (attachment == null) { ! log.debug("streamAttachment - No Attachment for AD_Note_ID=" + AD_Note_ID); return "Notice Attachment not found"; } --- 143,147 ---- if (attachment == null) { ! log.fine("streamAttachment - No Attachment for AD_Note_ID=" + AD_Note_ID); return "Notice Attachment not found"; } *************** *** 153,157 **** if (wu.getAD_User_ID() != doc.getAD_User_ID()) { ! log.warn ("streamAttachment - AD_Note_ID=" + AD_Note_ID + " - User_ID=" + doc.getAD_User_ID() + " = Web_User=" + wu.getAD_User_ID()); --- 152,156 ---- if (wu.getAD_User_ID() != doc.getAD_User_ID()) { ! log.warning ("streamAttachment - AD_Note_ID=" + AD_Note_ID + " - User_ID=" + doc.getAD_User_ID() + " = Web_User=" + wu.getAD_User_ID()); *************** *** 185,193 **** if (wu == null) { ! log.warn("doPost - no web user"); response.sendRedirect("loginServlet?ForwardTo=notes.jsp"); // entry return; } - Log.setTraceLevel(9); WebEnv.dump(request); --- 184,191 ---- if (wu == null) { ! log.warning("doPost - no web user"); response.sendRedirect("loginServlet?ForwardTo=notes.jsp"); // entry return; } WebEnv.dump(request); *************** *** 202,206 **** note.setProcessed(true); note.save(); ! log.debug("doPost - " + note); } } --- 200,204 ---- note.setProcessed(true); note.save(); ! log.fine("doPost - " + note); } } Index: AdvertisementServlet.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/wstore/AdvertisementServlet.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** AdvertisementServlet.java 1 Nov 2004 03:16:06 -0000 1.7 --- AdvertisementServlet.java 5 Jan 2005 04:33:55 -0000 1.8 *************** *** 8,12 **** * The Original Code is Compiere ERP & CRM Business Solution * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc. ! * Portions created by Jorg Janke are Copyright (C) 1999-2004 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): ______________________________________. --- 8,12 ---- * The Original Code is Compiere ERP & CRM Business Solution * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc. ! * Portions created by Jorg Janke are Copyright (C) 1999-2005 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): ______________________________________. *************** *** 14,22 **** package org.compiere.wstore; - import javax.servlet.*; - import javax.servlet.http.*; import java.io.*; import java.util.*; ! import org.compiere.model.*; import org.compiere.util.*; --- 14,21 ---- package org.compiere.wstore; import java.io.*; import java.util.*; ! import javax.servlet.*; ! import javax.servlet.http.*; import org.compiere.model.*; import org.compiere.util.*; *************** *** 31,35 **** { /** Logging */ ! private Logger log = Logger.getCLogger(getClass()); /** Name */ static public final String NAME = "AdvertisementServlet"; --- 30,34 ---- { /** Logging */ ! private CLogger log = CLogger.getCLogger(getClass()); /** Name */ static public final String NAME = "AdvertisementServlet"; *************** *** 63,67 **** public void destroy() { ! log.debug("destroy"); } // destroy --- 62,66 ---- public void destroy() { ! log.fine("destroy"); } // destroy *************** *** 108,112 **** if (wu == null) { ! log.warn("doPost - no web user"); response.sendRedirect("loginServlet?ForwardTo=advertisement.jsp"); // entry return; --- 107,111 ---- if (wu == null) { ! log.warning("doPost - no web user"); response.sendRedirect("loginServlet?ForwardTo=advertisement.jsp"); // entry return; Index: Info.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/wstore/Info.java,v retrieving revision 1.26 retrieving revision 1.27 diff -C2 -d -r1.26 -r1.27 *** Info.java 15 Aug 2004 15:32:50 -0000 1.26 --- Info.java 5 Jan 2005 04:33:55 -0000 1.27 *************** *** 8,12 **** * The Original Code is Compiere ERP & CRM Smart Business Solution * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc. ! * Portions created by Jorg Janke are Copyright (C) 1999-2003 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): ______________________________________. --- 8,12 ---- * The Original Code is Compiere ERP & CRM Smart Business Solution * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc. ! * Portions created by Jorg Janke are Copyright (C) 1999-2005 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): ______________________________________. *************** *** 18,21 **** --- 18,22 ---- import org.compiere.model.*; + import java.util.logging.*; import org.compiere.util.*; import org.compiere.wf.*; *************** *** 61,65 **** /** Logging */ ! private Logger log = Logger.getCLogger(getClass()); /** Context */ private Properties m_ctx = null; --- 62,66 ---- /** Logging */ ! private CLogger log = CLogger.getCLogger(getClass()); /** Context */ private Properties m_ctx = null; *************** *** 133,137 **** catch (NumberFormatException ex) { ! log.error("setId - " + id + " - " + ex.toString()); } } // setId --- 134,138 ---- catch (NumberFormatException ex) { ! log.log(Level.SEVERE, "setId - " + id + " - " + ex.toString()); } } // setId *************** *** 204,208 **** catch (Exception e) { ! log.error("getOrders", e); } finally --- 205,209 ---- catch (Exception e) { ! log.log(Level.SEVERE, "getOrders", e); } finally *************** *** 217,221 **** pstmt = null; } ! log.debug ("getOrders #" + list.size()); return list; } // getOrders --- 218,222 ---- pstmt = null; } ! log.fine("getOrders #" + list.size()); return list; } // getOrders *************** *** 245,249 **** catch (Exception e) { ! log.error("getOrder ID=" + m_id, e); } finally --- 246,250 ---- catch (Exception e) { ! log.log(Level.SEVERE, "getOrder ID=" + m_id, e); } finally *************** *** 258,262 **** pstmt = null; } ! log.debug ("getOrder ID=" + m_id + " - " + retValue); return retValue; } // getOrder --- 259,263 ---- pstmt = null; } ! log.fine("getOrder ID=" + m_id + " - " + retValue); return retValue; } // getOrder *************** *** 288,292 **** catch (Exception e) { ! log.error("getShipments", e); } finally --- 289,293 ---- catch (Exception e) { ! log.log(Level.SEVERE, "getShipments", e); } finally *************** *** 301,305 **** pstmt = null; } ! log.debug ("getShipments #" + list.size()); return list; } // getShipments --- 302,306 ---- pstmt = null; } ! log.fine("getShipments #" + list.size()); return list; } // getShipments *************** *** 349,353 **** catch (Exception e) { ! log.error("getRequests Own=" + own, e); } finally --- 350,354 ---- catch (Exception e) { ! log.log(Level.SEVERE, "getRequests Own=" + own, e); } finally *************** *** 362,366 **** pstmt = null; } ! log.debug ("getRequests Own=" + own +" #" + list.size()); return list; } // getRequests --- 363,367 ---- pstmt = null; } ! log.fine("getRequests Own=" + own +" #" + list.size()); return list; } // getRequests *************** *** 394,398 **** catch (Exception e) { ! log.error("getRequest ID=" + m_id, e); } finally --- 395,399 ---- catch (Exception e) { ! log.log(Level.SEVERE, "getRequest ID=" + m_id, e); } finally *************** *** 407,411 **** pstmt = null; } ! log.debug ("getRequest ID=" + m_id + " - " + retValue); return retValue; } // getRequest --- 408,412 ---- pstmt = null; } ! log.fine("getRequest ID=" + m_id + " - " + retValue); return retValue; } // getRequest *************** *** 436,440 **** catch (Exception e) { ! log.error("getInvoices", e); } finally --- 437,441 ---- catch (Exception e) { ! log.log(Level.SEVERE, "getInvoices", e); } finally *************** *** 449,453 **** pstmt = null; } ! log.debug ("getInvoices #" + list.size()); return list; } // getInvoices --- 450,454 ---- pstmt = null; } ! log.fine("getInvoices #" + list.size()); return list; } // getInvoices *************** *** 477,481 **** catch (Exception e) { ! log.error("getInvoice ID=" + m_id, e); } finally --- 478,482 ---- catch (Exception e) { ! log.log(Level.SEVERE, "getInvoice ID=" + m_id, e); } finally *************** *** 490,494 **** pstmt = null; } ! log.debug ("getInvoice ID=" + m_id + " - " + retValue); return retValue; } // getInvoice --- 491,495 ---- pstmt = null; } ! log.fine("getInvoice ID=" + m_id + " - " + retValue); return retValue; } // getInvoice *************** *** 518,522 **** catch (Exception e) { ! log.error("getPayments", e); } finally --- 519,523 ---- catch (Exception e) { ! log.log(Level.SEVERE, "getPayments", e); } finally *************** *** 531,535 **** pstmt = null; } ! log.debug ("getPayments #" + list.size()); return list; } // getPayments --- 532,536 ---- pstmt = null; } ! log.fine("getPayments #" + list.size()); return list; } // getPayments *************** *** 562,566 **** catch (Exception e) { ! log.error("getAssets", e); } finally --- 563,567 ---- catch (Exception e) { ! log.log(Level.SEVERE, "getAssets", e); } finally *************** *** 575,579 **** pstmt = null; } ! log.debug ("getAssets #" + list.size()); return list; } // getAssets --- 576,580 ---- pstmt = null; } ! log.fine("getAssets #" + list.size()); return list; } // getAssets *************** *** 610,614 **** catch (Exception e) { ! log.error("getInterests", e); } finally --- 611,615 ---- catch (Exception e) { ! log.log(Level.SEVERE, "getInterests", e); } finally *************** *** 623,627 **** pstmt = null; } ! log.debug ("getInterests #" + list.size()); return list; } // getInterests --- 624,628 ---- pstmt = null; } ! log.fine("getInterests #" + list.size()); return list; } // getInterests *************** *** 650,654 **** catch (Exception e) { ! log.error("getAdvertisement", e); } finally --- 651,655 ---- catch (Exception e) { ! log.log(Level.SEVERE, "getAdvertisement", e); } finally *************** *** 663,667 **** pstmt = null; } ! log.debug ("getAdvertisement #" + list.size()); return list; } // getAdvertisement --- 664,668 ---- pstmt = null; } ! log.fine("getAdvertisement #" + list.size()); return list; } // getAdvertisement *************** *** 689,693 **** catch (Exception e) { ! log.error("getAllAds", e); } finally --- 690,694 ---- catch (Exception e) { ! log.log(Level.SEVERE, "getAllAds", e); } finally *************** *** 702,706 **** pstmt = null; } ! log.debug ("getAllAds #" + list.size()); return list; } // getAllAds --- 703,707 ---- pstmt = null; } ! log.fine("getAllAds #" + list.size()); return list; } // getAllAds *************** *** 735,739 **** catch (Exception e) { ! log.error("getCommissionedInvoices", e); } finally --- 736,740 ---- catch (Exception e) { ! log.log(Level.SEVERE, "getCommissionedInvoices", e); } finally *************** *** 748,752 **** pstmt = null; } ! log.debug ("getCommissionedInvoices #" + list.size()); return list; } // getCommissionedInvoices --- 749,753 ---- pstmt = null; } ! log.fine("getCommissionedInvoices #" + list.size()); return list; } // getCommissionedInvoices *************** *** 777,781 **** catch (Exception e) { ! log.error("getCommissionRuns", e); } finally --- 778,782 ---- catch (Exception e) { ! log.log(Level.SEVERE, "getCommissionRuns", e); } finally *************** *** 790,794 **** pstmt = null; } ! log.debug ("getCommissionRuns #" + list.size()); return list; } // getCommissionRuns --- 791,795 ---- pstmt = null; } ! log.fine("getCommissionRuns #" + list.size()); return list; } // getCommissionRuns *************** *** 820,824 **** catch (Exception e) { ! log.error("getNotes", e); } finally --- 821,825 ---- catch (Exception e) { ! log.log(Level.SEVERE, "getNotes", e); } finally *************** *** 833,837 **** pstmt = null; } ! log.debug ("getNotes #" + list.size()); return list; } // getNotes --- 834,838 ---- pstmt = null; } ! log.fine("getNotes #" + list.size()); return list; } // getNotes *************** *** 862,866 **** catch (Exception e) { ! log.error("getNote ID=" + m_id, e); } finally --- 863,867 ---- catch (Exception e) { ! log.log(Level.SEVERE, "getNote ID=" + m_id, e); } finally *************** *** 875,879 **** pstmt = null; } ! log.debug ("getNote ID=" + m_id + " - " + retValue); return retValue; } // getNote --- 876,880 ---- pstmt = null; } ! log.fine("getNote ID=" + m_id + " - " + retValue); return retValue; } // getNote *************** *** 905,909 **** catch (Exception e) { ! log.error("getActivities", e); } finally --- 906,910 ---- catch (Exception e) { ! log.log(Level.SEVERE, "getActivities", e); } finally *************** *** 918,922 **** pstmt = null; } ! log.debug ("getActivities #" + list.size()); return list; } // getActivities --- 919,923 ---- pstmt = null; } ! log.fine("getActivities #" + list.size()); return list; } // getActivities *************** *** 947,951 **** catch (Exception e) { ! log.error("getActivity ID=" + m_id, e); } finally --- 948,952 ---- catch (Exception e) { ! log.log(Level.SEVERE, "getActivity ID=" + m_id, e); } finally *************** *** 960,964 **** pstmt = null; } ! log.debug ("getActivity ID=" + m_id + " - " + retValue); return retValue; } // getActivity --- 961,965 ---- pstmt = null; } ! log.fine("getActivity ID=" + m_id + " - " + retValue); return retValue; } // getActivity *************** *** 989,993 **** catch (Exception e) { ! log.error("getExpenses", e); } finally --- 990,994 ---- catch (Exception e) { ! log.log(Level.SEVERE, "getExpenses", e); } finally *************** *** 1002,1006 **** pstmt = null; } ! log.debug ("getExpenses #" + list.size()); return list; } // getExpenses --- 1003,1007 ---- pstmt = null; } ! log.fine("getExpenses #" + list.size()); return list; } // getExpenses *************** *** 1030,1034 **** catch (Exception e) { ! log.error("getExpense ID=" + m_id, e); } finally --- 1031,1035 ---- catch (Exception e) { ! log.log(Level.SEVERE, "getExpense ID=" + m_id, e); } finally *************** *** 1045,1049 **** if (retValue == null) retValue = new MTimeExpense (m_ctx, 0); ! log.debug ("getExpense ID=" + m_id + " - " + retValue); return retValue; } // getExpense --- 1046,1050 ---- if (retValue == null) retValue = new MTimeExpense (m_ctx, 0); ! log.fine("getExpense ID=" + m_id + " - " + retValue); return retValue; } // getExpense *************** *** 1074,1078 **** catch (Exception e) { ! log.error("getRegistrations", e); } finally --- 1075,1079 ---- catch (Exception e) { ! log.log(Level.SEVERE, "getRegistrations", e); } finally *************** *** 1087,1091 **** pstmt = null; } ! log.debug ("getRegistrations #" + list.size()); return list; } // getRegistrations --- 1088,1092 ---- pstmt = null; } ! log.fine("getRegistrations #" + list.size()); return list; } // getRegistrations *************** *** 1115,1119 **** catch (Exception e) { ! log.error("getRegistration ID=" + m_id, e); } finally --- 1116,1120 ---- catch (Exception e) { ! log.log(Level.SEVERE, "getRegistration ID=" + m_id, e); } finally *************** *** 1131,1135 **** if (retValue == null) retValue = new MRegistration (m_ctx, 0); ! log.debug ("getRegistration ID=" + m_id + " - " + retValue); return retValue; } // getRegistration --- 1132,1136 ---- if (retValue == null) retValue = new MRegistration (m_ctx, 0); ! log.fine("getRegistration ID=" + m_id + " - " + retValue); return retValue; } // getRegistration *************** *** 1168,1172 **** catch (Exception e) { ! log.error("getRfQs", e); } finally --- 1169,1173 ---- catch (Exception e) { ! log.log(Level.SEVERE, "getRfQs", e); } finally *************** *** 1181,1185 **** pstmt = null; } ! log.debug ("getRfQs #" + list.size()); return list; } // getRfQs --- 1182,1186 ---- pstmt = null; } ! log.fine("getRfQs #" + list.size()); return list; } // getRfQs *************** *** 1211,1215 **** catch (Exception e) { ! log.error("getRfQ ID=" + m_id, e); } finally --- 1212,1216 ---- catch (Exception e) { ! log.log(Level.SEVERE, "getRfQ ID=" + m_id, e); } finally *************** *** 1240,1244 **** } // ! log.debug ("getRfQResponse ID=" + m_id + " - " + retValue); return retValue; } // getRfQResponse --- 1241,1245 ---- } // ! log.fine("getRfQResponse ID=" + m_id + " - " + retValue); return retValue; } // getRfQResponse Index: Counter.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/wstore/Counter.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** Counter.java 30 Aug 2004 06:02:38 -0000 1.7 --- Counter.java 5 Jan 2005 04:33:59 -0000 1.8 *************** *** 8,12 **** * The Original Code is Compiere ERP & CRM Business Solution * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc. ! * Portions created by Jorg Janke are Copyright (C) 1999-2001 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): ______________________________________. --- 8,12 ---- * The Original Code is Compiere ERP & CRM Business Solution * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc. ! * Portions created by Jorg Janke are Copyright (C) 1999-2005 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): ______________________________________. *************** *** 19,22 **** --- 19,23 ---- import java.util.*; + import java.util.logging.*; import org.compiere.util.*; *************** *** 30,34 **** { /** Logging */ ! private Logger log = Logger.getCLogger(getClass()); /** Name */ --- 31,35 ---- { /** Logging */ ! private CLogger log = CLogger.getCLogger(getClass()); /** Name */ *************** *** 114,118 **** if (request == null) { ! log.error("run - nothing in queue"); return; } --- 115,119 ---- if (request == null) { ! log.log(Level.SEVERE, "run - nothing in queue"); return; } Index: CheckOutLinkTag.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/wstore/CheckOutLinkTag.java,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** CheckOutLinkTag.java 5 Mar 2004 06:01:27 -0000 1.10 --- CheckOutLinkTag.java 5 Jan 2005 04:33:59 -0000 1.11 *************** *** 8,12 **** * The Original Code is Compiere ERP & CRM Smart Business Solution * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc. ! * Portions created by Jorg Janke are Copyright (C) 1999-2003 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): ______________________________________. --- 8,12 ---- * The Original Code is Compiere ERP & CRM Smart Business Solution * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc. ! * Portions created by Jorg Janke are Copyright (C) 1999-2005 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): ______________________________________. *************** *** 17,23 **** import javax.servlet.jsp.*; import javax.servlet.jsp.tagext.*; - import org.apache.ecs.xhtml.*; - import org.compiere.util.*; --- 17,21 ---- *************** *** 35,39 **** { /** Logger */ ! private Logger log = Logger.getCLogger (getClass()); /** One Line */ private boolean m_oneLine = false; --- 33,37 ---- { /** Logger */ ! private CLogger log = CLogger.getCLogger (getClass()); /** One Line */ private boolean m_oneLine = false; *************** *** 59,66 **** WebBasket wb = (WebBasket)session.getAttribute(WebBasket.NAME); ! // log.debug("doStartTag - WebBasket=" + wb); if (wb != null && wb.getLineCount() > 0) { ! log.debug("doStartTag - WebBasket exists"); // JspWriter out = pageContext.getOut(); --- 57,64 ---- WebBasket wb = (WebBasket)session.getAttribute(WebBasket.NAME); ! // log.fine("doStartTag - WebBasket=" + wb); if (wb != null && wb.getLineCount() > 0) { ! log.fine("doStartTag - WebBasket exists"); // JspWriter out = pageContext.getOut(); Index: ProductServlet.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/wstore/ProductServlet.java,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** ProductServlet.java 1 Nov 2004 03:16:06 -0000 1.7 --- ProductServlet.java 5 Jan 2005 04:33:59 -0000 1.8 *************** *** 8,12 **** * The Original Code is Compiere ERP & CRM Business Solution * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc. ! * Portions created by Jorg Janke are Copyright (C) 1999-2002 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): ______________________________________. --- 8,12 ---- * The Original Code is Compiere ERP & CRM Business Solution * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc. ! * Portions created by Jorg Janke are Copyright (C) 1999-2005 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): ______________________________________. *************** *** 14,22 **** package org.compiere.wstore; - import javax.servlet.*; - import javax.servlet.http.*; import java.io.*; import java.util.*; ! import org.compiere.util.*; --- 14,21 ---- package org.compiere.wstore; import java.io.*; import java.util.*; ! import javax.servlet.*; ! import javax.servlet.http.*; import org.compiere.util.*; *************** *** 30,34 **** { /** Logging */ ! private Logger log = Logger.getCLogger(getClass()); /** --- 29,33 ---- { /** Logging */ ! private CLogger log = CLogger.getCLogger(getClass()); /** Index: PriceListTag.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/wstore/PriceListTag.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** PriceListTag.java 11 May 2004 03:59:56 -0000 1.9 --- PriceListTag.java 5 Jan 2005 04:33:59 -0000 1.10 *************** *** 8,12 **** * The Original Code is Compiere ERP & CRM Smart Business Solution * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc. ! * Portions created by Jorg Janke are Copyright (C) 1999-2003 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): ______________________________________. --- 8,12 ---- * The Original Code is Compiere ERP & CRM Smart Business Solution * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc. ! * Portions created by Jorg Janke are Copyright (C) 1999-2005 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): ______________________________________. *************** *** 17,23 **** import javax.servlet.http.*; import javax.servlet.jsp.*; import javax.servlet.jsp.tagext.*; - import javax.servlet.jsp.jstl.core.Config; - import org.compiere.util.*; --- 17,22 ---- import javax.servlet.http.*; import javax.servlet.jsp.*; + import javax.servlet.jsp.jstl.core.*; import javax.servlet.jsp.tagext.*; import org.compiere.util.*; *************** *** 41,45 **** private PriceList m_priceList; /** Logger */ ! private Logger log = Logger.getCLogger (getClass()); /** --- 40,44 ---- private PriceList m_priceList; /** Logger */ ! private CLogger log = CLogger.getCLogger (getClass()); /** *************** *** 55,59 **** catch (NumberFormatException ex) { ! log.warn("setPriceList_ID - " + ex.toString()); } } // setM_PriceList_ID --- 54,58 ---- catch (NumberFormatException ex) { ! log.warning("setPriceList_ID - " + ex.toString()); } } // setM_PriceList_ID *************** *** 81,85 **** if (PriceList_ID != 0) { ! log.debug("- using BP PriceList_ID=" + PriceList_ID); M_PriceList_ID = PriceList_ID; } --- 80,84 ---- if (PriceList_ID != 0) { ! log.fine("- using BP PriceList_ID=" + PriceList_ID); M_PriceList_ID = PriceList_ID; } *************** *** 100,104 **** HttpSession session = pageContext.getSession(); session.setAttribute (PriceList.NAME, m_priceList); ! log.debug(m_priceList); // Set Locale from Price List --- 99,103 ---- HttpSession session = pageContext.getSession(); session.setAttribute (PriceList.NAME, m_priceList); ! log.fine("PL=" + m_priceList); // Set Locale from Price List Index: PriceListProduct.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/wstore/PriceListProduct.java,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** PriceListProduct.java 5 Mar 2004 06:01:27 -0000 1.5 --- PriceListProduct.java 5 Jan 2005 04:33:59 -0000 1.6 *************** *** 8,12 **** * The Original Code is Compiere ERP & CRM Smart Business Solution * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc. ! * Portions created by Jorg Janke are Copyright (C) 1999-2003 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): ______________________________________. --- 8,12 ---- * The Original Code is Compiere ERP & CRM Smart Business Solution * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc. ! * Portions created by Jorg Janke are Copyright (C) 1999-2005 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): ______________________________________. *************** *** 15,19 **** import java.math.*; - import org.compiere.util.*; --- 15,18 ---- *************** *** 63,67 **** public static final String NAME = "PriceListProduct"; /** Logging */ ! private Logger log = Logger.getCLogger(getClass()); private int m_Product_ID; --- 62,66 ---- public static final String NAME = "PriceListProduct"; /** Logging */ ! private CLogger log = CLogger.getCLogger(getClass()); private int m_Product_ID; Index: RegistrationServlet.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/wstore/RegistrationServlet.java,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** RegistrationServlet.java 1 Nov 2004 03:16:06 -0000 1.8 --- RegistrationServlet.java 5 Jan 2005 04:33:59 -0000 1.9 *************** *** 8,12 **** * The Original Code is Compiere ERP & CRM Business Solution * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc. ! * Portions created by Jorg Janke are Copyright (C) 1999-2004 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): ______________________________________. --- 8,12 ---- * The Original Code is Compiere ERP & CRM Business Solution * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc. ! * Portions created by Jorg Janke are Copyright (C) 1999-2005 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): ______________________________________. *************** *** 20,23 **** --- 20,24 ---- import java.sql.*; + import java.util.logging.*; import org.compiere.util.*; import org.compiere.model.*; *************** *** 32,36 **** { /** Logging */ ! private Logger log = Logger.getCLogger(getClass()); /** Name */ static public final String NAME = "RegistrationServlet"; --- 33,37 ---- { /** Logging */ ! private CLogger log = CLogger.getCLogger(getClass()); /** Name */ static public final String NAME = "RegistrationServlet"; *************** *** 64,68 **** public void destroy() { ! log.debug("destroy"); } // destroy --- 65,69 ---- public void destroy() { ! log.fine("destroy"); } // destroy *************** *** 130,134 **** user = MUser.get(ctx, AD_User_ID); else ! log.warn("processSystemRegistration - User Not found=" + userName); // Registration --- 131,135 ---- user = MUser.get(ctx, AD_User_ID); else ! log.warning("processSystemRegistration - User Not found=" + userName); // Registration *************** *** 139,143 **** if (reg.getID() != Record_ID) { ! log.warn("processSystemRegistration - Registration Not found=" + Record_ID); reg = null; } --- 140,144 ---- if (reg.getID() != Record_ID) { ! log.warning("processSystemRegistration - Registration Not found=" + Record_ID); reg = null; } *************** *** 146,150 **** if (reg.getC_BPartner_ID() != user.getC_BPartner_ID()) { ! log.warn("processSystemRegistration - Registration for different BP - AD_User_ID=" + AD_User_ID + "(" + user.getEmail() + "), BP RegistrationBP=" + reg.getC_BPartner_ID() --- 147,151 ---- if (reg.getC_BPartner_ID() != user.getC_BPartner_ID()) { ! log.warning("processSystemRegistration - Registration for different BP - AD_User_ID=" + AD_User_ID + "(" + user.getEmail() + "), BP RegistrationBP=" + reg.getC_BPartner_ID() *************** *** 154,158 **** if (!password.equals(user.getPassword())) { ! log.warn("processSystemRegistration - Password does not match - AD_User_ID=" + AD_User_ID + "(" + user.getEmail() + ")"); // ?? --- 155,159 ---- if (!password.equals(user.getPassword())) { ! log.warning("processSystemRegistration - Password does not match - AD_User_ID=" + AD_User_ID + "(" + user.getEmail() + ")"); // ?? *************** *** 162,166 **** if (reg == null) { ! log.debug("processSystemRegistration - New Registration"); reg = new MRegistration (ctx, name, allowPublish, inProduction, startDate); Record_ID = 0; --- 163,167 ---- if (reg == null) { ! log.fine("processSystemRegistration - New Registration"); reg = new MRegistration (ctx, name, allowPublish, inProduction, startDate); Record_ID = 0; *************** *** 186,190 **** else { ! log.error("doPost - Registration not saved"); sendAnswer (response, PROBLEM + " Record_ID=0"); } --- 187,191 ---- else { ! log.log(Level.SEVERE, "doPost - Registration not saved"); sendAnswer (response, PROBLEM + " Record_ID=0"); } *************** *** 229,233 **** if (wu == null) { ! log.warn("doPost - no web user"); response.sendRedirect("loginServlet?ForwardTo=registration.jsp"); // entry return; --- 230,234 ---- if (wu == null) { ! log.warning("doPost - no web user"); response.sendRedirect("loginServlet?ForwardTo=registration.jsp"); // entry return; *************** *** 271,275 **** else { ! log.error("doPost - Registration not saved"); WebUtil.createForwardPage(response, PROBLEM, "registrations.jsp", 3); } --- 272,276 ---- else { ! log.log(Level.SEVERE, "doPost - Registration not saved"); WebUtil.createForwardPage(response, PROBLEM, "registrations.jsp", 3); } Index: PaymentServlet.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/wstore/PaymentServlet.java,v retrieving revision 1.23 retrieving revision 1.24 diff -C2 -d -r1.23 -r1.24 *** PaymentServlet.java 1 Nov 2004 03:16:06 -0000 1.23 --- PaymentServlet.java 5 Jan 2005 04:33:59 -0000 1.24 *************** *** 8,12 **** * The Original Code is Compiere ERP & CRM Business Solution * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc. ! * Portions created by Jorg Janke are Copyright (C) 1999-2002 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): ______________________________________. --- 8,12 ---- * The Original Code is Compiere ERP & CRM Business Solution * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc. ! * Portions created by Jorg Janke are Copyright (C) 1999-2005 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): ______________________________________. *************** *** 17,24 **** import java.math.*; import java.util.*; - import javax.servlet.*; import javax.servlet.http.*; - import org.compiere.model.*; import org.compiere.process.*; --- 17,22 ---- *************** *** 34,38 **** { /** Logging */ ! private Logger log = Logger.getCLogger(getClass()); public static final String ATTR_PAYMENT = "payment"; --- 32,36 ---- { /** Logging */ ! private CLogger log = CLogger.getCLogger(getClass()); public static final String ATTR_PAYMENT = "payment"; *************** *** 137,141 **** catch (Exception ex) { ! log.warn("doGet - Parsing Amount=" + amtParam + " (" + sb + ") - " + ex.toString()); } // Need to be positive amount --- 135,139 ---- catch (Exception ex) { ! log.warning("doGet - Parsing Amount=" + amtParam + " (" + sb + ") - " + ex.toString()); } // Need to be positive amount *************** *** 156,160 **** catch (NumberFormatException ex) { ! log.warn("doGet - Parsing C_Invoice_ID=" + invoiceParam + " - " + ex.toString()); } log.info("doGet - Amt=" + amt + ", C_Invoice_ID=" + C_Invoice_ID); --- 154,158 ---- catch (NumberFormatException ex) { ! log.warning("doGet - Parsing C_Invoice_ID=" + invoiceParam + " - " + ex.toString()); } log.info("doGet - Amt=" + amt + ", C_Invoice_ID=" + C_Invoice_ID); *************** *** 249,256 **** wo.process(payment); if (!wo.isCompleted()) ! log.warn("processPayment - Order not processed " + wo); } else ! log.warn("processPayment - no Order"); // payment.processIt(DocAction.ACTION_Complete); --- 247,254 ---- wo.process(payment); if (!wo.isCompleted()) ! log.warning("processPayment - Order not processed " + wo); } else ! log.warning("processPayment - no Order"); // payment.processIt(DocAction.ACTION_Complete); *************** *** 260,264 **** else { ! log.debug("processPayment - " + payment.getErrorMessage()); String errMsg = payment.getErrorMessage(); payment.save (); --- 258,262 ---- else { ! log.fine("processPayment - " + payment.getErrorMessage()); String errMsg = payment.getErrorMessage(); payment.save (); Index: InfoLinkTag.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/wstore/InfoLinkTag.java,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** InfoLinkTag.java 6 Nov 2004 05:33:22 -0000 1.18 --- InfoLinkTag.java 5 Jan 2005 04:33:59 -0000 1.19 *************** *** 8,12 **** * The Original Code is Compiere ERP & CRM Smart Business Solution * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc. ! * Portions created by Jorg Janke are Copyright (C) 1999-2003 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): ______________________________________. --- 8,12 ---- * The Original Code is Compiere ERP & CRM Smart Business Solution * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc. ! * Portions created by Jorg Janke are Copyright (C) 1999-2005 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): ______________________________________. *************** *** 17,23 **** import javax.servlet.jsp.*; import javax.servlet.jsp.tagext.*; - import org.apache.ecs.xhtml.*; - import org.compiere.util.*; --- 17,21 ---- *************** *** 35,39 **** { /** Logger */ ! private Logger log = Logger.getCLogger (getClass()); /** One Line */ private boolean m_oneLine = false; --- 33,37 ---- { /** Logger */ ! private CLogger log = CLogger.getCLogger (getClass()); /** One Line */ private boolean m_oneLine = false; *************** *** 74,78 **** // ! // log.debug("doStartTag - WebUser exists - " + wu); // JspWriter out = pageContext.getOut(); --- 72,76 ---- // ! // log.fine("doStartTag - WebUser exists - " + wu); // JspWriter out = pageContext.getOut(); *************** *** 91,96 **** else { ! if (Log.isTraceLevel(6)) ! log.debug ("doStartTag - no WebUser"); if (session.getAttribute(Info.NAME) == null) session.setAttribute (Info.NAME, Info.getGeneral()); --- 89,94 ---- else { ! if (CLogMgt.isLevelFiner()) ! log.fine("doStartTag - no WebUser"); if (session.getAttribute(Info.NAME) == null) session.setAttribute (Info.NAME, Info.getGeneral()); Index: SingleItem.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/wstore/SingleItem.java,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SingleItem.java 30 Aug 2004 06:02:39 -0000 1.3 --- SingleItem.java 5 Jan 2005 04:33:59 -0000 1.4 *************** *** 8,12 **** * The Original Code is Compiere ERP & CRM Business Solution * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc. ! * Portions created by Jorg Janke are Copyright (C) 1999-2002 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): ______________________________________. --- 8,12 ---- * The Original Code is Compiere ERP & CRM Business Solution * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc. ! * Portions created by Jorg Janke are Copyright (C) 1999-2005 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): ______________________________________. *************** *** 14,21 **** package org.compiere.wstore; import javax.servlet.*; import javax.servlet.http.*; - import java.io.*; - import org.compiere.util.*; --- 14,20 ---- package org.compiere.wstore; + import java.io.*; import javax.servlet.*; import javax.servlet.http.*; import org.compiere.util.*; *************** *** 29,33 **** { /** Logging */ ! private Logger log = Logger.getCLogger(getClass()); /** Client */ private int m_AD_Client_ID = -1; --- 28,32 ---- { /** Logging */ ! private CLogger log = CLogger.getCLogger(getClass()); /** Client */ private int m_AD_Client_ID = -1; *************** *** 96,98 **** } // doPost ! } // SingleItem \ No newline at end of file --- 95,97 ---- } // doPost ! } // SingleItem Index: InfoServlet.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/wstore/InfoServlet.java,v retrieving revision 1.9 retrieving revision 1.10 diff -C2 -d -r1.9 -r1.10 *** InfoServlet.java 1 Nov 2004 03:16:06 -0000 1.9 --- InfoServlet.java 5 Jan 2005 04:33:59 -0000 1.10 *************** *** 8,12 **** * The Original Code is Compiere ERP & CRM Business Solution * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc. ! * Portions created by Jorg Janke are Copyright (C) 1999-2002 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): ______________________________________. --- 8,12 ---- * The Original Code is Compiere ERP & CRM Business Solution * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc. ! * Portions created by Jorg Janke are Copyright (C) 1999-2005 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): ______________________________________. *************** *** 20,23 **** --- 20,24 ---- import org.compiere.model.*; + import java.util.logging.*; import org.compiere.util.*; *************** *** 32,36 **** { /** Logging */ ! private Logger log = Logger.getCLogger(getClass()); /** --- 33,37 ---- { /** Logging */ ! private CLogger log = CLogger.getCLogger(getClass()); /** *************** *** 130,134 **** int AD_User_ID = WebUtil.getParameterAsInt(request, "contact"); // ! log.debug("processParameter - subscribe=" + subscribe + ",R_InterestArea_ID=" + R_InterestArea_ID + ",AD_User_ID=" + AD_User_ID); --- 131,135 ---- int AD_User_ID = WebUtil.getParameterAsInt(request, "contact"); // ! log.fine("processParameter - subscribe=" + subscribe + ",R_InterestArea_ID=" + R_InterestArea_ID + ",AD_User_ID=" + AD_User_ID); *************** *** 140,146 **** boolean ok = ci.save(); if (ok) ! log.debug("processParameter - success"); else ! log.error("processParameter - subscribe failed"); // Lookup user if direct link --- 141,147 ---- boolean ok = ci.save(); if (ok) ! log.fine("processParameter - success"); else ! log.log(Level.SEVERE, "processParameter - subscribe failed"); // Lookup user if direct link Index: ExpenseServlet.java =================================================================== RCS file: /cvsroot/compiere/serverApps/src/main/servlet/org/compiere/wstore/ExpenseServlet.java,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** ExpenseServlet.java 30 Aug 2004 06:02:38 -0000 1.4 --- ExpenseServlet.java 5 Jan 2005 04:33:59 -0000 1.5 *************** *** 8,12 **** * The Original Code is Compiere ERP & CRM Business Solution * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc. ! * Portions created by Jorg Janke are Copyright (C) 1999-2004 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): ______________________________________. --- 8,12 ---- * The Original Code is Compiere ERP & CRM Business Solution * The Initial Developer of the Original Code is Jorg Janke and ComPiere, Inc. ! * Portions created by Jorg Janke are Copyright (C) 1999-2005 Jorg Janke, parts * created by ComPiere are Copyright (C) ComPiere, Inc.; All Rights Reserved. * Contributor(s): ______________________________________. *************** *** 14,22 **** package org.compiere.wstore; - import javax.servlet.*; - import javax.servlet.http.*; import java.io.*; import java.util.*... [truncated message content] |