Mailing-List: contact axis-dev-help@xml.apache.org; run by ezmlm
Precedence: bulk
Reply-To: axis-dev@xml.apache.org
Date: 20 Sep 2001 17:13:45 -0000
Message-ID: <20010920171345.84951.qmail@icarus.apache.org>
From: gdaniels@apache.org
To: xml-axis-cvs@apache.org
Subject: cvs commit: xml-axis/java/src/org/apache/axis/encoding
 Deserializer.java MapSerializer.java

gdaniels    01/09/20 10:13:45

  Modified:    java/src/org/apache/axis/encoding Deserializer.java
                        MapSerializer.java
  Log:
  Update some DEBUG_LOGs to using log4j
  
  Revision  Changes    Path
  1.11      +10 -8     xml-axis/java/src/org/apache/axis/encoding/Deserializer.java
  
  Index: Deserializer.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/Deserializer.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- Deserializer.java	2001/08/14 03:49:18	1.10
  +++ Deserializer.java	2001/09/20 17:13:45	1.11
  @@ -61,6 +61,7 @@
   import org.apache.axis.Constants;
   import org.apache.axis.message.*;
   import org.apache.axis.utils.QName;
  +import org.apache.log4j.Category;
   
   import java.io.*;
   import java.util.*;
  @@ -76,8 +77,9 @@
   
   public class Deserializer extends SOAPHandler
   {
  -    private static final boolean DEBUG_LOG = false;
  -    
  +    static Category category =
  +            Category.getInstance(Deserializer.class.getName());
  +
       protected Object value = null;
       //protected DeserializationContext context = null;
       protected boolean isComplete = false;
  @@ -228,8 +230,8 @@
               while (e.hasMoreElements()) {
                   Target target = (Target)e.nextElement();
                   target.set(value);
  -                if (DEBUG_LOG) {
  -                    System.out.println("Set value " + value + " in target " +
  +                if (category.isDebugEnabled()) {
  +                    category.debug("Set value " + value + " in target " +
                                          target);
                   }
               }
  @@ -254,8 +256,8 @@
                                                          localName,
                                                          attributes);
               
  -            if (DEBUG_LOG) {
  -                System.out.println("Deser got type : " + type);
  +            if (category.isDebugEnabled()) {
  +                category.debug("Deser got type : " + type);
               }
               
               // We know we're deserializing, and we can't seem to figure
  @@ -296,8 +298,8 @@
               
               Object ref = context.getObjectByRef(href);
               
  -            if (DEBUG_LOG) {
  -                System.out.println("Got " + ref + " for ID " + href);
  +            if (category.isDebugEnabled()) {
  +                category.debug("Got " + ref + " for ID " + href);
               }
               
               if (ref == null) {
  
  
  
  1.3       +10 -8     xml-axis/java/src/org/apache/axis/encoding/MapSerializer.java
  
  Index: MapSerializer.java
  ===================================================================
  RCS file: /home/cvs/xml-axis/java/src/org/apache/axis/encoding/MapSerializer.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- MapSerializer.java	2001/08/04 19:01:33	1.2
  +++ MapSerializer.java	2001/09/20 17:13:45	1.3
  @@ -62,6 +62,7 @@
   import org.apache.axis.Constants;
   import org.apache.axis.message.SOAPHandler;
   import org.apache.axis.utils.*;
  +import org.apache.log4j.Category;
   
   /**
    * A <code>MapSerializer</code> is be used to serialize and
  @@ -72,8 +73,9 @@
    */
   public class MapSerializer extends Deserializer implements Serializer
   {
  -    private static final boolean DEBUG_LOG = false;
  -    
  +    static Category category =
  +            Category.getInstance(MapSerializer.class.getName());
  +
       // QNames we deal with
       private static final QName QNAME_KEY = new QName("","key");
       private static final QName QNAME_ITEM = new QName("", "item");
  @@ -195,14 +197,14 @@
                                DeserializationContext context)
           throws SAXException
       {
  -        if (DEBUG_LOG) {
  -            System.err.println("In MapSerializer.startElement()");
  +        if (category.isDebugEnabled()) {
  +            category.debug("In MapSerializer.startElement()");
           }
           
           value = new HashMap();
           
  -        if (DEBUG_LOG) {
  -            System.err.println("Out MapSerializer.startElement()");
  +        if (category.isDebugEnabled()) {
  +            category.debug("Out MapSerializer.startElement()");
           }
       }
       
  @@ -213,8 +215,8 @@
                                       DeserializationContext context)
           throws SAXException
       {
  -        if (DEBUG_LOG) {
  -            System.err.println("In MapSerializer.onStartChild()");
  +        if (category.isDebugEnabled()) {
  +            category.debug("In MapSerializer.onStartChild()");
           }
   
           if (!localName.equals("item"))