Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
Reply-To: ant-dev@jakarta.apache.org
Date: 29 Jun 2001 08:01:38 -0000
Message-ID: <20010629080138.89337.qmail@apache.org>
From: donaldp@apache.org
To: jakarta-ant-cvs@apache.org
Subject: cvs commit:
 jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/frontends
 CLIMain.java

donaldp     01/06/29 01:01:38

  Modified:    proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor
                        DefaultEmbeddor.java Embeddor.java
               proposal/myrmidon/src/java/org/apache/myrmidon/components/executor
                        DefaultExecutionFrame.java
               proposal/myrmidon/src/java/org/apache/myrmidon/frontends
                        CLIMain.java
  Removed:     proposal/myrmidon/src/java/org/apache/myrmidon/components/manager
                        DefaultProjectManager.java
                        LogTargetToListenerAdapter.java ProjectEntry.java
                        ProjectListenerSupport.java ProjectManager.java
  Log:
  Continue migration of ProjectManager to Workspace
  
  Revision  Changes    Path
  1.8       +10 -10    jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/DefaultEmbeddor.java
  
  Index: DefaultEmbeddor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/DefaultEmbeddor.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- DefaultEmbeddor.java	2001/06/27 00:50:04	1.7
  +++ DefaultEmbeddor.java	2001/06/29 08:01:33	1.8
  @@ -27,12 +27,12 @@
   import org.apache.myrmidon.components.converter.MasterConverter;
   import org.apache.myrmidon.components.deployer.Deployer;
   import org.apache.myrmidon.components.deployer.DeploymentException;
  -import org.apache.myrmidon.components.role.RoleManager;
   import org.apache.myrmidon.components.executor.Executor;
  -import org.apache.myrmidon.components.manager.ProjectManager;
  +import org.apache.myrmidon.components.workspace.Workspace;
  +import org.apache.myrmidon.components.model.Project;
  +import org.apache.myrmidon.components.role.RoleManager;
   import org.apache.myrmidon.components.type.TypeFactory;
   import org.apache.myrmidon.components.type.TypeManager;
  -import org.apache.myrmidon.components.model.Project;
   
   /**
    * Default implementation of Embeddor.
  @@ -122,13 +122,13 @@
           return builder;
       }
   
  -    public ProjectManager createProjectManager( final Project project, 
  -                                                final Parameters parameters )
  +    public Workspace createWorkspace( final Project project, 
  +                                      final Parameters parameters )
           throws Exception
       {
  -        final String component = getParameter( ProjectManager.ROLE );
  -        final ProjectManager projectManager = 
  -            (ProjectManager)createComponent( component, ProjectManager.class );
  +        final String component = getParameter( Workspace.ROLE );
  +        final Workspace projectManager = 
  +            (Workspace)createComponent( component, Workspace.class );
   
           setupLogger( projectManager );
   
  @@ -240,8 +240,8 @@
                                  //"org.apache.myrmidon.components.executor.DefaultExecutor" );
                                  //"org.apache.myrmidon.components.executor.PrintingExecutor" );
                                  "org.apache.myrmidon.components.executor.AspectAwareExecutor" );
  -        defaults.setParameter( ProjectManager.ROLE,
  -                               "org.apache.myrmidon.components.manager.DefaultProjectManager" );
  +        defaults.setParameter( Workspace.ROLE,
  +                               "org.apache.myrmidon.components.workspace.DefaultWorkspace" );
           defaults.setParameter( Deployer.ROLE,
                                  "org.apache.myrmidon.components.deployer.DefaultDeployer" );
           defaults.setParameter( Configurer.ROLE,
  
  
  
  1.7       +4 -4      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/Embeddor.java
  
  Index: Embeddor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/embeddor/Embeddor.java,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- Embeddor.java	2001/06/12 13:54:04	1.6
  +++ Embeddor.java	2001/06/29 08:01:33	1.7
  @@ -15,7 +15,7 @@
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.avalon.framework.parameters.Parameterizable;
   import org.apache.myrmidon.components.model.Project;
  -import org.apache.myrmidon.components.manager.ProjectManager;
  +import org.apache.myrmidon.components.workspace.Workspace;
   
   /**
    * Interface through which you embed Myrmidon into applications.
  @@ -36,12 +36,12 @@
           throws Exception;
   
       /**
  -     * Create a ProjectManager for a particular project.
  +     * Create a Workspace for a particular project.
        *
        * @param project the root project
        * @param defines the defines in project
  -     * @return the ProjectManager
  +     * @return the Workspace
        */
  -    ProjectManager createProjectManager( Project project, Parameters parameters )
  +    Workspace createWorkspace( Project project, Parameters parameters )
           throws Exception;
   }
  
  
  
  1.4       +0 -1      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutionFrame.java
  
  Index: DefaultExecutionFrame.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/components/executor/DefaultExecutionFrame.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultExecutionFrame.java	2001/06/17 10:35:38	1.3
  +++ DefaultExecutionFrame.java	2001/06/29 08:01:34	1.4
  @@ -23,7 +23,6 @@
   import org.apache.myrmidon.components.converter.MasterConverter;
   import org.apache.myrmidon.components.deployer.Deployer;
   import org.apache.myrmidon.components.executor.Executor;
  -import org.apache.myrmidon.components.manager.ProjectManager;
   import org.apache.myrmidon.components.role.RoleManager;
   import org.apache.myrmidon.components.type.TypeManager;
   
  
  
  
  1.6       +8 -9      jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/CLIMain.java
  
  Index: CLIMain.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant/proposal/myrmidon/src/java/org/apache/myrmidon/frontends/CLIMain.java,v
  retrieving revision 1.5
  retrieving revision 1.6
  diff -u -r1.5 -r1.6
  --- CLIMain.java	2001/06/27 00:50:09	1.5
  +++ CLIMain.java	2001/06/29 08:01:38	1.6
  @@ -40,8 +40,8 @@
   import org.apache.myrmidon.components.executor.Executor;
   import org.apache.myrmidon.components.embeddor.Embeddor;
   import org.apache.myrmidon.components.embeddor.DefaultEmbeddor;
  -import org.apache.myrmidon.components.manager.LogTargetToListenerAdapter;
  -import org.apache.myrmidon.components.manager.ProjectManager;
  +import org.apache.myrmidon.components.workspace.LogTargetToListenerAdapter;
  +import org.apache.myrmidon.components.workspace.Workspace;
   import org.apache.myrmidon.components.model.Project;
   import org.apache.myrmidon.listeners.ProjectListener;
   
  @@ -353,11 +353,10 @@
           while( true )
           {
               //actually do the build ...
  -            final ProjectManager manager = 
  -                embeddor.createProjectManager( project, m_defines );
  -            manager.addProjectListener( listener );
  +            final Workspace workspace = embeddor.createWorkspace( project, m_defines );
  +            workspace.addProjectListener( listener );
   
  -            doBuild( manager, project, m_targets );
  +            doBuild( workspace, project, m_targets );
   
               if( !incremental ) break;
   
  @@ -385,7 +384,7 @@
        * @param project the project
        * @param targets the targets to build as passed by CLI
        */
  -    private void doBuild( final ProjectManager manager,
  +    private void doBuild( final Workspace workspace,
                             final Project project,
                             final ArrayList targets )
       {
  @@ -396,13 +395,13 @@
               //if we didn't specify a target on CLI then choose default
               if( 0 == targetCount )
               {
  -                manager.executeProject( project, project.getDefaultTargetName() );
  +                workspace.executeProject( project, project.getDefaultTargetName() );
               }
               else
               {
                   for( int i = 0; i < targetCount; i++ )
                   {
  -                    manager.executeProject( project, (String)targets.get( i ) );
  +                    workspace.executeProject( project, (String)targets.get( i ) );
                   }
               }
           }