avalon-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From dona...@apache.org
Subject cvs commit: jakarta-avalon-phoenix/src/schema blockinfo.dtd
Date Sun, 12 May 2002 02:07:30 GMT
donaldp     02/05/11 19:07:30

  Modified:    src/java/org/apache/avalon/phoenix/tools/infobuilder
                        BlockInfoBuilder.java
               src/schema blockinfo.dtd
  Log:
  Move name to be a subelement rather than an attribute to follow suite with other similar
descriptors. It also allows more extensibility in that later we can add <display-name/>,
<description/> etc without cluttering up the attributes of block.
  
  Revision  Changes    Path
  1.14      +2 -2      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.13
  retrieving revision 1.14
  diff -u -r1.13 -r1.14
  --- BlockInfoBuilder.java	12 May 2002 02:02:26 -0000	1.13
  +++ BlockInfoBuilder.java	12 May 2002 02:07:30 -0000	1.14
  @@ -25,7 +25,7 @@
    * is specified in the BlockInfo specification.
    *
    * @author <a href="mailto:peter@apache.org">Peter Donald</a>
  - * @version $Revision: 1.13 $ $Date: 2002/05/12 02:02:26 $
  + * @version $Revision: 1.14 $ $Date: 2002/05/12 02:07:30 $
    */
   public final class BlockInfoBuilder
       extends AbstractLogEnabled
  @@ -212,7 +212,7 @@
               return null;
           }
   
  -        final String name = block.getAttribute( "name", null );
  +        final String name = block.getChild( "name" ).getValue( null );
           final Version version = buildVersion( block.getChild( "version" ).getValue() );
   
           return new BlockDescriptor( name, classname, version );
  
  
  
  1.7       +3 -3      jakarta-avalon-phoenix/src/schema/blockinfo.dtd
  
  Index: blockinfo.dtd
  ===================================================================
  RCS file: /home/cvs/jakarta-avalon-phoenix/src/schema/blockinfo.dtd,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- blockinfo.dtd	12 May 2002 02:02:27 -0000	1.6
  +++ blockinfo.dtd	12 May 2002 02:07:30 -0000	1.7
  @@ -38,9 +38,9 @@
   version	     the version of the block in (in the format #.#.#, #.# or # where
                # is a integer
   -->
  -<!ELEMENT block          (version)>
  -  <!ATTLIST block name CDATA #IMPLIED>
  -  <!ELEMENT version       (#PCDATA) >
  +<!ELEMENT block          (name?,version)>
  +  <!ELEMENT name         (#PCDATA) >
  +  <!ELEMENT version      (#PCDATA) >
   
   <!--
   The service element describes a service that the block
  
  
  

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


Mime
View raw message