dion        2003/03/27 05:20:45

  Modified:    src/plugins-build/faq plugin.jelly
  Log:
  Explicity use ant name space. In prep for removal of jeez etc
  
  Revision  Changes    Path
  1.5       +52 -57    maven/src/plugins-build/faq/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven/src/plugins-build/faq/plugin.jelly,v
  retrieving revision 1.4
  retrieving revision 1.5
  diff -u -r1.4 -r1.5
  --- plugin.jelly      19 Mar 2003 19:21:16 -0000      1.4
  +++ plugin.jelly      27 Mar 2003 13:20:45 -0000      1.5
  @@ -1,41 +1,37 @@
   <?xml version="1.0"?>
   
   <project
  +  xmlns:ant="jelly:ant"
     xmlns:j="jelly:core"
  -  xmlns:x="jelly:xml"  
  -  xmlns:html="jelly:html"
  -  xmlns:maven="jelly:maven"
  -  xmlns:log="jelly:log"
     xmlns:util="jelly:util"
  -  xmlns:doc="doc"
  -  xmlns:m="maven">
  +  xmlns:x="jelly:xml">
   
     <goal name="faq"
       description="Generates an FAQ xdoc file from an FAQ XML document">
   
  -             <j:set var="destfile" value="${maven.faq.dest.file}"/>
  +    <j:set var="destfile" value="${maven.faq.dest.file}"/>
       <j:if test="${empty(destfile)}">
  -     <j:set var="destfile" value="${maven.build.dir}/generated-xdocs/faq.xml"/>
  +      <j:set var="destfile" value="${maven.build.dir}/generated-xdocs/faq.xml"/>
       </j:if>
   
  -             <mkdir dir="${maven.build.dir}/generated-xdocs"/>
  -                 
  -             <j:set var="srcfile" value="${maven.faq.src.file}"/>
  +    <ant:mkdir dir="${maven.build.dir}/generated-xdocs"/>
  +        
  +    <j:set var="srcfile" value="${maven.faq.src.file}"/>
       <j:if test="${empty(srcfile)}">
  -     <j:set var="srcfile" value="${basedir}/xdocs/faq.fml"/>
  +      <j:set var="srcfile" value="${basedir}/xdocs/faq.fml"/>
       </j:if>
       
  -             <util:file var="srcfileFile" name="${srcfile}"/>
  -             <j:set var="srcfile" value="${srcfileFile.getCanonicalPath()}"/>
  -             <util:file var="destfileFile" name="${destfile}"/>
  -             <j:set var="destfile" value="${destfileFile.getCanonicalPath()}"/>
  +    <util:file var="srcfileFile" name="${srcfile}"/>
  +    <j:set var="srcfile" value="${srcfileFile.getCanonicalPath()}"/>
  +    <util:file var="destfileFile" name="${destfile}"/>
  +    <j:set var="destfile" value="${destfileFile.getCanonicalPath()}"/>
           
       <j:set var="outputencoding" value="${maven.docs.outputencoding}"/>
   
  -             <x:parse var="doc" xml="${srcfileFile}"/>    
  -             <x:set var="root" select="$doc/*"/>
  +    <x:parse var="doc" xml="${srcfileFile}"/>    
  +    <x:set var="root" select="$doc/*"/>
   
  -             <j:file name="${destfile}" encoding="${outputencoding}" 
outputMode="xml">
  +    <j:file name="${destfile}" encoding="${outputencoding}" outputMode="xml">
   <document>
   
     <properties>
  @@ -43,46 +39,45 @@
     </properties>
     <body>
       <section name="Frequently Asked Questions">
  -     <x:forEach select="$root/part">
  -                             <p>
  -                                     <strong><x:expr select="title"/></strong>
  -                             </p>
  -                             <ol>
  -                     <x:forEach select="faq">
  -                                     <li>
  -                                             <x:element name="a">
  -                                                     <x:attribute 
name="href">#<x:expr select="@id"/></x:attribute>
  -                                                     <x:copyOf 
select="question/node()"/>
  -                                             </x:element>
  -                                     </li>
  -                     </x:forEach>
  -                             </ol>
  -     </x:forEach>
  -             </section>
  -
  -
  -             <x:forEach select="$root/part">
  -                     <x:element name="section">
  -                             <x:attribute name="name"><x:expr 
select="title"/></x:attribute>
  -                             
  -                             <x:forEach select="faq">
  -                                     <dl>
  -                                             <dt>
  -                                                     <x:element name="a">
  -                                                             <x:attribute 
name="name"><x:expr select="@id"/></x:attribute>
  -                                                             <x:copyOf 
select="question/node()"/>
  -                                                     </x:element>
  -                                             </dt>
  -                                             <dd>
  -                                                             <x:copyOf 
select="answer/node()"/>
  -                                             </dd>
  -                                     </dl>
  -             </x:forEach>
  -                     </x:element>
  -             </x:forEach>
  +      <x:forEach select="$root/part">
  +        <p>
  +          <strong><x:expr select="title"/></strong>
  +        </p>
  +        <ol>
  +          <x:forEach select="faq">
  +          <li>
  +            <x:element name="a">
  +              <x:attribute name="href">#<x:expr select="@id"/></x:attribute>
  +              <x:copyOf select="question/node()"/>
  +            </x:element>
  +          </li>
  +          </x:forEach>
  +        </ol>
  +      </x:forEach>
  +    </section>
  +
  +    <x:forEach select="$root/part">
  +      <x:element name="section">
  +        <x:attribute name="name"><x:expr select="title"/></x:attribute>
  +        
  +        <x:forEach select="faq">
  +          <dl>
  +            <dt>
  +              <x:element name="a">
  +                <x:attribute name="name"><x:expr select="@id"/></x:attribute>
  +                <x:copyOf select="question/node()"/>
  +              </x:element>
  +            </dt>
  +            <dd>
  +                <x:copyOf select="answer/node()"/>
  +            </dd>
  +          </dl>
  +        </x:forEach>
  +      </x:element>
  +    </x:forEach>
     </body>
   </document>
  -             </j:file>
  +    </j:file>
     </goal>
   
   </project>
  
  
  

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

Reply via email to