ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework ExecuteTarget.java
Date Sun, 09 Jun 2002 03:58:35 GMT
donaldp     2002/06/08 20:58:35

  Modified:    container/src/java/org/apache/myrmidon/components/builder
                        DefaultProject.java
               container/src/java/org/apache/myrmidon/components/embeddor
                        DefaultEmbeddor.java
               container/src/java/org/apache/myrmidon/components/workspace
                        DefaultWorkspace.java
               container/src/java/org/apache/myrmidon/interfaces
                        EmbeddedAnt.java
               container/src/java/org/apache/myrmidon/interfaces/embeddor
                        Embeddor.java
               container/src/test/org/apache/myrmidon/components/embeddor/test
                        DefaultEmbeddorTest.java
               framework/src/java/org/apache/myrmidon/framework
                        ExecuteTarget.java
  Log:
  Remove unused Parameters object from Embeddor.createProject() method
  
  Revision  Changes    Path
  1.24      +2 -2      jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/builder/DefaultProject.java
  
  Index: DefaultProject.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/builder/DefaultProject.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- DefaultProject.java	8 Jun 2002 23:56:04 -0000	1.23
  +++ DefaultProject.java	9 Jun 2002 03:58:34 -0000	1.24
  @@ -29,7 +29,7 @@
    * Default project implementation.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.23 $ $Date: 2002/06/08 23:56:04 $
  + * @version $Revision: 1.24 $ $Date: 2002/06/09 03:58:34 $
    */
   public class DefaultProject
       extends AbstractLogEnabled
  @@ -143,7 +143,7 @@
           final ProjectDescriptor project = ref.getProject();
           try
           {
  -            return m_embeddor.createProject( project, null );
  +            return m_embeddor.createProject( project );
           }
           catch( final Exception e )
           {
  
  
  
  1.85      +3 -3      jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/embeddor/DefaultEmbeddor.java
  
  Index: DefaultEmbeddor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/embeddor/DefaultEmbeddor.java,v
  retrieving revision 1.84
  retrieving revision 1.85
  diff -u -r1.84 -r1.85
  --- DefaultEmbeddor.java	9 Jun 2002 03:34:46 -0000	1.84
  +++ DefaultEmbeddor.java	9 Jun 2002 03:58:35 -0000	1.85
  @@ -64,7 +64,7 @@
    * Instantiate this to embed inside other applications.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.84 $ $Date: 2002/06/09 03:34:46 $
  + * @version $Revision: 1.85 $ $Date: 2002/06/09 03:58:35 $
    */
   public class DefaultEmbeddor
       extends AbstractLogEnabled
  @@ -105,8 +105,8 @@
       /**
        * Builds a project.
        */
  -    public Project createProject( final ProjectDescriptor project,
  -                                  final Parameters parameters )
  +    public Project createProject( final ProjectDescriptor project
  +                                  )
           throws Exception
       {
           return m_projectBuilder.build( project );
  
  
  
  1.77      +2 -2      jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java
  
  Index: DefaultWorkspace.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/workspace/DefaultWorkspace.java,v
  retrieving revision 1.76
  retrieving revision 1.77
  diff -u -r1.76 -r1.77
  --- DefaultWorkspace.java	8 Jun 2002 23:56:04 -0000	1.76
  +++ DefaultWorkspace.java	9 Jun 2002 03:58:35 -0000	1.77
  @@ -37,7 +37,7 @@
    * This is the default implementation of Workspace.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.76 $ $Date: 2002/06/08 23:56:04 $
  + * @version $Revision: 1.77 $ $Date: 2002/06/09 03:58:35 $
    * @todo Merge m_entries and m_projects
    */
   public class DefaultWorkspace
  @@ -202,7 +202,7 @@
           {
               final ServiceManager serviceManager = m_frame.getServiceManager();
               final Embeddor embeddor = (Embeddor)serviceManager.lookup( Embeddor.ROLE );
  -            return embeddor.createProject( project, null );
  +            return embeddor.createProject( project );
           }
           catch( final Exception e )
           {
  
  
  
  1.18      +2 -2      jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/EmbeddedAnt.java
  
  Index: EmbeddedAnt.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/EmbeddedAnt.java,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- EmbeddedAnt.java	8 Jun 2002 23:56:04 -0000	1.17
  +++ EmbeddedAnt.java	9 Jun 2002 03:58:35 -0000	1.18
  @@ -39,7 +39,7 @@
    *
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.17 $ $Date: 2002/06/08 23:56:04 $
  + * @version $Revision: 1.18 $ $Date: 2002/06/09 03:58:35 $
    */
   public class EmbeddedAnt
       extends AbstractLogEnabled
  @@ -334,7 +334,7 @@
               final ProjectDescriptor descriptor =
                   new ProjectDescriptor( uri, m_projectType );
               m_project =
  -                embeddor.createProject( descriptor, null );
  +                embeddor.createProject( descriptor );
           }
           return m_project;
       }
  
  
  
  1.21      +2 -8      jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/embeddor/Embeddor.java
  
  Index: Embeddor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/interfaces/embeddor/Embeddor.java,v
  retrieving revision 1.20
  retrieving revision 1.21
  diff -u -r1.20 -r1.21
  --- Embeddor.java	8 Jun 2002 23:56:04 -0000	1.20
  +++ Embeddor.java	9 Jun 2002 03:58:35 -0000	1.21
  @@ -8,7 +8,6 @@
   package org.apache.myrmidon.interfaces.embeddor;
   
   import java.util.Map;
  -import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.myrmidon.api.event.TaskListener;
   import org.apache.myrmidon.api.metadata.ModelElement;
   import org.apache.myrmidon.interfaces.executor.ExecutionFrame;
  @@ -19,7 +18,7 @@
    * Interface through which you embed Myrmidon into applications.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.20 $ $Date: 2002/06/08 23:56:04 $
  + * @version $Revision: 1.21 $ $Date: 2002/06/09 03:58:35 $
    */
   public interface Embeddor
   {
  @@ -30,15 +29,10 @@
        * Creates a project from a project file.
        *
        * @param project The descriptor describing location and type of project
  -     * @param parameters The project builder parameters.
        * @return the created Project
        * @throws Exception If an error occurs creating the Project.
  -     *
  -     * @todo Should location be a URL or will it automatically assume file
  -     *       unless there is a protocol section like ftp:, file: etc
  -     * @todo parameters needs more thought put into it.
        */
  -    Project createProject( ProjectDescriptor project, Parameters parameters )
  +    Project createProject( ProjectDescriptor project )
           throws Exception;
   
       /**
  
  
  
  1.24      +3 -3      jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/embeddor/test/DefaultEmbeddorTest.java
  
  Index: DefaultEmbeddorTest.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/test/org/apache/myrmidon/components/embeddor/test/DefaultEmbeddorTest.java,v
  retrieving revision 1.23
  retrieving revision 1.24
  diff -u -r1.23 -r1.24
  --- DefaultEmbeddorTest.java	8 Jun 2002 23:56:05 -0000	1.23
  +++ DefaultEmbeddorTest.java	9 Jun 2002 03:58:35 -0000	1.24
  @@ -26,7 +26,7 @@
    * Test cases for the default embeddor.
    *
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
  - * @version $Revision: 1.23 $ $Date: 2002/06/08 23:56:05 $
  + * @version $Revision: 1.24 $ $Date: 2002/06/09 03:58:35 $
    */
   public class DefaultEmbeddorTest
       extends AbstractContainerTestCase
  @@ -84,7 +84,7 @@
           final File projectFile = getTestResource( "project-builder.ant" );
           final String uri = projectFile.toURL().toExternalForm();
           final ProjectDescriptor descriptor = new ProjectDescriptor( uri );
  -        final Project project = getEmbeddor().createProject( descriptor, null );
  +        final Project project = getEmbeddor().createProject( descriptor );
   
           // Verify the project.
           assertEquals( "test-project", project.getMetaData().getName() );
  @@ -125,7 +125,7 @@
   
           final String uri = projectFile.toURL().toExternalForm();
           final ProjectDescriptor descriptor = new ProjectDescriptor( uri );
  -        final Project project = embeddor.createProject( descriptor, null );
  +        final Project project = embeddor.createProject( descriptor );
   
           // Build the workspace
           final ExecutionFrame frame = embeddor.createExecutionFrame( new HashMap() );
  
  
  
  1.12      +2 -2      jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/ExecuteTarget.java
  
  Index: ExecuteTarget.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/framework/src/java/org/apache/myrmidon/framework/ExecuteTarget.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- ExecuteTarget.java	8 Jun 2002 23:56:05 -0000	1.11
  +++ ExecuteTarget.java	9 Jun 2002 03:58:35 -0000	1.12
  @@ -26,7 +26,7 @@
    * @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.11 $ $Date: 2002/06/08 23:56:05 $
  + * @version $Revision: 1.12 $ $Date: 2002/06/09 03:58:35 $
    */
   public class ExecuteTarget
   {
  @@ -151,7 +151,7 @@
               final String uri = m_projectFile.toURL().toExternalForm();
               final ProjectDescriptor descriptor =
                   new ProjectDescriptor( uri, m_projectType );
  -            return embeddor.createProject( descriptor, null );
  +            return embeddor.createProject( descriptor );
           }
           catch( final Exception e )
           {
  
  
  

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