You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@maven.apache.org by di...@apache.org on 2003/03/29 12:36:23 UTC

cvs commit: maven/src/plugins-build/html2xdoc plugin.jelly

dion        2003/03/29 03:36:23

  Modified:    src/plugins-build/html2xdoc plugin.jelly
  Log:
  detab
  
  Revision  Changes    Path
  1.3       +10 -14    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.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- plugin.jelly	17 Mar 2003 08:57:17 -0000	1.2
  +++ plugin.jelly	29 Mar 2003 11:36:23 -0000	1.3
  @@ -4,23 +4,19 @@
     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:util="jelly:util">
   
     <goal name="html2xdoc" prereqs="xdoc:init"
       description="Generates XDoc documentation from normal HTML files">
   
       <j:set var="destdir" value="${maven.gen.docs}"/>
       <j:if test="${empty(destdir)}">
  -    	<j:set var="destdir" value="${maven.build.dir}/generated-xdocs"/>
  +      <j:set var="destdir" value="${maven.build.dir}/generated-xdocs"/>
       </j:if>
       
       <j:set var="srcdir" value="${maven.html2xdoc.dir}"/>    
       <j:if test="${empty(srcdir)}">
  -    	<j:set var="srcdir" value="${basedir}/xdocs"/>
  +      <j:set var="srcdir" value="${basedir}/xdocs"/>
       </j:if>
       
       <j:set var="outputencoding" value="${maven.docs.outputencoding}"/>
  @@ -31,11 +27,11 @@
       <!-- mapper for determining output file name -->
       <j:new var="mapper" className="org.apache.maven.util.CaseInsensitiveGlobPatternMapper"/>
   
  -		<util:file var="srcdirFile" name="${srcdir}"/>
  -		<j:set var="srcdir" value="${srcdirFile.getCanonicalPath()}"/>
  -		<util:file var="destdirFile" name="${destdir}"/>
  -		<j:set var="destdir" value="${destdirFile.getCanonicalPath()}"/>
  -		 
  +    <util:file var="srcdirFile" name="${srcdir}"/>
  +    <j:set var="srcdir" value="${srcdirFile.getCanonicalPath()}"/>
  +    <util:file var="destdirFile" name="${destdir}"/>
  +    <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"/>
  @@ -57,7 +53,7 @@
   
         <j:forEach var="file" items="${docFiles.iterator()}">
   
  -				<util:replace var="inDirForward" oldChar="\" newChar="/" value="${file.parent}"/>
  +        <util:replace var="inDirForward" oldChar="\" newChar="/" value="${file.parent}"/>
           <j:set var="outDir" value="${dirMapper.mapFileName(inDirForward).0}"/>
           <mkdir dir="${outDir}"/>
   
  @@ -76,7 +72,7 @@
           <j:set var="xmlDoc" value="${htmlTool.convert(htmlDoc)}"/>
   
           <j:file name="${outFile}" encoding="${outputencoding}" outputMode="xml">
  -					<x:copyOf select="$xmlDoc"/>
  +          <x:copyOf select="$xmlDoc"/>
           </j:file>
         </j:forEach>
     </goal>
  
  
  

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org