You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by mc...@apache.org on 2003/03/17 05:10:25 UTC

cvs commit: avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder XMLTypeCreator.java

mcconnell    2003/03/16 20:10:25

  Modified:    merlin/meta/src/java/org/apache/avalon/meta/info/builder
                        XMLTypeCreator.java
  Log:
  Exposing service and dependency generation methods as public operations.
  
  Revision  Changes    Path
  1.2       +8 -10     avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder/XMLTypeCreator.java
  
  Index: XMLTypeCreator.java
  ===================================================================
  RCS file: /home/cvs/avalon-sandbox/merlin/meta/src/java/org/apache/avalon/meta/info/builder/XMLTypeCreator.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- XMLTypeCreator.java	13 Mar 2003 01:06:05 -0000	1.1
  +++ XMLTypeCreator.java	17 Mar 2003 04:10:24 -0000	1.2
  @@ -167,7 +167,8 @@
           final ServiceDescriptor[] services = buildServices( configuration );
   
           configuration = info.getChild( "dependencies" );
  -        final DependencyDescriptor[] dependencies = buildDependencies( classname, configuration );
  +        final DependencyDescriptor[] dependencies = 
  +           buildDependencies( configuration );
   
           configuration = info.getChild( "stages" );
           final StageDescriptor[] phases = buildPhases( configuration );
  @@ -284,15 +285,13 @@
   
       /**
        * A utility method to build an array of {@link DependencyDescriptor}
  -     * objects from specified configuration and classname.
  +     * objects from specified configuration.
        *
  -     * @param classname The classname of Component (used for logging purposes)
        * @param configuration the dependencies configuration
        * @return the created DependencyDescriptor
        * @throws ConfigurationException if an error occurs
        */
  -    protected DependencyDescriptor[] buildDependencies( final String classname,
  -                                                        final Configuration configuration )
  +    public DependencyDescriptor[] buildDependencies( final Configuration configuration )
           throws ConfigurationException
       {
           final Configuration[] elements = configuration.getChildren( "dependency" );
  @@ -301,7 +300,7 @@
           for( int i = 0; i < elements.length; i++ )
           {
               final DependencyDescriptor dependency =
  -                buildDependency( classname, elements[ i ] );
  +                buildDependency( elements[ i ] );
               dependencies.add( dependency );
           }
   
  @@ -317,8 +316,7 @@
        * @return the created DependencyDescriptor
        * @throws ConfigurationException if an error occurs
        */
  -    protected DependencyDescriptor buildDependency( final String classname,
  -                                                    final Configuration dependency )
  +    protected DependencyDescriptor buildDependency( final Configuration dependency )
           throws ConfigurationException
       {
           String role;
  @@ -388,7 +386,7 @@
        * @return the created ServiceDescriptor
        * @throws ConfigurationException if an error occurs
        */
  -    protected ServiceDescriptor[] buildServices( final Configuration servicesSet )
  +    public ServiceDescriptor[] buildServices( final Configuration servicesSet )
           throws ConfigurationException
       {
           final Configuration[] elements = servicesSet.getChildren( "service" );
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: cvs-unsubscribe@avalon.apache.org
For additional commands, e-mail: cvs-help@avalon.apache.org