You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by mo...@apache.org on 2003/06/11 17:55:59 UTC

cvs commit: jakarta-commons/jelly/src/test/org/apache/commons/jelly/test/impl DummyTagLibrary.java

morgand     2003/06/11 08:55:59

  Modified:    jelly/src/test/org/apache/commons/jelly/tags/junit
                        AssertTag.java
               jelly/src/test/org/apache/commons/jelly/core Product.java
                        Order.java Customer.java
               jelly/src/java/org/apache/commons/jelly XMLOutput.java
               jelly/src/test/org/apache/commons/jelly/impl
                        TestTagLibraryResolver.java
               jelly/src/java/org/apache/commons/jelly/impl
                        DynamicDynaBeanTag.java StaticTagScript.java
               jelly/src/test/org/apache/commons/jelly/expression
                        TestDynaBeans.java TestExpressions.java
               jelly/src/java/org/apache/commons/jelly/tags/core
                        BreakTag.java ExprTag.java
               jelly/src/test/org/apache/commons/jelly/test/impl
                        DummyTagLibrary.java
  Log:
  removed unused private fields and imports
  
  Revision  Changes    Path
  1.3       +5 -12     jakarta-commons/jelly/src/test/org/apache/commons/jelly/tags/junit/AssertTag.java
  
  Index: AssertTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/tags/junit/AssertTag.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AssertTag.java	27 Jan 2003 02:35:26 -0000	1.2
  +++ AssertTag.java	11 Jun 2003 15:55:58 -0000	1.3
  @@ -66,10 +66,6 @@
   import org.apache.commons.jelly.MissingAttributeException;
   import org.apache.commons.jelly.expression.Expression;
   
  -import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
  -
  -
   import org.jaxen.JaxenException;
   import org.jaxen.XPath;
   
  @@ -82,9 +78,6 @@
    */
   public class AssertTag extends AssertTagSupport {
   
  -    /** The Log to which logging calls will be made. */
  -    private static final Log log = LogFactory.getLog(AssertTag.class);
  -    
       /** The expression to evaluate. */
       private Expression test;
       
  
  
  
  1.2       +3 -9      jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/Product.java
  
  Index: Product.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/Product.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Product.java	15 Jan 2003 12:23:19 -0000	1.1
  +++ Product.java	11 Jun 2003 15:55:58 -0000	1.2
  @@ -61,9 +61,6 @@
    */
   package org.apache.commons.jelly.core;
   
  -import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
  -
   /** 
    * A sample bean that we can construct via Jelly tags
    *
  @@ -71,9 +68,6 @@
    * @version $Revision$
    */
   public class Product {
  -
  -    /** The Log to which logging calls will be made. */
  -    private static final Log log = LogFactory.getLog(Product.class);
   
       private String id;
       private String name;
  
  
  
  1.2       +3 -9      jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/Order.java
  
  Index: Order.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/Order.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Order.java	15 Jan 2003 12:23:19 -0000	1.1
  +++ Order.java	11 Jun 2003 15:55:58 -0000	1.2
  @@ -61,9 +61,6 @@
    */
   package org.apache.commons.jelly.core;
   
  -import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
  -
   /** 
    * A sample bean that we can construct via Jelly tags
    *
  @@ -71,9 +68,6 @@
    * @version $Revision$
    */
   public class Order {
  -
  -    /** The Log to which logging calls will be made. */
  -    private static final Log log = LogFactory.getLog(Order.class);
   
       private Product product;
       private int amount;
  
  
  
  1.2       +3 -9      jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/Customer.java
  
  Index: Customer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/core/Customer.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Customer.java	15 Jan 2003 12:23:20 -0000	1.1
  +++ Customer.java	11 Jun 2003 15:55:58 -0000	1.2
  @@ -65,9 +65,6 @@
   import java.util.Iterator;
   import java.util.List;
   
  -import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
  -
   /** 
    * A sample bean that we can construct via Jelly tags
    *
  @@ -75,9 +72,6 @@
    * @version $Revision$
    */
   public class Customer {
  -
  -    /** The Log to which logging calls will be made. */
  -    private static final Log log = LogFactory.getLog(Customer.class);
   
       private String name;
       private String city;
  
  
  
  1.10      +5 -11     jakarta-commons/jelly/src/java/org/apache/commons/jelly/XMLOutput.java
  
  Index: XMLOutput.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/XMLOutput.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- XMLOutput.java	30 Oct 2002 19:16:26 -0000	1.9
  +++ XMLOutput.java	11 Jun 2003 15:55:58 -0000	1.10
  @@ -67,9 +67,6 @@
   import java.io.UnsupportedEncodingException;
   import java.io.Writer;
   
  -import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
  -
   import org.dom4j.io.XMLWriter;
   
   import org.xml.sax.Attributes;
  @@ -96,9 +93,6 @@
               "http://xml.org/sax/properties/lexical-handler",
               "http://xml.org/sax/handlers/LexicalHandler" };
   
  -    /** The Log to which logging calls will be made. */
  -    private static final Log log = LogFactory.getLog(XMLOutput.class);
  -    
       /** empty attributes */
       private static final Attributes EMPTY_ATTRIBUTES = new AttributesImpl();
       
  
  
  
  1.5       +0 -8      jakarta-commons/jelly/src/test/org/apache/commons/jelly/impl/TestTagLibraryResolver.java
  
  Index: TestTagLibraryResolver.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/impl/TestTagLibraryResolver.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- TestTagLibraryResolver.java	11 Dec 2002 12:41:02 -0000	1.4
  +++ TestTagLibraryResolver.java	11 Jun 2003 15:55:58 -0000	1.5
  @@ -66,9 +66,6 @@
   import junit.framework.TestSuite;
   import junit.textui.TestRunner;
   
  -import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
  -
   /** Tests the core tags
     *
     * @author <a href="mailto:jstrachan@apache.org">James Strachan</a>
  @@ -76,11 +73,6 @@
     */
   public class TestTagLibraryResolver extends TestCase {
   
  -    /** The Log to which logging calls will be made. */
  -    private static final Log log = LogFactory.getLog(TestTagLibraryResolver.class);
  -
  -    private TagLibraryResolver resolver = new DefaultTagLibraryResolver();
  -    
       public static void main(String[] args) {
           TestRunner.run(suite());
       }
  
  
  
  1.9       +0 -5      jakarta-commons/jelly/src/java/org/apache/commons/jelly/impl/DynamicDynaBeanTag.java
  
  Index: DynamicDynaBeanTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/impl/DynamicDynaBeanTag.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- DynamicDynaBeanTag.java	26 Jan 2003 11:03:36 -0000	1.8
  +++ DynamicDynaBeanTag.java	11 Jun 2003 15:55:58 -0000	1.9
  @@ -72,8 +72,6 @@
   import org.apache.commons.jelly.MissingAttributeException;
   import org.apache.commons.jelly.XMLOutput;
   import org.apache.commons.jelly.expression.Expression;
  -import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
   
   /** 
    * This tag is bound onto a {@link DynaClass} instance. 
  @@ -84,9 +82,6 @@
    * @version $Revision$
    */
   public class DynamicDynaBeanTag extends DynaBeanTagSupport implements BeanSource {
  -
  -    /** The Log to which logging calls will be made. */
  -    private static final Log log = LogFactory.getLog(DynamicDynaBeanTag.class);
   
       /** the bean class */
       private DynaClass beanClass;
  
  
  
  1.18      +0 -6      jakarta-commons/jelly/src/java/org/apache/commons/jelly/impl/StaticTagScript.java
  
  Index: StaticTagScript.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/impl/StaticTagScript.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- StaticTagScript.java	1 Mar 2003 21:01:05 -0000	1.17
  +++ StaticTagScript.java	11 Jun 2003 15:55:58 -0000	1.18
  @@ -72,9 +72,6 @@
   import org.apache.commons.jelly.TagLibrary;
   import org.apache.commons.jelly.XMLOutput;
   import org.apache.commons.jelly.expression.Expression;
  -import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
  -
   import org.xml.sax.SAXException;
   
   /** 
  @@ -87,9 +84,6 @@
    * @version $Revision$
    */
   public class StaticTagScript extends TagScript {
  -
  -    /** The Log to which logging calls will be made. */
  -    private static final Log log = LogFactory.getLog(StaticTagScript.class);
   
       public StaticTagScript() {
       }
  
  
  
  1.3       +0 -6      jakarta-commons/jelly/src/test/org/apache/commons/jelly/expression/TestDynaBeans.java
  
  Index: TestDynaBeans.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/expression/TestDynaBeans.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TestDynaBeans.java	30 Oct 2002 19:16:30 -0000	1.2
  +++ TestDynaBeans.java	11 Jun 2003 15:55:58 -0000	1.3
  @@ -77,9 +77,6 @@
   import org.apache.commons.jelly.JellyContext;
   import org.apache.commons.jelly.expression.jexl.JexlExpressionFactory;
   
  -import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
  -
   /** 
    * Tests the use of Expression parsing
    *
  @@ -87,9 +84,6 @@
    * @version $Revision$
    */
   public class TestDynaBeans extends TestCase {
  -
  -    /** The Log to which logging calls will be made. */
  -    private static final Log log = LogFactory.getLog(TestDynaBeans.class);
   
       protected JellyContext context = new JellyContext();
       protected ExpressionFactory factory = new JexlExpressionFactory();
  
  
  
  1.9       +0 -6      jakarta-commons/jelly/src/test/org/apache/commons/jelly/expression/TestExpressions.java
  
  Index: TestExpressions.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/expression/TestExpressions.java,v
  retrieving revision 1.8
  retrieving revision 1.9
  diff -u -r1.8 -r1.9
  --- TestExpressions.java	27 Nov 2002 13:07:28 -0000	1.8
  +++ TestExpressions.java	11 Jun 2003 15:55:58 -0000	1.9
  @@ -69,9 +69,6 @@
   import org.apache.commons.jelly.JellyContext;
   import org.apache.commons.jelly.expression.jexl.JexlExpressionFactory;
   
  -import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
  -
   /** 
    * Tests the use of Expression parsing
    *
  @@ -79,9 +76,6 @@
    * @version $Revision$
    */
   public class TestExpressions extends TestCase {
  -
  -    /** The Log to which logging calls will be made. */
  -    private static final Log log = LogFactory.getLog(TestExpressions.class);
   
       protected JellyContext context = new JellyContext();
       protected ExpressionFactory factory = new JexlExpressionFactory();
  
  
  
  1.5       +0 -6      jakarta-commons/jelly/src/java/org/apache/commons/jelly/tags/core/BreakTag.java
  
  Index: BreakTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/tags/core/BreakTag.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- BreakTag.java	24 Jan 2003 22:53:33 -0000	1.4
  +++ BreakTag.java	11 Jun 2003 15:55:58 -0000	1.5
  @@ -66,9 +66,6 @@
   import org.apache.commons.jelly.impl.BreakException;
   import org.apache.commons.jelly.expression.Expression;
   
  -import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
  -
   /** 
    * A tag which terminates the execution of the current &lt;forEach&gt; or &lg;while&gt;
    * loop. This tag can take an optional boolean test attribute which if its true
  @@ -81,9 +78,6 @@
   
       /** The expression to evaluate. */
       private Expression test;
  -
  -    /** The Log to which logging calls will be made. */
  -    private static final Log log = LogFactory.getLog(BreakTag.class);
   
       public BreakTag() {
       }
  
  
  
  1.13      +5 -11     jakarta-commons/jelly/src/java/org/apache/commons/jelly/tags/core/ExprTag.java
  
  Index: ExprTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/java/org/apache/commons/jelly/tags/core/ExprTag.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- ExprTag.java	24 Jan 2003 22:53:33 -0000	1.12
  +++ ExprTag.java	11 Jun 2003 15:55:58 -0000	1.13
  @@ -65,9 +65,6 @@
   import org.apache.commons.jelly.TagSupport;
   import org.apache.commons.jelly.XMLOutput;
   import org.apache.commons.jelly.expression.Expression;
  -import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
  -
   import org.xml.sax.SAXException;
   
   /** A tag which evaluates an expression
  @@ -77,9 +74,6 @@
     * @version $Revision$
     */
   public class ExprTag extends TagSupport {
  -
  -    /** The Log to which logging calls will be made. */
  -    private static final Log log = LogFactory.getLog(ExprTag.class);
   
       /** The expression to evaluate. */
       private Expression value;
  
  
  
  1.3       +0 -5      jakarta-commons/jelly/src/test/org/apache/commons/jelly/test/impl/DummyTagLibrary.java
  
  Index: DummyTagLibrary.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons/jelly/src/test/org/apache/commons/jelly/test/impl/DummyTagLibrary.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DummyTagLibrary.java	11 Dec 2002 12:41:01 -0000	1.2
  +++ DummyTagLibrary.java	11 Jun 2003 15:55:59 -0000	1.3
  @@ -62,8 +62,6 @@
   package org.apache.commons.jelly.test.impl;
   
   import org.apache.commons.jelly.TagLibrary;
  -import org.apache.commons.logging.Log;
  -import org.apache.commons.logging.LogFactory;
   
   /**
    * Test taglibrary
  @@ -71,9 +69,6 @@
    * @author <a href="mailto:vinayc@apache.org">Vinay Chandran</a>
    */
   public class DummyTagLibrary extends TagLibrary {
  -    /** The Log to which logging calls will be made. */
  -    private static final Log log = LogFactory.getLog(DummyTagLibrary.class);
  -
       public DummyTagLibrary() {
           registerTag("dummy", DummyTag.class);
       }
  
  
  

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