ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adammurd...@apache.org
Subject cvs commit: jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework ExecuteTarget.java
Date Tue, 23 Apr 2002 02:07:14 GMT
adammurdoch    02/04/22 19:07:14

  Modified:    ant1compat project.xml
               ant1compat/src/java/org/apache/tools/ant/taskdefs
                        AbstractAnt1AntTask.java Ant.java CallTarget.java
               antlib/src/java/org/apache/antlib/core AbstractAntTask.java
                        AntCallTask.java AntTask.java
  Added:       framework/src/java/org/apache/myrmidon/framework
                        ExecuteTarget.java
  Log:
  - Moved code for executing a target out of AbstractAntCallTask into a
    new framework class, ExecuteTarget.
  - Changed <ant1.ant> and <ant1.antcall> to use this class directly, rather
    than executing <ant> or <antcall> (which may or may not be available).
  
  Revision  Changes    Path
  1.5       +1 -0      jakarta-ant-myrmidon/ant1compat/project.xml
  
  Index: project.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/ant1compat/project.xml,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- project.xml	22 Apr 2002 06:52:30 -0000	1.4
  +++ project.xml	23 Apr 2002 02:07:14 -0000	1.5
  @@ -10,6 +10,7 @@
       <classpath>
           <fileset dir="../api/build/lib" includes="*.jar"/>
           <fileset dir="../aut/build/lib" includes="*.jar"/>
  +        <fileset dir="../framework/build/lib" includes="*.jar"/>
           <fileset dir="../lib" includes="*.jar"/>
       </classpath>
   
  
  
  
  1.3       +29 -80    jakarta-ant-myrmidon/ant1compat/src/java/org/apache/tools/ant/taskdefs/AbstractAnt1AntTask.java
  
  Index: AbstractAnt1AntTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/ant1compat/src/java/org/apache/tools/ant/taskdefs/AbstractAnt1AntTask.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- AbstractAnt1AntTask.java	21 Apr 2002 02:03:04 -0000	1.2
  +++ AbstractAnt1AntTask.java	23 Apr 2002 02:07:14 -0000	1.3
  @@ -10,9 +10,7 @@
   import java.util.Iterator;
   import java.util.Vector;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.myrmidon.api.metadata.ModelElement;
  -import org.apache.myrmidon.interfaces.executor.ExecutionFrame;
  -import org.apache.myrmidon.interfaces.executor.Executor;
  +import org.apache.myrmidon.framework.ExecuteTarget;
   import org.apache.tools.ant.Ant1CompatProject;
   import org.apache.tools.ant.BuildException;
   import org.apache.tools.ant.Task;
  @@ -22,37 +20,40 @@
    * which delegate to the Myrmidon versions of these tasks.
    *
    * @author <a href="mailto:darrell@apache.org">Darrell DeBoer</a>
  - * @version $Revision: 1.2 $ $Date: 2002/04/21 02:03:04 $
  + * @version $Revision: 1.3 $ $Date: 2002/04/23 02:07:14 $
    */
   public abstract class AbstractAnt1AntTask
       extends Task
   {
  -    /** the target to call if any */
  -    private String target = null;
  -    /** should we inherit properties from the parent ? */
  -    private boolean inheritAll = true;
  +    private final ExecuteTarget m_exe = new ExecuteTarget();
  +
       /** the properties to pass to the new project */
       private Vector properties = new Vector();
       /** the references to pass to the new project */
       private Vector references = new Vector();
   
  +    public AbstractAnt1AntTask()
  +    {
  +        m_exe.setInheritAll( true );
  +    }
  +
       /**
        * If true, inherit all properties from parent Project
        * If false, inherit only userProperties and those defined
        * inside the ant call itself
        */
  -    public void setInheritAll( boolean value )
  +    public void setInheritAll( final boolean value )
       {
  -        inheritAll = value;
  +        m_exe.setInheritAll( value );
       }
   
       /**
        * set the target to execute. If none is defined it will
        * execute the default target of the build file
        */
  -    public void setTarget( String s )
  +    public void setTarget( final String target )
       {
  -        this.target = s;
  +        m_exe.setTarget( target );
       }
   
       /**
  @@ -111,32 +112,18 @@
   
           try
           {
  -            final ModelElement antConfig = constructTaskModel();
  -            executeTask( antConfig );
  +            // TODO: Handle references.
  +            addProperties();
  +            prepare( m_exe );
  +            m_exe.execute( m_context );
           }
  -        finally
  +        catch( final TaskException e )
           {
  -            resetAnt1Project( ant1project );
  -        }
  -    }
  -
  -    /**
  -     * Executes the Myrmidon task detailed in the TaskModel provided.
  -     *
  -     * @param taskModel the TaskModel for the task to execute.
  -     */
  -    private void executeTask( final ModelElement taskModel )
  -    {
  -        try
  -        {
  -            Executor executor = (Executor)m_context.getService( Executor.class );
  -            ExecutionFrame frame =
  -                (ExecutionFrame)m_context.getService( ExecutionFrame.class );
  -            executor.execute( taskModel, frame );
  +            throw new BuildException( e );
           }
  -        catch( TaskException e )
  +        finally
           {
  -            throw new BuildException( e );
  +            resetAnt1Project( ant1project );
           }
       }
   
  @@ -180,60 +167,22 @@
       }
   
       /**
  -     * Builds the TaskModel for executing the Myrmidon version of a task.
  -     *
  -     * @return a Configuration containing the TaskModel
  +     * Prepares for executing the target.  This method is responsible for
  +     * setting the project or project file to use.
        */
  -    protected ModelElement constructTaskModel()
  -    {
  -        ModelElement antConfig = buildTaskModel();
  -
  -        antConfig.setAttribute( "inherit-all", String.valueOf( inheritAll ) );
  -
  -        // Ignore inheritRefs for now ( inheritAll == inheritRefs )
  -
  -        if( target != null )
  -        {
  -            antConfig.setAttribute( "target", target );
  -        }
  -
  -        addProperties( antConfig );
  -        addReferences( antConfig );
  -
  -        return antConfig;
  -    }
  +    protected abstract void prepare( ExecuteTarget exe ) throws TaskException;
   
       /**
  -     * Create the Myrmidon TaskModel, and configure with subclass-specific config.
  +     * Adds all defined properties.
        */
  -    protected abstract ModelElement buildTaskModel();
  -
  -    /**
  -     * Adds all defined properties to the supplied Task model.
  -     * @param taskModel
  -     */
  -    protected void addProperties( final ModelElement taskModel )
  +    private void addProperties()
       {
           // Add all of the properties.
  -        Iterator iter = properties.iterator();
  +        final Iterator iter = properties.iterator();
           while( iter.hasNext() )
           {
  -            ModelElement param = new ModelElement( "param", "" );
  -            Property property = (Property)iter.next();
  -            param.setAttribute( "name", property.getName() );
  -            param.setAttribute( "value", property.getValue() );
  -            taskModel.addChild( param );
  +            final Property property = (Property)iter.next();
  +            m_exe.getParameters().put( property.getName(), property.getValue() );
           }
       }
  -
  -    /**
  -     * Adds all defined references to the supplied Task model.
  -     *
  -     * @param taskModel
  -     */
  -    protected void addReferences( ModelElement taskModel )
  -    {
  -        // TODO: Handle references.
  -    }
  -
   }
  
  
  
  1.3       +8 -13     jakarta-ant-myrmidon/ant1compat/src/java/org/apache/tools/ant/taskdefs/Ant.java
  
  Index: Ant.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/ant1compat/src/java/org/apache/tools/ant/taskdefs/Ant.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- Ant.java	21 Apr 2002 02:03:04 -0000	1.2
  +++ Ant.java	23 Apr 2002 02:07:14 -0000	1.3
  @@ -55,8 +55,10 @@
   package org.apache.tools.ant.taskdefs;
   
   import java.io.File;
  +import org.apache.avalon.excalibur.io.FileUtil;
  +import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.framework.ExecuteTarget;
   import org.apache.tools.ant.util.FileUtils;
  -import org.apache.myrmidon.api.metadata.ModelElement;
   
   /**
    * Ant1Compat version of &lt;ant&gt;, which delegates to the Myrmidon version.
  @@ -123,14 +125,11 @@
       }
   
       /**
  -     * Construct a TaskModel for the Myrmidon &lt;ant&gt; task, and configure it
  -     * with sub-class specific values (antfile).
  -     * @return the TaskModel
  +     * Prepares for executing the target.  This method is responsible for
  +     * setting the project or project file to use.
        */
  -    protected ModelElement buildTaskModel()
  +    protected void prepare( final ExecuteTarget exe ) throws TaskException
       {
  -        final ModelElement antConfig = new ModelElement( "ant", "" );
  -
           // Get the "file" value.
           if( antFile == null )
           {
  @@ -142,11 +141,7 @@
               dir = project.getBaseDir();
           }
   
  -        File file = FileUtils.newFileUtils().resolveFile( dir, antFile );
  -        antFile = file.getAbsolutePath();
  -
  -        antConfig.setAttribute( "file", antFile );
  -
  -        return antConfig;
  +        final File file = FileUtil.resolveFile( dir, antFile );
  +        exe.setProjectFile( file, null );
       }
   }
  
  
  
  1.3       +10 -6     jakarta-ant-myrmidon/ant1compat/src/java/org/apache/tools/ant/taskdefs/CallTarget.java
  
  Index: CallTarget.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/ant1compat/src/java/org/apache/tools/ant/taskdefs/CallTarget.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- CallTarget.java	21 Apr 2002 02:03:04 -0000	1.2
  +++ CallTarget.java	23 Apr 2002 02:07:14 -0000	1.3
  @@ -7,16 +7,19 @@
    */
   package org.apache.tools.ant.taskdefs;
   
  -import org.apache.myrmidon.api.metadata.ModelElement;
  +import org.apache.myrmidon.api.TaskException;
  +import org.apache.myrmidon.framework.ExecuteTarget;
  +import org.apache.myrmidon.interfaces.model.Project;
   
   /**
    * The Ant1Compat version of the &lt;antcall&gt; task, which delegates to the
    * Myrmidon version.
    *
    * @author <a href="mailto:darrell@apache.org">Darrell DeBoer</a>
  - * @version $Revision: 1.2 $ $Date: 2002/04/21 02:03:04 $
  + * @version $Revision: 1.3 $ $Date: 2002/04/23 02:07:14 $
    */
  -public class CallTarget extends AbstractAnt1AntTask
  +public class CallTarget
  +    extends AbstractAnt1AntTask
   {
       /**
        * Properties are referred to as Parameters in &lt;antcall&gt;
  @@ -27,10 +30,11 @@
       }
   
       /**
  -     * The only configuration not done by base class is the task name.
  +     * Prepares for executing the target.  This method is responsible for
  +     * setting the project or project file to use.
        */
  -    protected ModelElement buildTaskModel()
  +    protected void prepare( final ExecuteTarget exe ) throws TaskException
       {
  -        return new ModelElement( "ant-call", "" );
  +        exe.setProject( (Project)m_context.getService( Project.class ) );
       }
   }
  
  
  
  1.2       +14 -100   jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/core/AbstractAntTask.java
  
  Index: AbstractAntTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/core/AbstractAntTask.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AbstractAntTask.java	14 Apr 2002 10:55:08 -0000	1.1
  +++ AbstractAntTask.java	23 Apr 2002 02:07:14 -0000	1.2
  @@ -7,43 +7,21 @@
    */
   package org.apache.antlib.core;
   
  -import java.util.ArrayList;
  -import java.util.HashMap;
  -import java.util.Map;
   import org.apache.myrmidon.api.AbstractTask;
   import org.apache.myrmidon.api.TaskException;
  -import org.apache.myrmidon.interfaces.embeddor.Embeddor;
  -import org.apache.myrmidon.interfaces.model.Project;
  -import org.apache.myrmidon.interfaces.workspace.Workspace;
  +import org.apache.myrmidon.framework.ExecuteTarget;
   
   /**
    * Abstract base class for Tasks which execute targets.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
    * @author <a href="mailto:darrell@apache.org">Darrell DeBoer</a>
  - * @version $Revision: 1.1 $ $Date: 2002/04/14 10:55:08 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/23 02:07:14 $
    */
   public abstract class AbstractAntTask
       extends AbstractTask
   {
  -    /**
  -     * If true, inherit all properties from parent Project
  -     * If false, inherit only userProperties and those defined
  -     * inside the ant call itself
  -     */
  -    private boolean m_inheritAll;
  -
  -    /**
  -     * The target to process in build file. If not specified
  -     * will use default in specified build file.
  -     */
  -    private String m_target;
  -
  -    /**
  -     * The parameters/properties which will be passed to the workspace
  -     * for the target execution.
  -     */
  -    private final ArrayList m_parameters = new ArrayList();
  +    private final ExecuteTarget m_exe = new ExecuteTarget();
   
       /**
        * Specify whether should inherit properties in sub-build.
  @@ -52,7 +30,7 @@
        */
       public void setInheritAll( final boolean inheritAll )
       {
  -        m_inheritAll = inheritAll;
  +        m_exe.setInheritAll( inheritAll );
       }
   
       /**
  @@ -61,7 +39,7 @@
        */
       public void setTarget( final String target )
       {
  -        m_target = target;
  +        m_exe.setTarget( target );
       }
   
       /**
  @@ -70,8 +48,10 @@
        * @param param the parameter
        */
       public void addParam( final AntParam param )
  +        throws TaskException
       {
  -        m_parameters.add( param );
  +        param.validate();
  +        m_exe.getParameters().put( param.getName(), param.getValue() );
       }
   
       /**
  @@ -82,80 +62,14 @@
       public void execute()
           throws TaskException
       {
  -        try
  -        {
  -            Project project = getProject();
  -
  -            Embeddor embeddor = getEmbeddor();
  -
  -            final Workspace workspace =
  -                embeddor.createWorkspace( buildParameters() );
  -
  -            // TODO - inherit listeners, and services (TypeManager specifically)
  -            workspace.addProjectListener( embeddor.createListener("default"));
  -
  -            if( null == m_target )
  -            {
  -                m_target = project.getDefaultTargetName();
  -            }
  -
  -            workspace.executeProject( project, m_target );
  -        }
  -        catch( final Exception e )
  -        {
  -            throw new TaskException( e.toString(), e );
  -        }
  +        prepare( m_exe );
  +        m_exe.execute( getContext() );
       }
   
       /**
  -     * A convenience method for obtaining the Embeddor from the
  -     * TaskContext.
  -     * @return The Embeddor contained in the TaskContext
  -     * @throws TaskException if the Embeddor could not be obtained.
  +     * Prepares for execution, and sets the project containing the target
  +     * to be executed.   Subclasses will override this method to provide
  +     * different means of obtaining a project to execute.
        */
  -    protected Embeddor getEmbeddor() throws TaskException
  -    {
  -        final Embeddor embeddor =
  -            (Embeddor)getContext().getService( Embeddor.class );
  -        return embeddor;
  -    }
  -
  -    /**
  -     * Get/create/build the project containing the target to be executed.
  -     * Subclasses will override this method to provide different means
  -     * of obtaining a project to execute.
  -     * @return The project containing the target to execute.
  -     * @throws Exception If a problem occurred building the project.
  -     */
  -    protected abstract Project getProject() throws Exception;
  -
  -    /**
  -     * Build the parameters to pass to sub-project.
  -     * These include the current tasks properties
  -     * (if inheritall=true) and any supplied by the user.
  -     *
  -     * @return the created parameters
  -     */
  -    private Map buildParameters()
  -        throws TaskException
  -    {
  -        final Map parameters = new HashMap();
  -
  -        if( m_inheritAll )
  -        {
  -            parameters.putAll( getContext().getProperties() );
  -        }
  -
  -        final int size = m_parameters.size();
  -        for( int i = 0; i < size; i++ )
  -        {
  -            final AntParam param = (AntParam)m_parameters.get( i );
  -            param.validate();
  -            final String name = param.getName();
  -            final Object value = param.getValue();
  -            parameters.put( name, value );
  -        }
  -
  -        return parameters;
  -    }
  +    protected abstract void prepare( ExecuteTarget exe ) throws TaskException;
   }
  
  
  
  1.2       +5 -8      jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/core/AntCallTask.java
  
  Index: AntCallTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/core/AntCallTask.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AntCallTask.java	14 Apr 2002 10:55:08 -0000	1.1
  +++ AntCallTask.java	23 Apr 2002 02:07:14 -0000	1.2
  @@ -11,13 +11,14 @@
   import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.myrmidon.interfaces.model.Project;
  +import org.apache.myrmidon.framework.ExecuteTarget;
   
   /**
    * A task which executes a target in the current project,
    * or a referenced project.
    *
    * @author <a href="mailto:darrell@apache.org">Darrell DeBoer</a>
  - * @version $Revision: 1.1 $ $Date: 2002/04/14 10:55:08 $
  + * @version $Revision: 1.2 $ $Date: 2002/04/23 02:07:14 $
    * @ant.task name="ant-call"
    */
   public class AntCallTask
  @@ -40,14 +41,10 @@
   
       /**
        * Get/create/build the project which will be executed.
  -     * Subclasses will override this method to provide different means
  -     * of obtaining a project to execute.
  -     * @return The project containing the target to execute.
  -     * @throws Exception If a problem occurred building the project.
        */
  -    protected Project getProject() throws Exception
  +    protected void prepare( final ExecuteTarget exe ) throws TaskException
       {
  -        Project currentProject =
  +        final Project currentProject =
               (Project)getContext().getService( Project.class );
   
           // By default, use the current project.
  @@ -64,6 +61,6 @@
               }
           }
   
  -        return referencedProject;
  +        exe.setProject( referencedProject );
       }
   }
  
  
  
  1.2       +5 -12     jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/core/AntTask.java
  
  Index: AntTask.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/antlib/src/java/org/apache/antlib/core/AntTask.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- AntTask.java	14 Apr 2002 10:55:08 -0000	1.1
  +++ AntTask.java	23 Apr 2002 02:07:14 -0000	1.2
  @@ -8,8 +8,8 @@
   package org.apache.antlib.core;
   
   import java.io.File;
  -import org.apache.avalon.framework.parameters.Parameters;
  -import org.apache.myrmidon.interfaces.model.Project;
  +import org.apache.myrmidon.framework.ExecuteTarget;
  +import org.apache.myrmidon.api.TaskException;
   
   /**
    * Executes a target in a named build file.
  @@ -18,7 +18,6 @@
    * @ant.task name="ant"
    */
   public class AntTask
  -
       extends AbstractAntTask
   {
       /**
  @@ -59,21 +58,15 @@
       }
   
       /**
  -     * @return The project containing the target to execute.
  -     * @throws Exception If a problem occurred building the project.
  +     * Prepares for executing the target.
        */
  -    protected Project getProject() throws Exception
  +    protected void prepare( final ExecuteTarget exe ) throws TaskException
       {
           if( null == m_file )
           {
               m_file = getContext().resolveFile( DEFAULT_BUILD_FILE );
           }
   
  -        final Project project =
  -            getEmbeddor().createProject( m_file.toString(),
  -                                         m_type,
  -                                         new Parameters() );
  -        return project;
  +        exe.setProjectFile( m_file, m_type );
       }
  -
   }
  
  
  
  1.1                  jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/ExecuteTarget.java
  
  Index: ExecuteTarget.java
  ===================================================================
  /*
   * Copyright (C) The Apache Software Foundation. All rights reserved.
   *
   * This software is published under the terms of the Apache Software License
   * version 1.1, a copy of which has been included  with this distribution in
   * the LICENSE.txt file.
   */
  package org.apache.myrmidon.framework;
  
  import java.util.HashMap;
  import java.util.Map;
  import java.io.File;
  import org.apache.myrmidon.api.TaskContext;
  import org.apache.myrmidon.api.TaskException;
  import org.apache.myrmidon.interfaces.embeddor.Embeddor;
  import org.apache.myrmidon.interfaces.model.Project;
  import org.apache.myrmidon.interfaces.workspace.Workspace;
  
  /**
   * A utility class that simplifies executing a target in a project.
   *
   * @author <a href="mailto:peter@apache.org">Peter Donald</a>
   * @author <a href="mailto:darrell@apache.org">Darrell DeBoer</a>
   * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
   * @version $Revision: 1.1 $ $Date: 2002/04/23 02:07:14 $
   */
  public class ExecuteTarget
  {
      private boolean m_inheritAll;
      private String m_target;
      private Project m_project;
      private final Map m_parameters = new HashMap();
      private File m_projectFile;
      private String m_projectType;
  
      /**
       * Enables the inheritance of properties from the calling task.  Default
       * is to disable property inheritance.
       */
      public void setInheritAll( final boolean inheritAll )
      {
          m_inheritAll = inheritAll;
      }
  
      /**
       * Sets the name of the target to execute. If not specified, the project's
       * default target will be executed.
       */
      public void setTarget( final String target )
      {
          m_target = target;
      }
  
      /**
       * Sets the project to execute.
       */
      public void setProject( final Project project )
      {
          m_project = project;
          m_projectFile = null;
          m_projectType = null;
      }
  
      /**
       * Sets the project file to execute.
       */
      public void setProjectFile( final File projectFile, final String projectType )
      {
          m_projectFile = projectFile;
          m_projectType = projectType;
          m_project = null;
      }
  
      /**
       * Returns the parameters for executing the target.  This map can be
       * modified.
       */
      public Map getParameters()
      {
          return m_parameters;
      }
  
      /**
       * Executes the target.
       */
      public void execute( final TaskContext context )
          throws TaskException
      {
          try
          {
              final Embeddor embeddor = (Embeddor)context.getService( Embeddor.class );
  
              Project project = m_project;
              if( project == null )
              {
                  project = embeddor.createProject( m_projectFile.getAbsolutePath(), m_projectType,
null );
              }
  
              final Workspace workspace =
                  embeddor.createWorkspace( buildParameters( context ) );
  
              // TODO - inherit listeners, and services (TypeManager specifically)
              workspace.addProjectListener( embeddor.createListener( "default" ) );
  
              String target = m_target;
              if( null == target )
              {
                  target = project.getDefaultTargetName();
              }
  
              workspace.executeProject( project, target );
          }
          catch( final Exception e )
          {
              throw new TaskException( e.toString(), e );
          }
      }
  
      /**
       * Build the parameters to pass to sub-project. These include the current
       * tasks properties (if inheritall=true) and any overrides.
       *
       * @return the created parameters
       */
      private Map buildParameters( final TaskContext context )
          throws TaskException
      {
          final Map parameters = new HashMap();
  
          // Add the properties from the current project
          if( m_inheritAll )
          {
              parameters.putAll( context.getProperties() );
          }
  
          // Add the overrides
          parameters.putAll( m_parameters );
  
          return parameters;
      }
  }
  
  
  

--
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