You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@turbine.apache.org by jv...@apache.org on 2001/08/31 10:04:59 UTC

cvs commit: jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/intake/model BooleanField.java ComboKeyField.java Field.java

jvanzyl     01/08/31 01:04:59

  Modified:    src/services/java/org/apache/fulcrum/intake/model
                        BooleanField.java ComboKeyField.java Field.java
  Log:
  - using log4j Categories
  
  Revision  Changes    Path
  1.3       +8 -3      jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/intake/model/BooleanField.java
  
  Index: BooleanField.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/intake/model/BooleanField.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- BooleanField.java	2001/08/30 05:23:57	1.2
  +++ BooleanField.java	2001/08/31 08:04:58	1.3
  @@ -55,17 +55,22 @@
    */
   
   import org.apache.fulcrum.intake.xmlmodel.XmlField;
  -import org.apache.fulcrum.Log;
   import org.apache.fulcrum.util.parser.ValueParser;
  +import org.apache.log4j.Category;
   
   /**
    * Base class for Intake generated input processing classes.
    *
    * @author <a href="mailto:jmcnally@collab.net>John McNally</a>
  - * @version $Id: BooleanField.java,v 1.2 2001/08/30 05:23:57 jmcnally Exp $
  + * @version $Id: BooleanField.java,v 1.3 2001/08/31 08:04:58 jvanzyl Exp $
    */
   public class BooleanField extends Field
   {
  +    /**
  +     * Log4j category
  +     */
  +    Category category = Category.getInstance(getClass().getName());
  +
       public BooleanField(XmlField field, Group group)
           throws Exception
       {
  @@ -99,7 +104,7 @@
           }
           catch (Exception e)
           {
  -            Log.error(e);
  +            category.error(e);
           }
           return result;
       }
  
  
  
  1.3       +7 -2      jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/intake/model/ComboKeyField.java
  
  Index: ComboKeyField.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/intake/model/ComboKeyField.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- ComboKeyField.java	2001/08/30 05:23:57	1.2
  +++ ComboKeyField.java	2001/08/31 08:04:58	1.3
  @@ -60,12 +60,17 @@
   import org.apache.torque.om.ObjectKey;
   import org.apache.fulcrum.intake.xmlmodel.Rule;
   import org.apache.fulcrum.intake.xmlmodel.XmlField;
  -import org.apache.fulcrum.Log;
   //import org.apache.fulcrum.ServiceException;
  +import org.apache.log4j.Category;
   
   /**  */
   public class ComboKeyField extends Field
   {
  +    /**
  +     * Log4j category
  +     */
  +    Category category = Category.getInstance(getClass().getName());
  +
       public ComboKeyField(XmlField field, Group group)
           throws Exception
       {
  @@ -97,7 +102,7 @@
           catch (Exception e)
           {
               valid_flag = false;
  -            Log.error(e);
  +            category.error(e);
           }
       }
   }
  
  
  
  1.3       +8 -3      jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/intake/model/Field.java
  
  Index: Field.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/intake/model/Field.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Field.java	2001/08/30 05:23:57	1.2
  +++ Field.java	2001/08/31 08:04:59	1.3
  @@ -66,14 +66,14 @@
   import org.apache.fulcrum.intake.validator.Validator;
   import org.apache.fulcrum.intake.validator.InitableByConstraintMap;
   import org.apache.fulcrum.intake.validator.ValidationException;
  -import org.apache.fulcrum.Log;
   import org.apache.fulcrum.ServiceException;
  +import org.apache.log4j.Category;
   
   /**
    * Base class for Intake generated input processing classes.
    *
    * @author <a href="mailto:jmcnally@collab.net>John McNally</a>
  - * @version $Id: Field.java,v 1.2 2001/08/30 05:23:57 jmcnally Exp $
  + * @version $Id: Field.java,v 1.3 2001/08/31 08:04:59 jvanzyl Exp $
    */
   public abstract class Field
   {
  @@ -112,6 +112,11 @@
       protected ValueParser pp;
   
       /**
  +     * Log4j category
  +     */
  +    Category category = Category.getInstance(getClass().getName());
  +
  +    /**
        * Constructs a field based on data in the xml specification
        * and assigns it to a Group.
        *
  @@ -552,7 +557,7 @@
           }
           catch (Exception e)
           {
  -            Log.error(e);
  +            category.error(e);
           }
   
           if ( getTestValue() != null )
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: turbine-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: turbine-dev-help@jakarta.apache.org