dion        2002/06/22 20:16:16

  Modified:    src/java/org/apache/maven Build.java
  Log:
  Added TaskResolver and PluginManager usage
  
  Revision  Changes    Path
  1.18      +40 -2     jakarta-turbine-maven/src/java/org/apache/maven/Build.java
  
  Index: Build.java
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/java/org/apache/maven/Build.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- Build.java        22 Jun 2002 15:48:02 -0000      1.17
  +++ Build.java        23 Jun 2002 03:16:16 -0000      1.18
  @@ -78,6 +78,8 @@
   import org.apache.maven.build.PropertyResolver;
   import org.apache.maven.build.Repository;
   import org.apache.maven.build.RepositoryManager;
  +import org.apache.maven.build.TaskResolver;
  +import org.apache.maven.plugin.PluginManager;
   
   import org.xml.sax.SAXException;
   
  @@ -127,6 +129,10 @@
           Build.class);
       /** the repository manager to handle jar download etc */
       private RepositoryManager repositoryManager = new RepositoryManager();
  +    /** used to resolve what to execute */
  +    private TaskResolver taskResolver;
  +    /** used to manage plugins */
  +    private PluginManager pluginManager;
       /** list of targets to run */
       private List tasks;
       
  @@ -220,7 +226,8 @@
           // verify project is ok first
           LOG.info("Verifying project integrity");
           verifyProject();
  -        // resolve action to run using TaskResolver and PluginManager
  +        // resolve action to run using TaskResolver
  +        List executors = getTaskResolver().resolveTaskList();
           // execute action(s) via PluginExecutors
       }
       
  @@ -372,6 +379,37 @@
           return getRepositoryManager().getRemoteRepositories();
       }
       
  +    /**
  +     * Retrieve the configured task resolver for this build
  +     *
  +     * @return the configured task resolver
  +     */
  +    private TaskResolver getTaskResolver()
  +    {
  +        if (taskResolver == null)
  +        {
  +            taskResolver = new TaskResolver();
  +            taskResolver.setTasks(getTasks());
  +            taskResolver.setPluginManager(getPluginManager());
  +        }
  +        return taskResolver;
  +    }
  +    
  +    /**
  +     * Retrieve the configured plugin manager for this build
  +     *
  +     * @return the configured plugin manager
  +     */
  +    private PluginManager getPluginManager()
  +    {
  +        if (pluginManager == null)
  +        {
  +            pluginManager = new PluginManager();
  +            pluginManager.setPluginDirectory(getProperty("maven.home") + 
  +                "/plugins/");
  +        }
  +        return pluginManager;
  +    }
       /**
        * Provide a list of command line options supported
        *
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to