Return-Path: 
 <ant-dev-return-30698-qmlist-jakarta-archive-ant-dev=jakarta.apache.org@jakarta.apache.org>
Delivered-To: apmail-jakarta-ant-dev-archive@apache.org
Received: (qmail 13062 invoked from network); 21 Apr 2002 01:57:59 -0000
Received: from unknown (HELO nagoya.betaversion.org) (192.18.49.131)
  by daedalus.apache.org with SMTP; 21 Apr 2002 01:57:59 -0000
Received: (qmail 17220 invoked by uid 97); 21 Apr 2002 01:57:56 -0000
Delivered-To: qmlist-jakarta-archive-ant-dev@jakarta.apache.org
Received: (qmail 17201 invoked by uid 97); 21 Apr 2002 01:57:55 -0000
Mailing-List: contact ant-dev-help@jakarta.apache.org; run by ezmlm
Precedence: bulk
List-Unsubscribe: <mailto:ant-dev-unsubscribe@jakarta.apache.org>
List-Subscribe: <mailto:ant-dev-subscribe@jakarta.apache.org>
List-Help: <mailto:ant-dev-help@jakarta.apache.org>
List-Post: <mailto:ant-dev@jakarta.apache.org>
List-Id: "Ant Developers List" <ant-dev.jakarta.apache.org>
Reply-To: "Ant Developers List" <ant-dev@jakarta.apache.org>
Delivered-To: mailing list ant-dev@jakarta.apache.org
Received: (qmail 17190 invoked by uid 97); 21 Apr 2002 01:57:55 -0000
Date: 21 Apr 2002 01:57:45 -0000
Message-ID: <20020421015745.18510.qmail@icarus.apache.org>
From: donaldp@apache.org
To: jakarta-ant-myrmidon-cvs@apache.org
Subject: cvs commit:
 jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/workspace
 DefaultWorkspace.java
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N
X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N

donaldp     02/04/20 18:57:45

  Modified:    container/src/java/org/apache/myrmidon/components/workspace
                        DefaultWorkspace.java
  Log:
  Configuration --> ModelElement
  
  Revision  Changes    Path
  1.42      +6 -5      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.41
  retrieving revision 1.42
  diff -u -r1.41 -r1.42
  --- DefaultWorkspace.java	9 Apr 2002 07:21:12 -0000	1.41
  +++ DefaultWorkspace.java	21 Apr 2002 01:57:45 -0000	1.42
  @@ -11,7 +11,6 @@
   import java.util.HashMap;
   import org.apache.avalon.excalibur.i18n.ResourceManager;
   import org.apache.avalon.excalibur.i18n.Resources;
  -import org.apache.avalon.framework.configuration.Configuration;
   import org.apache.avalon.framework.context.Context;
   import org.apache.avalon.framework.context.ContextException;
   import org.apache.avalon.framework.context.Contextualizable;
  @@ -21,6 +20,7 @@
   import org.apache.avalon.framework.service.ServiceManager;
   import org.apache.myrmidon.api.TaskContext;
   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.deployer.DeploymentException;
   import org.apache.myrmidon.interfaces.deployer.TypeDeployer;
  @@ -40,7 +40,7 @@
    * This is the default implementation of Workspace.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.41 $ $Date: 2002/04/09 07:21:12 $
  + * @version $Revision: 1.42 $ $Date: 2002/04/21 01:57:45 $
    */
   public class DefaultWorkspace
       extends AbstractLogEnabled
  @@ -219,7 +219,7 @@
               new RoutingLogger( getLogger(), m_listenerSupport );
   
           // Properties
  -        final PropertyStore store = m_baseStore.createChildStore("");
  +        final PropertyStore store = m_baseStore.createChildStore( "" );
           store.setProperty( TaskContext.BASE_DIRECTORY, project.getBaseDirectory() );
   
           final DefaultExecutionFrame frame =
  @@ -393,7 +393,7 @@
           //frame.getContext().setProperty( Project.TARGET, target );
   
           // Execute all tasks assciated with target
  -        final Configuration[] tasks = target.getTasks();
  +        final ModelElement[] tasks = target.getTasks();
           for( int i = 0; i < tasks.length; i++ )
           {
               executeTask( tasks[ i ], entry.getFrame() );
  @@ -410,7 +410,8 @@
        * @param frame the frame to execute in
        * @exception TaskException if an error occurs
        */
  -    private void executeTask( final Configuration task, final ExecutionFrame frame )
  +    private void executeTask( final ModelElement task,
  +                              final ExecutionFrame frame )
           throws TaskException
       {
           final String name = task.getName();
  
  
  

--
To unsubscribe, e-mail:   <mailto:ant-dev-unsubscribe@jakarta.apache.org>
For additional commands, e-mail: <mailto:ant-dev-help@jakarta.apache.org>