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/container/src/java/org/apache/myrmidon/components/embeddor DefaultEmbeddor.java
Date Tue, 21 May 2002 05:52:34 GMT
donaldp     02/05/20 22:52:34

  Modified:    container/src/java/org/apache/myrmidon/components/workspace
                        DefaultWorkspace.java
               container/src/java/org/apache/myrmidon/components/embeddor
                        DefaultEmbeddor.java
  Removed:     container/src/java/org/apache/myrmidon/interfaces/executor
                        ExecutionContainer.java
  Log:
  Remove ExecutionContainer as it never ended up getting used anywhere
  
  Revision  Changes    Path
  1.65      +2 -11     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.64
  retrieving revision 1.65
  diff -u -r1.64 -r1.65
  --- DefaultWorkspace.java	21 May 2002 05:49:48 -0000	1.64
  +++ DefaultWorkspace.java	21 May 2002 05:52:34 -0000	1.65
  @@ -16,7 +16,6 @@
   import org.apache.myrmidon.api.TaskException;
   import org.apache.myrmidon.api.metadata.ModelElement;
   import org.apache.myrmidon.interfaces.deployer.Deployer;
  -import org.apache.myrmidon.interfaces.executor.ExecutionContainer;
   import org.apache.myrmidon.interfaces.executor.ExecutionFrame;
   import org.apache.myrmidon.interfaces.executor.Executor;
   import org.apache.myrmidon.interfaces.oldmodel.Dependency;
  @@ -29,11 +28,11 @@
    * This is the default implementation of Workspace.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.64 $ $Date: 2002/05/21 05:49:48 $
  + * @version $Revision: 1.65 $ $Date: 2002/05/21 05:52:34 $
    */
   public class DefaultWorkspace
       extends AbstractLogEnabled
  -    implements Workspace, ExecutionContainer
  +    implements Workspace
   {
       private static final Resources REZ =
           ResourceManager.getPackageResources( DefaultWorkspace.class );
  @@ -45,14 +44,6 @@
   
       /** A map from Project object -> ProjectEntry for that project. */
       private HashMap m_entries = new HashMap();
  -
  -    /**
  -     * Sets the root execution frame.
  -     */
  -    public void setRootExecutionFrame( final ExecutionFrame frame )
  -        throws Exception
  -    {
  -    }
   
       /**
        * Execute a target in a particular project.
  
  
  
  1.71      +1 -19     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.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- DefaultEmbeddor.java	21 May 2002 05:18:38 -0000	1.70
  +++ DefaultEmbeddor.java	21 May 2002 05:52:34 -0000	1.71
  @@ -41,7 +41,6 @@
   import org.apache.myrmidon.interfaces.embeddor.Embeddor;
   import org.apache.myrmidon.interfaces.event.TaskEventManager;
   import org.apache.myrmidon.interfaces.executor.DefaultExecutionFrame;
  -import org.apache.myrmidon.interfaces.executor.ExecutionContainer;
   import org.apache.myrmidon.interfaces.executor.ExecutionFrame;
   import org.apache.myrmidon.interfaces.executor.Executor;
   import org.apache.myrmidon.interfaces.extensions.ExtensionManager;
  @@ -63,7 +62,7 @@
    * Instantiate this to embed inside other applications.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.70 $ $Date: 2002/05/21 05:18:38 $
  + * @version $Revision: 1.71 $ $Date: 2002/05/21 05:52:34 $
    */
   public class DefaultEmbeddor
       extends AbstractLogEnabled
  @@ -168,23 +167,6 @@
               (Workspace)createService( Workspace.class, PREFIX + "workspace.DefaultWorkspace"
);
           setupObject( workspace, m_workspaceServiceManager, null );
   
  -        // Create the property store
  -        final PropertyStore propStore = createBaseStore( properties );
  -
  -        // Create an execution frame, and attach it to the workspace
  -        final TaskEventManager eventManager =
  -            (TaskEventManager)m_workspaceServiceManager.lookup( TaskEventManager.ROLE );
  -
  -        final ExecutionFrame frame =
  -            new DefaultExecutionFrame( "",
  -                                       new File( "." ),
  -                                       getLogger(),
  -                                       propStore,
  -                                       m_workspaceServiceManager,
  -                                       eventManager );
  -        ( (ExecutionContainer)workspace ).setRootExecutionFrame( frame );
  -
  -        // TODO - should keep track of workspaces, to dispose them later
           return workspace;
       }
   
  
  
  

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