[Idrs-commit] CVS: Idrs/dev/src/net/sourceforge/idrs/core/report GenTag.java,1.7,1.8 IDRSHead.java,1.20,1.21 IDRSRep.java,1.5,1.6 TagLine.java,1.3,1.4

[Marc B. <big...@us...>]

Update of /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12162/src/net/sourceforge/idrs/core/report

Modified Files:
	GenTag.java IDRSHead.java IDRSRep.java TagLine.java 
Log Message:
Added log4j support.  cleaned up the logs

Index: GenTag.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/GenTag.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** GenTag.java	29 Aug 2004 05:01:39 -0000	1.7
--- GenTag.java	30 Aug 2004 00:56:08 -0000	1.8
***************
*** 180,184 ****
              sval = head.getRequest().getParameter(name);
              if (sval == null) {
!                 System.out.println("Getting db value " + owner + "." + src + " : "  + head.getFieldData(owner,src));
                  return (sval = head.getFieldData(owner,src)) != null ? sval : "";
              }
--- 180,184 ----
              sval = head.getRequest().getParameter(name);
              if (sval == null) {
!                 
                  return (sval = head.getFieldData(owner,src)) != null ? sval : "";
              }
***************
*** 188,192 ****
          }
          else {
!      		System.out.println("Getting db value " + owner + "." + src + " : "  + head.getFieldData(owner,src));
              return (sval = head.getFieldData(owner,src)) != null ? sval : "";
          }
--- 188,192 ----
          }
          else {
!      		
              return (sval = head.getFieldData(owner,src)) != null ? sval : "";
          }
***************
*** 246,250 ****
              sval = head.getRequest().getParameter(name);
              if (sval == null) {
! 						System.out.println(owner +"." + src + " is " + head.getFieldData(owner,src));
                  return (sval = head.getFieldData(owner,src)) != null ? sval.equals("1") : false;
              }
--- 246,250 ----
              sval = head.getRequest().getParameter(name);
              if (sval == null) {
! 						
                  return (sval = head.getFieldData(owner,src)) != null ? sval.equals("1") : false;
              }
***************
*** 254,258 ****
          }
          else {
! 		  		System.out.println(owner +"." + src + " is " + head.getFieldData(owner,src));
              return (sval = head.getFieldData(owner,src)) != null ? sval.equals("1") : false;
          }
--- 254,258 ----
          }
          else {
! 		  		
              return (sval = head.getFieldData(owner,src)) != null ? sval.equals("1") : false;
          }

Index: IDRSHead.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/IDRSHead.java,v
retrieving revision 1.20
retrieving revision 1.21
diff -C2 -d -r1.20 -r1.21
*** IDRSHead.java	29 Aug 2004 05:01:39 -0000	1.20
--- IDRSHead.java	30 Aug 2004 00:56:08 -0000	1.21
***************
*** 28,31 ****
--- 28,32 ----
  import javax.naming.*;
  
+ import org.apache.log4j.Logger;
  import org.w3c.dom.Element;
  
***************
*** 33,36 ****
--- 34,38 ----
  
  public final class IDRSHead implements Serializable, IDRSScript {
+ 	static transient Logger logger = Logger.getLogger(IDRSHead.class.getName());
      protected String header;
      protected String text;
***************
*** 639,643 ****
          catch (Exception e) {
              try {
!                 e.printStackTrace(System.out);
              }
              catch (Exception ee) {}
--- 641,645 ----
          catch (Exception e) {
              try {
!                 logger.error("Error while cloning",e);
              }
              catch (Exception ee) {}
***************
*** 711,715 ****
    
    public void createError(String err) {
!   	System.out.println("Error 1: " + err);
        request.setAttribute(ERR_NAME,err);
       // System.out.println("Error 2: " + request.getAttribute(ERR_NAME));
--- 713,717 ----
    
    public void createError(String err) {
!   	
        request.setAttribute(ERR_NAME,err);
       // System.out.println("Error 2: " + request.getAttribute(ERR_NAME));

Index: IDRSRep.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/IDRSRep.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** IDRSRep.java	29 Aug 2004 05:01:39 -0000	1.5
--- IDRSRep.java	30 Aug 2004 00:56:08 -0000	1.6
***************
*** 15,18 ****
--- 15,19 ----
  import java.io.*;
  
+ import org.apache.log4j.Logger;
  import org.w3c.dom.Document;
  
***************
*** 25,28 ****
--- 26,30 ----
  	protected IDRSHead head;
  	static final long serialVersionUID = 8480452640177071542L;
+ 	static transient Logger logger = Logger.getLogger(IDRSRep.class.getName());
  	
  	/**
***************
*** 99,103 ****
    	catch (Exception e) {
  	    try {
!   		e.printStackTrace(System.out);
  		  }
  		  catch (Exception ee) {}
--- 101,105 ----
    	catch (Exception e) {
  	    try {
!   		logger.error("Error while cloning",e);
  		  }
  		  catch (Exception ee) {}

Index: TagLine.java
===================================================================
RCS file: /cvsroot/idrs/Idrs/dev/src/net/sourceforge/idrs/core/report/TagLine.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** TagLine.java	29 Aug 2004 05:01:39 -0000	1.3
--- TagLine.java	30 Aug 2004 00:56:08 -0000	1.4
***************
*** 177,181 ****
          //StringBuffer output = new StringBuffer("");
          
!         System.out.println("tagname : " + tagName);
          
          Element element = doc.createElement(tagName);
--- 177,181 ----
          //StringBuffer output = new StringBuffer("");
          
!         
          
          Element element = doc.createElement(tagName);