commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sand...@apache.org
Subject cvs commit: jakarta-commons/digester/src/java/org/apache/commons/digester BeanPropertySetterRule.java CallMethodRule.java Digester.java FactoryCreateRule.java ObjectCreateRule.java SetNextRule.java SetPropertiesRule.java SetPropertyRule.java SetRootRule.java SetTopRule.java
Date Wed, 23 Jan 2002 21:25:22 GMT
sanders     02/01/23 13:25:22

  Modified:    digester STATUS.html
               digester/src/java/org/apache/commons/digester
                        BeanPropertySetterRule.java CallMethodRule.java
                        Digester.java FactoryCreateRule.java
                        ObjectCreateRule.java SetNextRule.java
                        SetPropertiesRule.java SetPropertyRule.java
                        SetRootRule.java SetTopRule.java
  Log:
  Updated email address.
  Created SAX specific log for Digester (should be rarely used)
  Updated logging messages to be more helpful (match is included in
  {} on all standard rules)
  
  Revision  Changes    Path
  1.3       +2 -2      jakarta-commons/digester/STATUS.html
  
  Index: STATUS.html
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/digester/STATUS.html,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- STATUS.html	12 Jan 2002 22:42:31 -0000	1.2
  +++ STATUS.html	23 Jan 2002 21:25:21 -0000	1.3
  @@ -7,7 +7,7 @@
   
   <div align="center">
   <h1>The Jakarta Commons <em>Digester</em> Component</h1>
  -$Id: STATUS.html,v 1.2 2002/01/12 22:42:31 sanders Exp $<br>
  +$Id: STATUS.html,v 1.3 2002/01/23 21:25:21 sanders Exp $<br>
   <a href="#Introduction">[Introduction]</a>
   <a href="#Dependencies">[Dependencies]</a>
   <a href="#Release Info">[Release Info]</a>
  @@ -78,7 +78,7 @@
   <ul>
   <li><a href="mailto:craigmcc@apache.org">Craig McClanahan</a></li>
   <li>Rodney Waldhoff</li>
  -<li><a href="mailto:sanders@totalsync.com">Scott Sanders</a></li>
  +<li><a href="mailto:sanders@apache.org">Scott Sanders</a></li>
   <li><a href="mailto:geirm@apache.org">Geir Magnusson Jr.</a></li>
   </ul>
   
  
  
  
  1.6       +10 -9     jakarta-commons/digester/src/java/org/apache/commons/digester/BeanPropertySetterRule.java
  
  Index: BeanPropertySetterRule.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/BeanPropertySetterRule.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- BeanPropertySetterRule.java	11 Jan 2002 01:22:13 -0000	1.5
  +++ BeanPropertySetterRule.java	23 Jan 2002 21:25:22 -0000	1.6
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/BeanPropertySetterRule.java,v
1.5 2002/01/11 01:22:13 sanders Exp $
  - * $Revision: 1.5 $
  - * $Date: 2002/01/11 01:22:13 $
  + * $Header: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/BeanPropertySetterRule.java,v
1.6 2002/01/23 21:25:22 sanders Exp $
  + * $Revision: 1.6 $
  + * $Date: 2002/01/23 21:25:22 $
    *
    * ====================================================================
    *
  @@ -81,7 +81,7 @@
    * on the parent object.</p>
    *
    * @author Robert Burrell Donkin
  - * @version $Revision: 1.5 $ $Date: 2002/01/11 01:22:13 $
  + * @version $Revision: 1.6 $ $Date: 2002/01/23 21:25:22 $
    */
   
   public class BeanPropertySetterRule extends Rule {
  @@ -145,8 +145,8 @@
   
           // log some debugging information
           if (digester.log.isDebugEnabled()) {
  -            digester.log.debug("[BeanPropertySetterRule] Called with text " +
  -                    bodyText);
  +            digester.log.debug("[BeanPropertySetterRule]{" +
  +                digester.match + "} Called with text " + bodyText);
           }
   
           this.bodyText = bodyText.trim();
  @@ -176,8 +176,8 @@
   
           // log some debugging information
           if (digester.log.isDebugEnabled()) {
  -            digester.log.debug("[BeanPropertySetterRule] setting property " +
  -                    property + " with text " + bodyText);
  +            digester.log.debug("[BeanPropertySetterRule]{" + digester.match +
  +                "} Setting property " + property + " with text " + bodyText);
           }
   
           // going to use beanutils so need to specify property using map
  @@ -190,7 +190,8 @@
               // don't try to set property if null
               // just log and return
               if (digester.log.isDebugEnabled()) {
  -                digester.log.debug("[BeanPropertySetterRule] Top object is null.");
  +                digester.log.debug("[BeanPropertySetterRule]{" +
  +                    digester.match + "} Top object is null.");
               }
               return;
           }
  
  
  
  1.14      +7 -5      jakarta-commons/digester/src/java/org/apache/commons/digester/CallMethodRule.java
  
  Index: CallMethodRule.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/CallMethodRule.java,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- CallMethodRule.java	9 Jan 2002 20:22:49 -0000	1.13
  +++ CallMethodRule.java	23 Jan 2002 21:25:22 -0000	1.14
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/CallMethodRule.java,v
1.13 2002/01/09 20:22:49 sanders Exp $
  - * $Revision: 1.13 $
  - * $Date: 2002/01/09 20:22:49 $
  + * $Header: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/CallMethodRule.java,v
1.14 2002/01/23 21:25:22 sanders Exp $
  + * $Revision: 1.14 $
  + * $Date: 2002/01/23 21:25:22 $
    *
    * ====================================================================
    *
  @@ -79,7 +79,7 @@
    *
    * @author Craig McClanahan
    * @author Scott Sanders
  - * @version $Revision: 1.13 $ $Date: 2002/01/09 20:22:49 $
  + * @version $Revision: 1.14 $ $Date: 2002/01/23 21:25:22 $
    */
   
   public class CallMethodRule extends Rule {
  @@ -290,7 +290,9 @@
           // Invoke the required method on the top object
           Object top = digester.peek();
           if (digester.log.isDebugEnabled()) {
  -            StringBuffer sb = new StringBuffer("Call ");
  +            StringBuffer sb = new StringBuffer("[CallMethodRule]{");
  +            sb.append(digester.match);
  +            sb.append("} Call ");
               if (top == null) {
                   sb.append("[NULL TOP]");
               } else {
  
  
  
  1.42      +42 -34    jakarta-commons/digester/src/java/org/apache/commons/digester/Digester.java
  
  Index: Digester.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/Digester.java,v
  retrieving revision 1.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- Digester.java	17 Jan 2002 01:51:21 -0000	1.41
  +++ Digester.java	23 Jan 2002 21:25:22 -0000	1.42
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/Digester.java,v
1.41 2002/01/17 01:51:21 craigmcc Exp $
  - * $Revision: 1.41 $
  - * $Date: 2002/01/17 01:51:21 $
  + * $Header: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/Digester.java,v
1.42 2002/01/23 21:25:22 sanders Exp $
  + * $Revision: 1.42 $
  + * $Date: 2002/01/23 21:25:22 $
    *
    * ====================================================================
    *
  @@ -112,7 +112,7 @@
    *
    * @author Craig McClanahan
    * @author Scott Sanders
  - * @version $Revision: 1.41 $ $Date: 2002/01/17 01:51:21 $
  + * @version $Revision: 1.42 $ $Date: 2002/01/23 21:25:22 $
    */
   
   public class Digester extends DefaultHandler {
  @@ -304,9 +304,15 @@
   
   
       /**
  -     * The Log to which all logging calls will be made.
  +     * The Log to which most logging calls will be made.
        */
  -    protected Log log = LogSource.getInstance("org.apache.commons.digester");
  +    protected Log log = LogSource.getInstance("org.apache.commons.digester.Digester");
  +
  +
  +    /**
  +     * The Log to which all SAX event related logging calls will be made.
  +     */
  +    private Log saxLog = LogSource.getInstance("org.apache.commons.digester.Digester.sax");
   
   
       // ----------------------------------------------------------- Properties
  @@ -686,8 +692,8 @@
       public void characters(char buffer[], int start, int length)
               throws SAXException {
   
  -        if (log.isDebugEnabled()) {
  -            log.debug("characters(" + new String(buffer, start, length) + ")");
  +        if (saxLog.isDebugEnabled()) {
  +            saxLog.debug("characters(" + new String(buffer, start, length) + ")");
           }
   
           bodyText.append(buffer, start, length);
  @@ -702,9 +708,9 @@
        */
       public void endDocument() throws SAXException {
   
  -        boolean info = log.isInfoEnabled();
  +        boolean info = saxLog.isInfoEnabled();
           if (info) {
  -            log.info("endDocument()");
  +            saxLog.info("endDocument()");
           }
   
           if (getCount() > 1 && info) {
  @@ -756,8 +762,10 @@
           boolean debug = log.isDebugEnabled();
   
           if (debug) {
  -            log.debug("endElement(" + namespaceURI + "," + localName +
  -                    "," + qName + ")");
  +            if (saxLog.isDebugEnabled()) {
  +                saxLog.debug("endElement(" + namespaceURI + "," + localName +
  +                        "," + qName + ")");
  +            }
               log.debug("  match='" + match + "'");
               log.debug("  bodyText='" + bodyText + "'");
           }
  @@ -833,8 +841,8 @@
        */
       public void endPrefixMapping(String prefix) throws SAXException {
   
  -        if (log.isDebugEnabled()) {
  -            log.debug("endPrefixMapping(" + prefix + ")");
  +        if (saxLog.isDebugEnabled()) {
  +            saxLog.debug("endPrefixMapping(" + prefix + ")");
           }
   
           // Deregister this prefix mapping
  @@ -866,8 +874,8 @@
       public void ignorableWhitespace(char buffer[], int start, int len)
               throws SAXException {
   
  -        if (log.isDebugEnabled()) {
  -            log.debug("ignorableWhitespace(" +
  +        if (saxLog.isDebugEnabled()) {
  +            saxLog.debug("ignorableWhitespace(" +
                       new String(buffer, start, len) + ")");
           }
   
  @@ -887,8 +895,8 @@
       public void processingInstruction(String target, String data)
               throws SAXException {
   
  -        if (log.isDebugEnabled()) {
  -            log.debug("processingInstruction('" + target + "','" + data + "')");
  +        if (saxLog.isDebugEnabled()) {
  +            saxLog.debug("processingInstruction('" + target + "','" + data + "')");
           }
   
           ;	// No processing is required
  @@ -903,8 +911,8 @@
        */
       public void setDocumentLocator(Locator locator) {
   
  -        if (log.isDebugEnabled()) {
  -            log.debug("setDocumentLocator(" + locator + ")");
  +        if (saxLog.isDebugEnabled()) {
  +            saxLog.debug("setDocumentLocator(" + locator + ")");
           }
   
           this.locator = locator;
  @@ -921,8 +929,8 @@
        */
       public void skippedEntity(String name) throws SAXException {
   
  -        if (log.isDebugEnabled()) {
  -            log.debug("skippedEntity(" + name + ")");
  +        if (saxLog.isDebugEnabled()) {
  +            saxLog.debug("skippedEntity(" + name + ")");
           }
   
           ; // No processing required
  @@ -937,8 +945,8 @@
        */
       public void startDocument() throws SAXException {
   
  -        if (log.isInfoEnabled()) {
  -            log.info("startDocument()");
  +        if (saxLog.isInfoEnabled()) {
  +            saxLog.info("startDocument()");
           }
   
           ; // No processing required
  @@ -965,8 +973,8 @@
   
           boolean debug = log.isDebugEnabled();
   
  -        if (debug) {
  -            log.debug("startElement(" + namespaceURI + "," + localName + "," +
  +        if (saxLog.isDebugEnabled()) {
  +            saxLog.debug("startElement(" + namespaceURI + "," + localName + "," +
                       qName + ")");
           }
   
  @@ -1031,8 +1039,8 @@
       public void startPrefixMapping(String prefix, String namespaceURI)
               throws SAXException {
   
  -        if (log.isDebugEnabled()) {
  -            log.debug("startPrefixMapping(" + prefix + "," + namespaceURI + ")");
  +        if (saxLog.isDebugEnabled()) {
  +            saxLog.debug("startPrefixMapping(" + prefix + "," + namespaceURI + ")");
           }
   
           // Register this prefix mapping
  @@ -1058,8 +1066,8 @@
        */
       public void notationDecl(String name, String publicId, String systemId) {
   
  -        if (log.isDebugEnabled()) {
  -            log.debug("notationDecl(" + name + "," + publicId + "," +
  +        if (saxLog.isDebugEnabled()) {
  +            saxLog.debug("notationDecl(" + name + "," + publicId + "," +
                       systemId + ")");
           }
   
  @@ -1077,8 +1085,8 @@
       public void unparsedEntityDecl(String name, String publicId,
                                      String systemId, String notation) {
   
  -        if (log.isDebugEnabled()) {
  -            log.debug("unparsedEntityDecl(" + name + "," + publicId + "," +
  +        if (saxLog.isDebugEnabled()) {
  +            saxLog.debug("unparsedEntityDecl(" + name + "," + publicId + "," +
                       systemId + "," + notation + ")");
           }
   
  @@ -1100,8 +1108,8 @@
               throws SAXException {
   
           boolean debug = log.isDebugEnabled();
  -        if (debug) {
  -            log.debug("resolveEntity('" + publicId + "', '" + systemId + "')");
  +        if (saxLog.isDebugEnabled()) {
  +            saxLog.debug("resolveEntity('" + publicId + "', '" + systemId + "')");
           }
           this.publicId = publicId;
   
  
  
  
  1.8       +7 -4      jakarta-commons/digester/src/java/org/apache/commons/digester/FactoryCreateRule.java
  
  Index: FactoryCreateRule.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/FactoryCreateRule.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- FactoryCreateRule.java	9 Jan 2002 20:22:49 -0000	1.7
  +++ FactoryCreateRule.java	23 Jan 2002 21:25:22 -0000	1.8
  @@ -73,7 +73,7 @@
    * in a call to either a factory method or to a non-empty constructor.
    *
    * @author Robert Burrell Donkin
  - * @version $Revision: 1.7 $ $Date: 2002/01/09 20:22:49 $
  + * @version $Revision: 1.8 $ $Date: 2002/01/23 21:25:22 $
    */
   
   public class FactoryCreateRule extends Rule {
  @@ -204,7 +204,8 @@
   
           Object instance = getFactory(attributes).createObject(attributes);
           if (digester.log.isDebugEnabled()) {
  -            digester.log.debug("New " + instance.getClass().getName());
  +            digester.log.debug("[FactoryCreateRule]{" + digester.match +
  +                    "} New " + instance.getClass().getName());
           }
           digester.push(instance);
   
  @@ -218,7 +219,8 @@
   
           Object top = digester.pop();
           if (digester.log.isDebugEnabled()) {
  -            digester.log.debug("Pop " + top.getClass().getName());
  +            digester.log.debug("[FactoryCreateRule]{" + digester.match +
  +                    "} Pop " + top.getClass().getName());
           }
   
       }
  @@ -279,7 +281,8 @@
                   }
               }
               if (digester.log.isDebugEnabled()) {
  -                digester.log.debug("New factory " + realClassName);
  +                digester.log.debug("[FactoryCreateRule]{" + digester.match +
  +                        "} New factory " + realClassName);
               }
               Class clazz = digester.getClassLoader().loadClass(realClassName);
               creationFactory = (ObjectCreationFactory)
  
  
  
  1.11      +8 -6      jakarta-commons/digester/src/java/org/apache/commons/digester/ObjectCreateRule.java
  
  Index: ObjectCreateRule.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/ObjectCreateRule.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ObjectCreateRule.java	9 Jan 2002 20:22:49 -0000	1.10
  +++ ObjectCreateRule.java	23 Jan 2002 21:25:22 -0000	1.11
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/ObjectCreateRule.java,v
1.10 2002/01/09 20:22:49 sanders Exp $
  - * $Revision: 1.10 $
  - * $Date: 2002/01/09 20:22:49 $
  + * $Header: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/ObjectCreateRule.java,v
1.11 2002/01/23 21:25:22 sanders Exp $
  + * $Revision: 1.11 $
  + * $Date: 2002/01/23 21:25:22 $
    *
    * ====================================================================
    *
  @@ -73,7 +73,7 @@
    *
    * @author Craig McClanahan
    * @author Scott Sanders
  - * @version $Revision: 1.10 $ $Date: 2002/01/09 20:22:49 $
  + * @version $Revision: 1.11 $ $Date: 2002/01/23 21:25:22 $
    */
   
   public class ObjectCreateRule extends Rule {
  @@ -179,7 +179,8 @@
               }
           }
           if (digester.log.isDebugEnabled()) {
  -            digester.log.debug("New " + realClassName);
  +            digester.log.debug("[ObjectCreateRule]{" + digester.match +
  +                    "}New " + realClassName);
           }
   
           // Instantiate the new object and push it on the context stack
  @@ -197,7 +198,8 @@
   
           Object top = digester.pop();
           if (digester.log.isDebugEnabled()) {
  -            digester.log.debug("Pop " + top.getClass().getName());
  +            digester.log.debug("[ObjectCreateRule]{" + digester.match +
  +                    "} Pop " + top.getClass().getName());
           }
   
       }
  
  
  
  1.11      +8 -6      jakarta-commons/digester/src/java/org/apache/commons/digester/SetNextRule.java
  
  Index: SetNextRule.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/SetNextRule.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- SetNextRule.java	9 Jan 2002 20:22:49 -0000	1.10
  +++ SetNextRule.java	23 Jan 2002 21:25:22 -0000	1.11
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/SetNextRule.java,v
1.10 2002/01/09 20:22:49 sanders Exp $
  - * $Revision: 1.10 $
  - * $Date: 2002/01/09 20:22:49 $
  + * $Header: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/SetNextRule.java,v
1.11 2002/01/23 21:25:22 sanders Exp $
  + * $Revision: 1.11 $
  + * $Date: 2002/01/23 21:25:22 $
    *
    * ====================================================================
    *
  @@ -77,7 +77,7 @@
    *
    * @author Craig McClanahan
    * @author Scott Sanders
  - * @version $Revision: 1.10 $ $Date: 2002/01/09 20:22:49 $
  + * @version $Revision: 1.11 $ $Date: 2002/01/23 21:25:22 $
    */
   
   public class SetNextRule extends Rule {
  @@ -149,10 +149,12 @@
           Object parent = digester.peek(1);
           if (digester.log.isDebugEnabled()) {
               if (parent == null) {
  -                digester.log.debug("Call [NULL PARENT]." +
  +                digester.log.debug("[SetNextRule]{" + digester.match +
  +                        "} Call [NULL PARENT]." +
                           methodName + "(" + child + ")");
               } else {
  -                digester.log.debug("Call " + parent.getClass().getName() + "." +
  +                digester.log.debug("[SetNextRule]{" + digester.match +
  +                        "} Call " + parent.getClass().getName() + "." +
                           methodName + "(" + child + ")");
               }
           }
  
  
  
  1.7       +8 -6      jakarta-commons/digester/src/java/org/apache/commons/digester/SetPropertiesRule.java
  
  Index: SetPropertiesRule.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/SetPropertiesRule.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SetPropertiesRule.java	9 Jan 2002 20:22:49 -0000	1.6
  +++ SetPropertiesRule.java	23 Jan 2002 21:25:22 -0000	1.7
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/SetPropertiesRule.java,v
1.6 2002/01/09 20:22:49 sanders Exp $
  - * $Revision: 1.6 $
  - * $Date: 2002/01/09 20:22:49 $
  + * $Header: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/SetPropertiesRule.java,v
1.7 2002/01/23 21:25:22 sanders Exp $
  + * $Revision: 1.7 $
  + * $Date: 2002/01/23 21:25:22 $
    *
    * ====================================================================
    *
  @@ -74,7 +74,7 @@
    * stack, based on attributes with corresponding names.
    *
    * @author Craig McClanahan
  - * @version $Revision: 1.6 $ $Date: 2002/01/09 20:22:49 $
  + * @version $Revision: 1.7 $ $Date: 2002/01/23 21:25:22 $
    */
   
   public class SetPropertiesRule extends Rule {
  @@ -115,7 +115,8 @@
               }
               String value = attributes.getValue(i);
               if (digester.log.isDebugEnabled()) {
  -                digester.log.debug("  Setting property '" + name + "' to '" +
  +                digester.log.debug("[SetPropertiesRule]{" + digester.match +
  +                        "} Setting property '" + name + "' to '" +
                           value + "'");
               }
               values.put(name, value);
  @@ -124,7 +125,8 @@
           // Populate the corresponding properties of the top object
           Object top = digester.peek();
           if (digester.log.isDebugEnabled()) {
  -            digester.log.debug("Set " + top.getClass().getName() + " properties");
  +            digester.log.debug("[SetPropertiesRule]{" + digester.match +
  +                    "} Set " + top.getClass().getName() + " properties");
           }
           BeanUtils.populate(top, values);
   
  
  
  
  1.7       +6 -5      jakarta-commons/digester/src/java/org/apache/commons/digester/SetPropertyRule.java
  
  Index: SetPropertyRule.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/SetPropertyRule.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- SetPropertyRule.java	9 Jan 2002 20:22:49 -0000	1.6
  +++ SetPropertyRule.java	23 Jan 2002 21:25:22 -0000	1.7
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/SetPropertyRule.java,v
1.6 2002/01/09 20:22:49 sanders Exp $
  - * $Revision: 1.6 $
  - * $Date: 2002/01/09 20:22:49 $
  + * $Header: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/SetPropertyRule.java,v
1.7 2002/01/23 21:25:22 sanders Exp $
  + * $Revision: 1.7 $
  + * $Date: 2002/01/23 21:25:22 $
    *
    * ====================================================================
    *
  @@ -74,7 +74,7 @@
    * top of the stack, based on attributes with specified names.
    *
    * @author Craig McClanahan
  - * @version $Revision: 1.6 $ $Date: 2002/01/09 20:22:49 $
  + * @version $Revision: 1.7 $ $Date: 2002/01/23 21:25:22 $
    */
   
   public class SetPropertyRule extends Rule {
  @@ -149,7 +149,8 @@
           // Populate the corresponding property of the top object
           Object top = digester.peek();
           if (digester.log.isDebugEnabled()) {
  -            digester.log.debug("Set " + top.getClass().getName() + " property " +
  +            digester.log.debug("[SetPropertyRule]{" + digester.match +
  +                    "} Set " + top.getClass().getName() + " property " +
                       actualName + " to " + actualValue);
           }
           BeanUtils.populate(top, values);
  
  
  
  1.3       +8 -6      jakarta-commons/digester/src/java/org/apache/commons/digester/SetRootRule.java
  
  Index: SetRootRule.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/SetRootRule.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- SetRootRule.java	11 Jan 2002 01:22:13 -0000	1.2
  +++ SetRootRule.java	23 Jan 2002 21:25:22 -0000	1.3
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/SetRootRule.java,v
1.2 2002/01/11 01:22:13 sanders Exp $
  - * $Revision: 1.2 $
  - * $Date: 2002/01/11 01:22:13 $
  + * $Header: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/SetRootRule.java,v
1.3 2002/01/23 21:25:22 sanders Exp $
  + * $Revision: 1.3 $
  + * $Date: 2002/01/23 21:25:22 $
    *
    * ====================================================================
    *
  @@ -75,7 +75,7 @@
    * passing the top object (child) as an argument.
    *
    * @author Scott Sanders
  - * @version $Revision: 1.2 $ $Date: 2002/01/11 01:22:13 $
  + * @version $Revision: 1.3 $ $Date: 2002/01/23 21:25:22 $
    */
   
   public class SetRootRule extends Rule {
  @@ -147,10 +147,12 @@
           Object parent = digester.root;
           if (digester.log.isDebugEnabled()) {
               if (parent == null) {
  -                digester.log.debug("Call [NULL ROOT]." +
  +                digester.log.debug("[SetRootRule]{" + digester.match +
  +                        "} Call [NULL ROOT]." +
                           methodName + "(" + child + ")");
               } else {
  -                digester.log.debug("Call " + parent.getClass().getName() + "." +
  +                digester.log.debug("[SetRootRule]{" + digester.match +
  +                        "} Call " + parent.getClass().getName() + "." +
                           methodName + "(" + child + ")");
               }
           }
  
  
  
  1.11      +8 -6      jakarta-commons/digester/src/java/org/apache/commons/digester/SetTopRule.java
  
  Index: SetTopRule.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/SetTopRule.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- SetTopRule.java	9 Jan 2002 20:22:49 -0000	1.10
  +++ SetTopRule.java	23 Jan 2002 21:25:22 -0000	1.11
  @@ -1,7 +1,7 @@
   /*
  - * $Header: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/SetTopRule.java,v
1.10 2002/01/09 20:22:49 sanders Exp $
  - * $Revision: 1.10 $
  - * $Date: 2002/01/09 20:22:49 $
  + * $Header: /home/cvs/jakarta-commons/digester/src/java/org/apache/commons/digester/SetTopRule.java,v
1.11 2002/01/23 21:25:22 sanders Exp $
  + * $Revision: 1.11 $
  + * $Date: 2002/01/23 21:25:22 $
    *
    * ====================================================================
    *
  @@ -76,7 +76,7 @@
    *
    * @author Craig McClanahan
    * @author Scott Sanders
  - * @version $Revision: 1.10 $ $Date: 2002/01/09 20:22:49 $
  + * @version $Revision: 1.11 $ $Date: 2002/01/23 21:25:22 $
    */
   
   public class SetTopRule extends Rule {
  @@ -148,10 +148,12 @@
           Object parent = digester.peek(0);
           if (digester.log.isDebugEnabled()) {
               if (parent == null) {
  -                digester.log.debug("Call [NULL PARENT]." +
  +                digester.log.debug("[SetTopRule]{" + digester.match +
  +                        "} Call [NULL PARENT]." +
                           methodName + "(" + child + ")");
               } else {
  -                digester.log.debug("Call " + parent.getClass().getName() + "." +
  +                digester.log.debug("[SetTopRule]{" + digester.match +
  +                        "} Call " + parent.getClass().getName() + "." +
                           methodName + "(" + child + ")");
               }
           }
  
  
  

--
To unsubscribe, e-mail:   <mailto:commons-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:commons-dev-help@jakarta.apache.org>


Mime
View raw message