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, 23 Apr 2002 07:40:10 GMT
donaldp     02/04/23 00:40:10

  Modified:    container/src/java/org/apache/myrmidon/components/embeddor
                        DefaultEmbeddor.java
  Log:
  Rework to add TaskEventManagers to the frame
  
  Revision  Changes    Path
  1.47      +19 -14    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.46
  retrieving revision 1.47
  diff -u -r1.46 -r1.47
  --- DefaultEmbeddor.java	17 Apr 2002 07:16:20 -0000	1.46
  +++ DefaultEmbeddor.java	23 Apr 2002 07:40:10 -0000	1.47
  @@ -19,18 +19,23 @@
   import org.apache.avalon.excalibur.io.ExtensionFileFilter;
   import org.apache.avalon.excalibur.io.FileUtil;
   import org.apache.avalon.framework.CascadingException;
  -import org.apache.avalon.framework.context.Contextualizable;
  -import org.apache.avalon.framework.context.Context;
  -import org.apache.avalon.framework.context.ContextException;
   import org.apache.avalon.framework.activity.Disposable;
   import org.apache.avalon.framework.activity.Initializable;
   import org.apache.avalon.framework.activity.Startable;
  +import org.apache.avalon.framework.context.Context;
  +import org.apache.avalon.framework.context.ContextException;
  +import org.apache.avalon.framework.context.Contextualizable;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.framework.parameters.Parameterizable;
   import org.apache.avalon.framework.parameters.Parameters;
   import org.apache.avalon.framework.service.DefaultServiceManager;
   import org.apache.avalon.framework.service.ServiceManager;
   import org.apache.avalon.framework.service.Serviceable;
  +import org.apache.myrmidon.Constants;
  +import org.apache.myrmidon.api.TaskContext;
  +import org.apache.myrmidon.components.event.DefaultTaskEventManager;
  +import org.apache.myrmidon.components.store.DefaultPropertyStore;
  +import org.apache.myrmidon.components.workspace.DefaultExecutionFrame;
   import org.apache.myrmidon.interfaces.aspect.AspectManager;
   import org.apache.myrmidon.interfaces.builder.ProjectBuilder;
   import org.apache.myrmidon.interfaces.classloader.ClassLoaderManager;
  @@ -40,9 +45,10 @@
   import org.apache.myrmidon.interfaces.deployer.DeploymentException;
   import org.apache.myrmidon.interfaces.deployer.TypeDeployer;
   import org.apache.myrmidon.interfaces.embeddor.Embeddor;
  -import org.apache.myrmidon.interfaces.executor.Executor;
  -import org.apache.myrmidon.interfaces.executor.ExecutionFrame;
  +import org.apache.myrmidon.interfaces.event.TaskEventManager;
   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;
   import org.apache.myrmidon.interfaces.model.Project;
   import org.apache.myrmidon.interfaces.property.PropertyResolver;
  @@ -53,17 +59,13 @@
   import org.apache.myrmidon.interfaces.type.TypeManager;
   import org.apache.myrmidon.interfaces.workspace.Workspace;
   import org.apache.myrmidon.listeners.ProjectListener;
  -import org.apache.myrmidon.components.workspace.DefaultExecutionFrame;
  -import org.apache.myrmidon.components.store.DefaultPropertyStore;
  -import org.apache.myrmidon.api.TaskContext;
  -import org.apache.myrmidon.Constants;
   
   /**
    * Default implementation of Embeddor.
    * Instantiate this to embed inside other applications.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.46 $ $Date: 2002/04/17 07:16:20 $
  + * @version $Revision: 1.47 $ $Date: 2002/04/23 07:40:10 $
    */
   public class DefaultEmbeddor
       extends AbstractLogEnabled
  @@ -146,10 +148,13 @@
           final PropertyStore propStore = createBaseStore( properties );
   
           // Create an execution frame, and attach it to the workspace
  +        final TaskEventManager eventManager = new DefaultTaskEventManager();
           final ExecutionFrame frame =
  -            new DefaultExecutionFrame( getLogger(),
  +            new DefaultExecutionFrame( "/",
  +                                       getLogger(),
                                          propStore,
  -                                       m_workspaceServiceManager);
  +                                       m_workspaceServiceManager,
  +                                       eventManager );
           ( (ExecutionContainer)workspace ).setRootExecutionFrame( frame );
   
           // TODO - should keep track of workspaces, to dispose them later
  @@ -344,7 +349,7 @@
       {
           setupLogger( object );
   
  -        if(object instanceof Contextualizable )
  +        if( object instanceof Contextualizable )
           {
               ( (Contextualizable)object ).contextualize( m_context );
   
  @@ -375,7 +380,7 @@
       {
           for( int i = 0; i < directories.length; i++ )
           {
  -            File directory = directories[i ];
  +            File directory = directories[ i ];
               final File[] files = directory.listFiles( filter );
   
               if( null != files )
  
  
  

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