You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@avalon.apache.org by pr...@apache.org on 2002/07/13 21:31:02 UTC

cvs commit: jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/infobuilder BlockInfoBuilder.java

proyal      2002/07/13 12:31:01

  Modified:    src/java/org/apache/avalon/phoenix/tools/infobuilder
                        BlockInfoBuilder.java
  Log:
  Schema type is an attribute of a BlockDescriptor now.
  
  Revision  Changes    Path
  1.19      +4 -5      jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/infobuilder/BlockInfoBuilder.java
  
  Index: BlockInfoBuilder.java
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/java/org/apache/avalon/phoenix/tools/infobuilder/BlockInfoBuilder.java,v
  retrieving revision 1.18
  retrieving revision 1.19
  diff -u -r1.18 -r1.19
  --- BlockInfoBuilder.java	28 Jun 2002 05:08:09 -0000	1.18
  +++ BlockInfoBuilder.java	13 Jul 2002 19:31:01 -0000	1.19
  @@ -65,8 +65,6 @@
           configuration = info.getChild( "block" );
           final BlockDescriptor descriptor = buildBlockDescriptor( classname, configuration );
   
  -        configuration = info.getChild( "configuration-schema", false );
  -
           if( getLogger().isDebugEnabled() )
           {
               final String message = REZ.getString( "blockinfo-created",
  @@ -76,7 +74,7 @@
               getLogger().debug( message );
           }
   
  -        return new BlockInfo( descriptor, configuration, services, management, dependencies );
  +        return new BlockInfo( descriptor, services, management, dependencies );
       }
   
       /**
  @@ -208,8 +206,9 @@
   
           final String name = block.getChild( "name" ).getValue( null );
           final Version version = buildVersion( block.getChild( "version" ).getValue() );
  +        final String schemaType = block.getChild( "schema-type" ).getValue( null );
   
  -        return new BlockDescriptor( name, classname, version );
  +        return new BlockDescriptor( name, classname, schemaType, version );
       }
   
       /**
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>