donaldp     02/04/22 04:02:50

  Modified:    src/manifest blockinfo-template.xml
  Log:
  The XDoclet to generate blockinfo xml files does not handle multiple
  phoenix:dependency tags.
  
  PR: 7967
  Submitted by: [EMAIL PROTECTED] (Peter Royal)
  
  Revision  Changes    Path
  1.2       +8 -7      
jakarta-avalon-cornerstone/src/manifest/blockinfo-template.xml
  
  Index: blockinfo-template.xml
  ===================================================================
  RCS file: 
/home/cvs/jakarta-avalon-cornerstone/src/manifest/blockinfo-template.xml,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- blockinfo-template.xml    3 Feb 2002 00:42:08 -0000       1.1
  +++ blockinfo-template.xml    22 Apr 2002 11:02:49 -0000      1.2
  @@ -1,5 +1,5 @@
   <?xml version="1.0"?>
  -<!DOCTYPE blockinfo PUBLIC "-//PHOENIX/Block Info DTD Version 1.0//EN" 
  +<!DOCTYPE blockinfo PUBLIC "-//PHOENIX/Block Info DTD Version 1.0//EN"
                     "http://jakarta.apache.org/phoenix/blockinfo_1_0.dtd";>
   
   <blockinfo>
  @@ -19,16 +19,17 @@
   
     <!-- services that are required by this block -->
     <dependencies>
  -    <XDtMethod:ifHasMethod name="compose" 
  +    <XDtMethod:ifHasMethod name="compose"
                              
parameters="org.apache.avalon.framework.component.ComponentManager">
         <XDtMethod:setCurrentMethod name="compose"
                                     
parameters="org.apache.avalon.framework.component.ComponentManager">
  -      <dependency>
  -        <service name="<XDtMethod:methodTagValue 
tagName="phoenix:dependency" paramName="name"/>" 
  -                 version="<XDtMethod:methodTagValue 
tagName="phoenix:dependency" paramName="version" default="1.0"/>"/>
  -      </dependency>
  +        <XDtMethod:forAllMethodTags tagName="phoenix:dependency">
  +          <dependency>
  +            <service name="<XDtMethod:methodTagValue 
tagName="phoenix:dependency" paramName="name"/>"
  +                      version="<XDtMethod:methodTagValue 
tagName="phoenix:dependency" paramName="version" default="1.0"/>"/>
  +          </dependency>
  +        </XDtMethod:forAllMethodTags>
         </XDtMethod:setCurrentMethod>
       </XDtMethod:ifHasMethod>
     </dependencies>
  -
   </blockinfo>
  
  
  

--
To unsubscribe, e-mail:   <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>

Reply via email to