ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From darr...@apache.org
Subject cvs commit: jakarta-ant/proposal/myrmidon/src/xdocs todo.xml
Date Sun, 24 Mar 2002 07:53:54 GMT
darrell     02/03/23 23:53:54

  Modified:    proposal/myrmidon/src/ant1compat/org/apache/tools/ant
                        Ant1CompatProject.java
               proposal/myrmidon/src/java/org/apache/myrmidon/components/property
                        ClassicPropertyResolver.java
                        DefaultPropertyResolver.java
               proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/property
                        PropertyResolver.java
               proposal/myrmidon/src/xdocs todo.xml
  Log:
  * Added 'property-resolver' role, with 'default'
    and 'classic' implementations.
  * Ant1CompatProject doesn't instantiate
    ClassicPropertyResolver directly.
  
  Revision  Changes    Path
  1.7       +15 -3     jakarta-ant/proposal/myrmidon/src/ant1compat/org/apache/tools/ant/Ant1CompatProject.java
  
  Index: Ant1CompatProject.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/ant1compat/org/apache/tools/ant/Ant1CompatProject.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Ant1CompatProject.java	22 Mar 2002 10:06:52 -0000	1.6
  +++ Ant1CompatProject.java	24 Mar 2002 07:53:54 -0000	1.7
  @@ -21,9 +21,10 @@
   import org.apache.aut.converter.ConverterException;
   import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.myrmidon.components.property.ClassicPropertyResolver;
   import org.apache.myrmidon.interfaces.property.PropertyResolver;
   import org.apache.myrmidon.interfaces.type.DefaultTypeFactory;
  +import org.apache.myrmidon.interfaces.type.TypeException;
  +import org.apache.myrmidon.interfaces.type.TypeFactory;
   import org.apache.myrmidon.interfaces.type.TypeManager;
   
   /**
  @@ -34,7 +35,7 @@
    * Ant1 original, this class contains the extensions.
    *
    * @author <a href="mailto:darrell@apache.org">Darrell DeBoer</a>
  - * @version $Revision: 1.6 $ $Date: 2002/03/22 10:06:52 $
  + * @version $Revision: 1.7 $ $Date: 2002/03/24 07:53:54 $
    */
   public class Ant1CompatProject extends Project
   {
  @@ -63,8 +64,19 @@
               setName( projectName );
           }
   
  -        m_ant1PropertyResolver = new ClassicPropertyResolver();
           m_converter = (Converter)context.getService( Converter.class );
  +
  +        TypeManager typeManager = (TypeManager)context.getService( TypeManager.class );
  +        try
  +        {
  +            TypeFactory factory = typeManager.getFactory( PropertyResolver.ROLE );
  +            m_ant1PropertyResolver = (PropertyResolver)factory.create( "classic" );
  +        }
  +        catch( TypeException e )
  +        {
  +            throw new TaskException( "Failed to create PropertyResolver.", e );
  +        }
  +
       }
   
       /**
  
  
  
  1.4       +3 -1      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/property/ClassicPropertyResolver.java
  
  Index: ClassicPropertyResolver.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/property/ClassicPropertyResolver.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- ClassicPropertyResolver.java	20 Mar 2002 22:30:55 -0000	1.3
  +++ ClassicPropertyResolver.java	24 Mar 2002 07:53:54 -0000	1.4
  @@ -15,7 +15,9 @@
    * as per Ant1, ignoring undefined properties.
    *
    * @author <a href="mailto:darrell@apache.org">Darrell DeBoer</a>
  - * @version $Revision: 1.3 $ $Date: 2002/03/20 22:30:55 $
  + * @version $Revision: 1.4 $ $Date: 2002/03/24 07:53:54 $
  + *
  + * @ant.type type="property-resolver" name="classic"
    */
   public class ClassicPropertyResolver
       extends DefaultPropertyResolver
  
  
  
  1.5       +3 -1      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/property/DefaultPropertyResolver.java
  
  Index: DefaultPropertyResolver.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/property/DefaultPropertyResolver.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultPropertyResolver.java	21 Mar 2002 10:29:15 -0000	1.4
  +++ DefaultPropertyResolver.java	24 Mar 2002 07:53:54 -0000	1.5
  @@ -23,7 +23,9 @@
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
    * @author <a href="mailto:darrell@apache.org">Darrell DeBoer</a>
  - * @version $Revision: 1.4 $ $Date: 2002/03/21 10:29:15 $
  + * @version $Revision: 1.5 $ $Date: 2002/03/24 07:53:54 $
  + *
  + * @ant.type type="property-resolver" name="default"
    */
   public class DefaultPropertyResolver
       implements PropertyResolver, Serviceable
  
  
  
  1.4       +3 -1      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/property/PropertyResolver.java
  
  Index: PropertyResolver.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/interfaces/property/PropertyResolver.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- PropertyResolver.java	20 Mar 2002 22:30:55 -0000	1.3
  +++ PropertyResolver.java	24 Mar 2002 07:53:54 -0000	1.4
  @@ -16,7 +16,9 @@
    * String content.
    *
    * @author <a href="mailto:darrell@apache.org">Darrell DeBoer</a>
  - * @version $Revision: 1.3 $ $Date: 2002/03/20 22:30:55 $
  + * @version $Revision: 1.4 $ $Date: 2002/03/24 07:53:54 $
  + *
  + * @ant:role shorthand="property-resolver"
    */
   public interface PropertyResolver
   {
  
  
  
  1.14      +2 -0      jakarta-ant/proposal/myrmidon/src/xdocs/todo.xml
  
  Index: todo.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/xdocs/todo.xml,v
  retrieving revision 1.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- todo.xml	24 Mar 2002 02:27:41 -0000	1.13
  +++ todo.xml	24 Mar 2002 07:53:54 -0000	1.14
  @@ -98,12 +98,14 @@
                       Write tests for the various bits that rely on Myrmidon
                       functionality:
                       <ul>
  +                        <li>Simple sanity test</li>
                           <li>if/unless on targets: check that behaviour complies with
Ant1</li>
                           <li>Make sure properties are shared between Ant1 and Myrmidon
tasks.</li>
                           <li>Make sure that &lt;ant1.property&gt; behaves
as per Ant1</li>
                       </ul>
                       </li>
                       <li>Get GUMP runs going using Myrmidon.</li>
  +                    <li>i18n messages</li>
                   </ul>
               </subsection>
   
  
  
  

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


Mime
View raw message