dion        2003/03/29 03:37:24

  Modified:    src/plugins-build/html2xdoc plugin.jelly
  Log:
  fix indents
  
  Revision  Changes    Path
  1.4       +34 -35    maven/src/plugins-build/html2xdoc/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/maven/src/plugins-build/html2xdoc/plugin.jelly,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- plugin.jelly      29 Mar 2003 11:36:23 -0000      1.3
  +++ plugin.jelly      29 Mar 2003 11:37:24 -0000      1.4
  @@ -33,48 +33,47 @@
       <j:set var="destdir" value="${destdirFile.getCanonicalPath()}"/>
        
   
  -      <util:replace var="fromPattern" oldChar="\" newChar="/" 
value="${srcdir}/*.html"/>
  -      <util:replace var="toPattern" oldChar="\" newChar="/" 
value="${destdir}/*.xml"/>
  -      <j:setProperties object="${mapper}" from="${fromPattern}" to="${toPattern}"/>
  +    <util:replace var="fromPattern" oldChar="\" newChar="/" 
value="${srcdir}/*.html"/>
  +    <util:replace var="toPattern" oldChar="\" newChar="/" value="${destdir}/*.xml"/>
  +    <j:setProperties object="${mapper}" from="${fromPattern}" to="${toPattern}"/>
   
  -      <util:replace var="fromDirPattern" oldChar="\" newChar="/" 
value="${srcdir}*"/>
  -      <util:replace var="toDirPattern" oldChar="\" newChar="/" value="${destdir}*"/>
  +    <util:replace var="fromDirPattern" oldChar="\" newChar="/" value="${srcdir}*"/>
  +    <util:replace var="toDirPattern" oldChar="\" newChar="/" value="${destdir}*"/>
         
  -      <j:new var="dirMapper" 
className="org.apache.maven.util.CaseInsensitiveGlobPatternMapper"/>
  -      <j:setProperties object="${dirMapper}" from="${fromDirPattern}" 
to="${toDirPattern}"/>
  +    <j:new var="dirMapper" 
className="org.apache.maven.util.CaseInsensitiveGlobPatternMapper"/>
  +    <j:setProperties object="${dirMapper}" from="${fromDirPattern}" 
to="${toDirPattern}"/>
   
  -      <fileScanner var="docFiles">
  -        <fileset dir="${srcdir}">
  -          <patternset>
  -            <include name="**/*.html"/>
  -          </patternset>
  -        </fileset>
  -      </fileScanner>
  -
  -      <j:forEach var="file" items="${docFiles.iterator()}">
  -
  -        <util:replace var="inDirForward" oldChar="\" newChar="/" 
value="${file.parent}"/>
  -        <j:set var="outDir" value="${dirMapper.mapFileName(inDirForward).0}"/>
  -        <mkdir dir="${outDir}"/>
  -
  -
  -        <!-- generate output file name -->
  -        <util:replace var="outFileForward" oldChar="\" newChar="/" 
value="${file.toString()}"/>
  -        <j:set var="outFiles" value="${mapper.mapFileName(outFileForward)}"/>
  -        <j:set var="outFile" value="${outFiles[0]}"/>
  +    <fileScanner var="docFiles">
  +      <fileset dir="${srcdir}">
  +        <patternset>
  +          <include name="**/*.html"/>
  +        </patternset>
  +      </fileset>
  +    </fileScanner>
  +
  +    <j:forEach var="file" items="${docFiles.iterator()}">
  +
  +      <util:replace var="inDirForward" oldChar="\" newChar="/" 
value="${file.parent}"/>
  +      <j:set var="outDir" value="${dirMapper.mapFileName(inDirForward).0}"/>
  +      <mkdir dir="${outDir}"/>
  +
  +      <!-- generate output file name -->
  +      <util:replace var="outFileForward" oldChar="\" newChar="/" 
value="${file.toString()}"/>
  +      <j:set var="outFiles" value="${mapper.mapFileName(outFileForward)}"/>
  +      <j:set var="outFile" value="${outFiles[0]}"/>
   
  -        <echo>Generating ${outFile} from ${file}</echo>
  +      <echo>Generating ${outFile} from ${file}</echo>
           
  -        <!-- parse the HTML doc and pass it to the stylesheet -->
  -        <html:parse var="htmlDoc" html="${file}" element="lower" attribute="lower"/>
  +      <!-- parse the HTML doc and pass it to the stylesheet -->
  +      <html:parse var="htmlDoc" html="${file}" element="lower" attribute="lower"/>
           
  -        <!-- now lets convert the document into XML -->
  -        <j:set var="xmlDoc" value="${htmlTool.convert(htmlDoc)}"/>
  +      <!-- now lets convert the document into XML -->
  +      <j:set var="xmlDoc" value="${htmlTool.convert(htmlDoc)}"/>
   
  -        <j:file name="${outFile}" encoding="${outputencoding}" outputMode="xml">
  -          <x:copyOf select="$xmlDoc"/>
  -        </j:file>
  -      </j:forEach>
  +      <j:file name="${outFile}" encoding="${outputencoding}" outputMode="xml">
  +        <x:copyOf select="$xmlDoc"/>
  +      </j:file>
  +    </j:forEach>
     </goal>
   
   </project>
  
  
  

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

Reply via email to