ant-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From adammurd...@apache.org
Subject cvs commit: jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/workspace DefaultWorkspace.java
Date Thu, 23 May 2002 09:18:11 GMT
adammurdoch    02/05/23 02:18:10

  Modified:    container/src/java/org/apache/myrmidon/components/configurer
                        DefaultConfigurer.java
               container/src/java/org/apache/myrmidon/components/workspace
                        DefaultWorkspace.java
  Log:
  Make DefaultConfigurer a scoped service.
  
  Revision  Changes    Path
  1.51      +11 -3     jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java
  
  Index: DefaultConfigurer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/configurer/DefaultConfigurer.java,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- DefaultConfigurer.java	23 May 2002 01:50:25 -0000	1.50
  +++ DefaultConfigurer.java	23 May 2002 09:18:09 -0000	1.51
  @@ -14,7 +14,6 @@
   import org.apache.avalon.excalibur.i18n.ResourceManager;
   import org.apache.avalon.excalibur.i18n.Resources;
   import org.apache.avalon.framework.logger.AbstractLogEnabled;
  -import org.apache.avalon.framework.logger.LogEnabled;
   import org.apache.avalon.framework.service.ServiceException;
   import org.apache.avalon.framework.service.ServiceManager;
   import org.apache.avalon.framework.service.Serviceable;
  @@ -25,6 +24,7 @@
   import org.apache.myrmidon.interfaces.configurer.Configurer;
   import org.apache.myrmidon.interfaces.role.RoleInfo;
   import org.apache.myrmidon.interfaces.role.RoleManager;
  +import org.apache.myrmidon.interfaces.service.ScopedService;
   import org.apache.myrmidon.interfaces.type.TypeFactory;
   import org.apache.myrmidon.interfaces.type.TypeManager;
   
  @@ -32,12 +32,12 @@
    * Class used to configure tasks.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.50 $ $Date: 2002/05/23 01:50:25 $
  + * @version $Revision: 1.51 $ $Date: 2002/05/23 09:18:09 $
    * @ant.type type="configurer" name="default"
    */
   public class DefaultConfigurer
       extends AbstractLogEnabled
  -    implements Configurer, Serviceable, LogEnabled
  +    implements Configurer, ScopedService, Serviceable
   {
       private static final Resources REZ =
           ResourceManager.getPackageResources( DefaultConfigurer.class );
  @@ -61,6 +61,14 @@
           m_converter = (Converter)serviceManager.lookup( Converter.ROLE );
           m_typeManager = (TypeManager)serviceManager.lookup( TypeManager.ROLE );
           m_roleManager = (RoleManager)serviceManager.lookup( RoleManager.ROLE );
  +    }
  +
  +    /**
  +     * Creates an uninitialised child of this service.
  +     */
  +    public Object createChildService() throws Exception
  +    {
  +        return new DefaultConfigurer();
       }
   
       /**
  
  
  
  1.71      +3 -1      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.70
  retrieving revision 1.71
  diff -u -r1.70 -r1.71
  --- DefaultWorkspace.java	23 May 2002 04:59:36 -0000	1.70
  +++ DefaultWorkspace.java	23 May 2002 09:18:10 -0000	1.71
  @@ -29,12 +29,13 @@
   import org.apache.myrmidon.interfaces.service.ScopedService;
   import org.apache.myrmidon.interfaces.type.TypeManager;
   import org.apache.myrmidon.interfaces.workspace.Workspace;
  +import org.apache.myrmidon.interfaces.configurer.Configurer;
   
   /**
    * This is the default implementation of Workspace.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.70 $ $Date: 2002/05/23 04:59:36 $
  + * @version $Revision: 1.71 $ $Date: 2002/05/23 09:18:10 $
    * @todo Merge m_entries and m_projects
    */
   public class DefaultWorkspace
  @@ -128,6 +129,7 @@
           final Map scopedServices = new HashMap();
           addChildService( TypeManager.ROLE, serviceManager, scopedServices );
           addChildService( Deployer.ROLE, serviceManager, scopedServices );
  +        addChildService( Configurer.ROLE, serviceManager, scopedServices );
           setupServices( scopedServices.values(), serviceManager );
   
           // TODO - Add child role manager and configurer
  
  
  

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