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/service DefaultAntServiceKernel.java
Date Thu, 27 Jun 2002 05:13:35 GMT
donaldp     2002/06/26 22:13:35

  Modified:    container/src/java/org/apache/myrmidon/components/builder
                        DefaultProjectBuilder.java
               container/src/java/org/apache/myrmidon/components/configurer
                        ClassicConfigurer.java DefaultConfigurer.java
               container/src/java/org/apache/myrmidon/components/context
                        DefaultTaskContextManager.java
               container/src/java/org/apache/myrmidon/components/converter
                        DefaultMasterConverter.java
               container/src/java/org/apache/myrmidon/components/deployer
                        DefaultDeployer.java
               container/src/java/org/apache/myrmidon/components/event
                        DefaultTaskEventManager.java
               container/src/java/org/apache/myrmidon/components/executor
                        DefaultExecutor.java PrintingExecutor.java
               container/src/java/org/apache/myrmidon/components/extensions
                        DefaultExtensionManager.java
               container/src/java/org/apache/myrmidon/components/library
                        DefaultLibraryManager.java
               container/src/java/org/apache/myrmidon/components/property
                        DefaultNameValidator.java
                        DefaultPropertyResolver.java
                        DefaultPropertyStore.java
                        XPathPropertyResolver.java
               container/src/java/org/apache/myrmidon/components/service
                        DefaultAntServiceKernel.java
  Log:
  Decorate the services with XDoclet tags that will be transmogofied into descriptors overtime.
  
  Revision  Changes    Path
  1.82      +7 -1      jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java
  
  Index: DefaultProjectBuilder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/builder/DefaultProjectBuilder.java,v
  retrieving revision 1.81
  retrieving revision 1.82
  diff -u -r1.81 -r1.82
  --- DefaultProjectBuilder.java	13 Jun 2002 03:52:32 -0000	1.81
  +++ DefaultProjectBuilder.java	27 Jun 2002 05:13:34 -0000	1.82
  @@ -39,6 +39,8 @@
    * @version $Revision$ $Date$
    *
    * @ant.type type="project-builder" name="ant2"
  + * @avalon.component name="default"
  + * @avalon.service interface="ProjectBuilder"
    */
   public class DefaultProjectBuilder
       extends AbstractLogEnabled
  @@ -58,6 +60,10 @@
       private NameValidator m_nameValidator;
       private ModelBuilder m_modelBuilder;
   
  +    /**
  +     * @avalon.dependency interface="ModelBuilder"
  +     * @avalon.dependency interface="NameValidatorManager"
  +     */
       public void service( final ServiceManager manager )
           throws ServiceException
       {
  
  
  
  1.16      +2 -0      jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/configurer/ClassicConfigurer.java
  
  Index: ClassicConfigurer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/configurer/ClassicConfigurer.java,v
  retrieving revision 1.15
  retrieving revision 1.16
  diff -u -r1.15 -r1.16
  --- ClassicConfigurer.java	9 Jun 2002 13:20:46 -0000	1.15
  +++ ClassicConfigurer.java	27 Jun 2002 05:13:34 -0000	1.16
  @@ -31,6 +31,8 @@
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
    * @ant.type type="configurer" name="classic"
  + * @avalon.component name="classic"
  + * @avalon.service interface="Configurer"
    */
   public class ClassicConfigurer
       extends AbstractLogEnabled
  
  
  
  1.59      +3 -1      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.58
  retrieving revision 1.59
  diff -u -r1.58 -r1.59
  --- DefaultConfigurer.java	25 Jun 2002 07:32:11 -0000	1.58
  +++ DefaultConfigurer.java	27 Jun 2002 05:13:34 -0000	1.59
  @@ -30,6 +30,8 @@
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
    * @version $Revision$ $Date$
    * @ant.type type="configurer" name="default"
  + * @avalon.component name="default"
  + * @avalon.service interface="Configurer"
    */
   public class DefaultConfigurer
       extends AbstractLogEnabled
  
  
  
  1.2       +3 -1      jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/context/DefaultTaskContextManager.java
  
  Index: DefaultTaskContextManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/context/DefaultTaskContextManager.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultTaskContextManager.java	21 Jun 2002 08:05:58 -0000	1.1
  +++ DefaultTaskContextManager.java	27 Jun 2002 05:13:34 -0000	1.2
  @@ -16,6 +16,8 @@
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
    * @version $Revision$ $Date$
  + * @avalon.component name="default"
  + * @avalon.service interface="TaskContextManager"
    */
   public class DefaultTaskContextManager
       implements TaskContextManager
  
  
  
  1.32      +6 -2      jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/converter/DefaultMasterConverter.java
  
  Index: DefaultMasterConverter.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/converter/DefaultMasterConverter.java,v
  retrieving revision 1.31
  retrieving revision 1.32
  diff -u -r1.31 -r1.32
  --- DefaultMasterConverter.java	9 Jun 2002 13:14:15 -0000	1.31
  +++ DefaultMasterConverter.java	27 Jun 2002 05:13:34 -0000	1.32
  @@ -8,6 +8,7 @@
   package org.apache.myrmidon.components.converter;
   
   import org.apache.excalibur.converter.AbstractMasterConverter;
  +import org.apache.excalibur.converter.Converter;
   import org.apache.excalibur.converter.ConverterFactory;
   import org.apache.myrmidon.interfaces.converter.ConverterRegistry;
   
  @@ -16,10 +17,13 @@
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
    * @version $Revision$ $Date$
  + * @avalon.component name="default"
  + * @avalon.service interface="ConverterRegistry"
  + * @avalon.service interface="Converter"
    */
   public class DefaultMasterConverter
       extends AbstractMasterConverter
  -    implements ConverterRegistry
  +    implements ConverterRegistry, Converter
   {
       /**
        * Registers a converter.
  
  
  
  1.53      +5 -5      jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java
  
  Index: DefaultDeployer.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/deployer/DefaultDeployer.java,v
  retrieving revision 1.52
  retrieving revision 1.53
  diff -u -r1.52 -r1.53
  --- DefaultDeployer.java	25 Jun 2002 07:34:02 -0000	1.52
  +++ DefaultDeployer.java	27 Jun 2002 05:13:34 -0000	1.53
  @@ -31,6 +31,8 @@
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
    * @version $Revision$ $Date$
  + * @avalon.component name="default"
  + * @avalon.service interface="Deployer"
    */
   public class DefaultDeployer
       extends AbstractLogEnabled
  @@ -44,10 +46,8 @@
       private CompoundTypeDeployer m_typeDeployer;
   
       /**
  -     * Retrieve relevent services needed to deploy.
  -     *
  -     * @param serviceManager the ServiceManager
  -     * @throws ServiceException if an error occurs
  +     * @avalon.dependency interface="RoleRegistry"
  +     * @avalon.dependency interface="RoleManager"
        */
       public void service( final ServiceManager serviceManager )
           throws ServiceException
  
  
  
  1.5       +3 -1      jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/event/DefaultTaskEventManager.java
  
  Index: DefaultTaskEventManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/event/DefaultTaskEventManager.java,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- DefaultTaskEventManager.java	8 Jun 2002 23:56:04 -0000	1.4
  +++ DefaultTaskEventManager.java	27 Jun 2002 05:13:34 -0000	1.5
  @@ -18,6 +18,8 @@
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
    * @version $Revision$ $Date$
  + * @avalon.component name="default"
  + * @avalon.service interface="TaskEventManager"
    */
   public class DefaultTaskEventManager
       implements TaskEventManager
  
  
  
  1.51      +3 -1      jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/executor/DefaultExecutor.java
  
  Index: DefaultExecutor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/executor/DefaultExecutor.java,v
  retrieving revision 1.50
  retrieving revision 1.51
  diff -u -r1.50 -r1.51
  --- DefaultExecutor.java	21 Jun 2002 08:09:54 -0000	1.50
  +++ DefaultExecutor.java	27 Jun 2002 05:13:34 -0000	1.51
  @@ -27,6 +27,8 @@
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
    * @version $Revision$ $Date$
  + * @avalon.component name="default"
  + * @avalon.service interface="Executor"
    */
   public class DefaultExecutor
       extends AbstractLogEnabled
  
  
  
  1.8       +3 -1      jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/executor/PrintingExecutor.java
  
  Index: PrintingExecutor.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/executor/PrintingExecutor.java,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- PrintingExecutor.java	25 Apr 2002 11:33:35 -0000	1.7
  +++ PrintingExecutor.java	27 Jun 2002 05:13:34 -0000	1.8
  @@ -16,6 +16,8 @@
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
    * @version $Revision$ $Date$
  + * @avalon.component name="printing"
  + * @avalon.service interface="Executor"
    */
   public class PrintingExecutor
       extends DefaultExecutor
  
  
  
  1.11      +3 -1      jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/extensions/DefaultExtensionManager.java
  
  Index: DefaultExtensionManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/extensions/DefaultExtensionManager.java,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- DefaultExtensionManager.java	10 May 2002 06:27:31 -0000	1.10
  +++ DefaultExtensionManager.java	27 Jun 2002 05:13:34 -0000	1.11
  @@ -33,6 +33,8 @@
    * @todo Allow search directories and individual extensions to be added at
    *       runtime (ie after initialize() has been called).
    * @todo Add more standard search locations e.g $HOME/.antrc/ext, etc
  + * @avalon.component name="default"
  + * @avalon.service interface="ExtensionManager"
    */
   public class DefaultExtensionManager
       extends AbstractLogEnabled
  
  
  
  1.10      +6 -1      jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/library/DefaultLibraryManager.java
  
  Index: DefaultLibraryManager.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/library/DefaultLibraryManager.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- DefaultLibraryManager.java	25 Jun 2002 07:13:28 -0000	1.9
  +++ DefaultLibraryManager.java	27 Jun 2002 05:13:34 -0000	1.10
  @@ -40,6 +40,8 @@
    *
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
    * @version $Revision$ $Date$
  + * @avalon.component name="default"
  + * @avalon.service interface="LibraryManager"
    */
   public class DefaultLibraryManager
       implements LibraryManager, Contextualizable, Serviceable, Initializable
  @@ -63,6 +65,9 @@
           m_rootClassLoader = (ClassLoader)context.get( "myrmidon.shared.classloader" );
       }
   
  +    /**
  +     * @avalon.dependency interface="ExtensionManager"
  +     */
       public void service( final ServiceManager serviceManager )
           throws ServiceException
       {
  
  
  
  1.4       +3 -1      jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/property/DefaultNameValidator.java
  
  Index: DefaultNameValidator.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/property/DefaultNameValidator.java,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- DefaultNameValidator.java	29 May 2002 06:42:26 -0000	1.3
  +++ DefaultNameValidator.java	27 Jun 2002 05:13:34 -0000	1.4
  @@ -17,6 +17,8 @@
    *
    * @author <a href="mailto:darrell@apache.org">Darrell DeBoer</a>
    * @version $Revision$ $Date$
  + * @avalon.component name="default"
  + * @avalon.service interface="NameValidator"
    */
   public class DefaultNameValidator
       implements NameValidator
  
  
  
  1.12      +9 -4      jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/property/DefaultPropertyResolver.java
  
  Index: DefaultPropertyResolver.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/property/DefaultPropertyResolver.java,v
  retrieving revision 1.11
  retrieving revision 1.12
  diff -u -r1.11 -r1.12
  --- DefaultPropertyResolver.java	25 Jun 2002 14:36:40 -0000	1.11
  +++ DefaultPropertyResolver.java	27 Jun 2002 05:13:34 -0000	1.12
  @@ -26,6 +26,8 @@
    * @version $Revision$ $Date$
    *
    * @ant.type type="property-resolver" name="default"
  + * @avalon.component name="default"
  + * @avalon.service interface="PropertyResolver"
    */
   public class DefaultPropertyResolver
       implements PropertyResolver, Serviceable
  @@ -35,6 +37,9 @@
   
       private Converter m_converter;
   
  +    /**
  +     * @avalon.dependency interface="Converter"
  +     */
       public void service( final ServiceManager serviceManager ) throws ServiceException
       {
           m_converter = (Converter)serviceManager.lookup( Converter.ROLE );
  @@ -72,7 +77,7 @@
           if( 0 == start && end == ( length - 1 ) )
           {
               return evaluateExpression( content.substring( start + 2, end ),
  -                                     context );
  +                                       context );
           }
   
           final StringBuffer sb = new StringBuffer( length * 2 );
  @@ -112,8 +117,8 @@
        * @return the reolved property
        * @throws TaskException if an error occurs
        */
  -    private Object recursiveResolveProperty( final String content,
  -                                             final TaskContext context )
  +    protected Object recursiveResolveProperty( final String content,
  +                                               final TaskContext context )
           throws TaskException
       {
           int start = findNextProperty( content, 0 );
  
  
  
  1.10      +2 -2      jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/property/DefaultPropertyStore.java
  
  Index: DefaultPropertyStore.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/property/DefaultPropertyStore.java,v
  retrieving revision 1.9
  retrieving revision 1.10
  diff -u -r1.9 -r1.10
  --- DefaultPropertyStore.java	25 Jun 2002 14:38:28 -0000	1.9
  +++ DefaultPropertyStore.java	27 Jun 2002 05:13:34 -0000	1.10
  @@ -31,7 +31,7 @@
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
    * @version $Revision$ $Date$
  - * @see org.apache.myrmidon.interfaces.property.PropertyStore
  + * @see PropertyStore
    */
   public class DefaultPropertyStore
       implements PropertyStore, Serviceable
  
  
  
  1.2       +13 -1     jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/property/XPathPropertyResolver.java
  
  Index: XPathPropertyResolver.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/property/XPathPropertyResolver.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XPathPropertyResolver.java	25 Jun 2002 14:36:40 -0000	1.1
  +++ XPathPropertyResolver.java	27 Jun 2002 05:13:34 -0000	1.2
  @@ -10,16 +10,28 @@
   import org.apache.commons.jxpath.JXPathContext;
   import org.apache.myrmidon.api.TaskContext;
   import org.apache.myrmidon.api.TaskException;
  +import org.apache.avalon.framework.service.ServiceManager;
  +import org.apache.avalon.framework.service.ServiceException;
   
   /**
    * A property resolver that uses JXPath to resolve values.
    *
    * @author <a href="mailto:adammurdoch@apache.org">Adam Murdoch</a>
    * @version $Revision$ $Date$
  + * @avalon.component name="xpath"
  + * @avalon.service interface="PropertyResolver"
    */
   public class XPathPropertyResolver
       extends DefaultPropertyResolver
   {
  +    /**
  +     * @avalon.dependency interface="Converter"
  +     */
  +    public void service( ServiceManager serviceManager ) throws ServiceException
  +    {
  +        super.service( serviceManager );
  +    }
  +
       /**
        * Evaluates an expression.
        *
  
  
  
  1.2       +3 -1      jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/service/DefaultAntServiceKernel.java
  
  Index: DefaultAntServiceKernel.java
  ===================================================================
  RCS file: /home/cvs/jakarta-ant-myrmidon/container/src/java/org/apache/myrmidon/components/service/DefaultAntServiceKernel.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- DefaultAntServiceKernel.java	21 Jun 2002 02:58:20 -0000	1.1
  +++ DefaultAntServiceKernel.java	27 Jun 2002 05:13:34 -0000	1.2
  @@ -16,6 +16,8 @@
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
    * @version $Revision$ $Date$
  + * @avalon.component name="default"
  + * @avalon.service interface="AntServiceKernel"
    */
   public class DefaultAntServiceKernel
       implements AntServiceKernel
  
  
  

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