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/interfaces EmbeddedAnt.java
Date Tue, 21 May 2002 05:21:46 GMT
donaldp     02/05/20 22:21:46

  Modified:    container/src/java/org/apache/myrmidon/interfaces
                        EmbeddedAnt.java
  Log:
  Reuse the containerUtil to process lifecycle stuff
  
  Revision  Changes    Path
  1.8       +3 -9      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.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- EmbeddedAnt.java	18 May 2002 04:07:44 -0000	1.7
  +++ EmbeddedAnt.java	21 May 2002 05:21:46 -0000	1.8
  @@ -23,6 +23,7 @@
   import org.apache.avalon.framework.context.DefaultContext;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
   import org.apache.avalon.framework.parameters.Parameters;
  +import org.apache.avalon.framework.container.ContainerUtil;
   import org.apache.myrmidon.api.TaskException;
   import org.apache.myrmidon.api.event.TaskListener;
   import org.apache.myrmidon.interfaces.embeddor.Embeddor;
  @@ -40,7 +41,7 @@
    *
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.7 $ $Date: 2002/05/18 04:07:44 $
  + * @version $Revision: 1.8 $ $Date: 2002/05/21 05:21:46 $
    */
   public class EmbeddedAnt
       extends AbstractLogEnabled
  @@ -205,14 +206,7 @@
           {
               if( m_embeddor != null )
               {
  -                if( m_embeddor instanceof Startable )
  -                {
  -                    ( (Startable)m_embeddor ).stop();
  -                }
  -                if( m_embeddor instanceof Disposable )
  -                {
  -                    ( (Disposable)m_embeddor ).dispose();
  -                }
  +                ContainerUtil.shutdown( m_embeddor );
               }
           }
           finally
  
  
  

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