You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by js...@apache.org on 2002/05/31 13:32:21 UTC

cvs commit: jakarta-commons-sandbox/jelly/src/test/org/apache/commons/jelly Copy of test_args.jelly

jstrachan    2002/05/31 04:32:21

  Modified:    jelly/src/java/org/apache/commons/jelly/tags/ant
                        TaskTag.java TaskPropertyTag.java DataTypeTag.java
               jelly/xdocs overview.xml
  Removed:     jelly/src/test/org/apache/commons/jelly Copy of
                        test_args.jelly
  Log:
  Patched the Ant tag library to use the new ConvertingWrapDynaBean just added to beanutils for wrapping a bean but also providing type conversions (unlike WrapDynaBean which does no conversion)
  
  Revision  Changes    Path
  1.3       +3 -3      jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/ant/TaskTag.java
  
  Index: TaskTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/ant/TaskTag.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- TaskTag.java	30 May 2002 12:15:25 -0000	1.2
  +++ TaskTag.java	31 May 2002 11:32:21 -0000	1.3
  @@ -61,8 +61,8 @@
    */
   package org.apache.commons.jelly.tags.ant;
   
  +import org.apache.commons.beanutils.ConvertingWrapDynaBean;
   import org.apache.commons.beanutils.DynaBean;
  -import org.apache.commons.beanutils.WrapDynaBean;
   
   import org.apache.commons.jelly.DynaBeanTagSupport;
   import org.apache.commons.jelly.JellyContext;
  @@ -86,7 +86,7 @@
   
       public TaskTag(Task task) {
           this.task = task;
  -        setDynaBean( new WrapDynaBean(task) );
  +        setDynaBean( new ConvertingWrapDynaBean(task) );
       }
   
       // Tag interface
  @@ -115,7 +115,7 @@
        */
       public void setTask(Task task) {
           this.task = task;
  -        setDynaBean( new WrapDynaBean(task) );
  +        setDynaBean( new ConvertingWrapDynaBean(task) );
       }
       
   }
  
  
  
  1.2       +2 -2      jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/ant/TaskPropertyTag.java
  
  Index: TaskPropertyTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/ant/TaskPropertyTag.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TaskPropertyTag.java	30 May 2002 12:15:25 -0000	1.1
  +++ TaskPropertyTag.java	31 May 2002 11:32:21 -0000	1.2
  @@ -65,9 +65,9 @@
   import java.util.Iterator;
   import java.util.Map;
   
  +import org.apache.commons.beanutils.ConvertingWrapDynaBean;
   import org.apache.commons.beanutils.BeanUtils;
   import org.apache.commons.beanutils.DynaBean;
  -import org.apache.commons.beanutils.WrapDynaBean;
   
   import org.apache.commons.jelly.CompilableTag;
   import org.apache.commons.jelly.DynaBeanTagSupport;
  @@ -137,7 +137,7 @@
               throw new JellyException( "No property: " + name + " of task: " + task + " was returned." );
           }
           
  -        setDynaBean( new WrapDynaBean(propertyBean) );
  +        setDynaBean( new ConvertingWrapDynaBean(propertyBean) );
       }
       
       // Tag interface
  
  
  
  1.3       +3 -3      jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/ant/DataTypeTag.java
  
  Index: DataTypeTag.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/src/java/org/apache/commons/jelly/tags/ant/DataTypeTag.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- DataTypeTag.java	30 May 2002 12:15:25 -0000	1.2
  +++ DataTypeTag.java	31 May 2002 11:32:21 -0000	1.3
  @@ -63,10 +63,10 @@
   
   import java.lang.reflect.Method;
   
  +import org.apache.commons.beanutils.ConvertingWrapDynaBean;
   import org.apache.commons.beanutils.DynaBean;
   import org.apache.commons.beanutils.DynaClass;
   import org.apache.commons.beanutils.DynaProperty;
  -import org.apache.commons.beanutils.WrapDynaBean;
   
   import org.apache.commons.jelly.DynaBeanTagSupport;
   import org.apache.commons.jelly.JellyContext;
  @@ -96,7 +96,7 @@
       public DataTypeTag(String name, Object dataType) {
           this.name = name;
           this.dataType = dataType;
  -        setDynaBean( new WrapDynaBean(dataType) );
  +        setDynaBean( new ConvertingWrapDynaBean(dataType) );
       }
   
       // Tag interface
  @@ -175,7 +175,7 @@
        */
       public void setDataType(Object dataType) {
           this.dataType = dataType;
  -        setDynaBean( new WrapDynaBean(dataType) );
  +        setDynaBean( new ConvertingWrapDynaBean(dataType) );
       }
       
   }
  
  
  
  1.6       +1 -1      jakarta-commons-sandbox/jelly/xdocs/overview.xml
  
  Index: overview.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/jelly/xdocs/overview.xml,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- overview.xml	31 May 2002 10:57:57 -0000	1.5
  +++ overview.xml	31 May 2002 11:32:21 -0000	1.6
  @@ -11,7 +11,7 @@
   
   <section name="Jelly Overview">
   
  -<p>Jelly is an XML based <i>processing engine</i>. The basic idea is that XML 
  +<p>Jelly is an XML based scripting engine. The basic idea is that XML 
   elements can be bound to a Java <i>Tag</i> which is a Java bean that performs 
   some function. Here's an example action</p>
   
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>