bwalding    2003/02/21 16:37:21

  Modified:    src/plugins-build/linkcheck plugin.jelly
  Log:
  o MAVEN-286: Now enabled by default.  Recognises proxies, not as many spurious 
messages.
  
  Revision  Changes    Path
  1.4       +28 -40    jakarta-turbine-maven/src/plugins-build/linkcheck/plugin.jelly
  
  Index: plugin.jelly
  ===================================================================
  RCS file: /home/cvs/jakarta-turbine-maven/src/plugins-build/linkcheck/plugin.jelly,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- plugin.jelly      2 Feb 2003 13:44:55 -0000       1.3
  +++ plugin.jelly      22 Feb 2003 00:37:21 -0000      1.4
  @@ -7,18 +7,15 @@
     xmlns:doc="doc">
     
     <property name="maven.linkcheck.cache" 
value="${pom.getPluginContext('maven-linkcheck-plugin').getVariable('maven.linkcheck.cache')}"/>
  -  <j:if test="${context.getVariable('maven.linkcheck.enable') != null}">
  -      <j:set var="maven.linkcheck.enable" value="true"/>
  -  </j:if>
  -  
     <property name="maven.gen.docs" 
value="${pom.getPluginContext('maven-xdoc-plugin').getVariable('maven.gen.docs')}"/>
     
  -  
     <goal name="maven-linkcheck-plugin:register">
  -    <doc:registerReport 
  -      name="Link Check Report" 
  -      link="linkcheck"
  -      description="Report on the validity of all links in the documentation."/>
  +    <j:if test="${context.getVariable('maven.mode.online') == null}">
  +      <doc:registerReport 
  +        name="Link Check Report" 
  +        link="linkcheck"
  +        description="Report on the validity of all links in the documentation."/>
  +    </j:if>
     </goal>
     
     <define:taglib uri="linkcheck">
  @@ -38,8 +35,8 @@
       -->
          
     <goal name="maven-linkcheck-plugin:report">
  -     <echo>This run of linkcheck does nothing except create a template linkcheck 
file</echo>
  -     <copy file="${plugin.resources}/linkcheck-temp.xml" 
toFile="${maven.gen.docs}/linkcheck.xml"/>
  +     <copy file="${plugin.resources}/linkcheck-temp.xml" 
  +               toFile="${maven.gen.docs}/linkcheck.xml"/>
     </goal>
     
     <postGoal name="xdoc:jelly-transform">
  @@ -48,39 +45,30 @@
     
     <goal
       name="maven-linkcheck-plugin:report-real"
  -    description="Generate a report from the link check results">
  -    <echo>BaseDir: ${basedir}</echo>
  +    description="Generate link check results and then transform to HTML">
       <mkdir dir="${maven.build.dir}/linkcheck"/>
       <mkdir dir="${maven.build.dir}/linkcheck/docs"/>
  -    <j:choose>
  -      <j:when test="${maven.linkcheck.enable}">
  -         <echo>Generating the LinkCheck report</echo>
  -         <linkcheck:linkcheck
  -       cache="${maven.linkcheck.cache}"
  -       exclude="${pom.repository.url}"
  -           basedir="${maven.docs.dest}"
  -           output="${maven.build.dir}/linkcheck/linkcheck-results.xml"
  -           outputEncoding="${maven.docs.outputencoding}"
  -           />
  +    
  +     <linkcheck:linkcheck
  +      project="${pom}"
  +      cache="${maven.linkcheck.cache}"
  +      exclude="${pom.repository.url}"
  +       basedir="${maven.docs.dest}"
  +       output="${maven.build.dir}/linkcheck/linkcheck-results.xml"
  +       outputEncoding="${maven.docs.outputencoding}"
  +       />
        
  -         <doc:jsl
  -           input="${maven.build.dir}/linkcheck/linkcheck-results.xml"
  -           output="../linkcheck/docs/linkcheck.xml"
  -           stylesheet="${plugin.resources}/linkcheck.jsl"
  -           omitXmlDeclaration="true"
  -           outputMode="xml"
  -           prettyPrint="true"
  -           />
  +     <doc:jsl
  +       input="${maven.build.dir}/linkcheck/linkcheck-results.xml"
  +       output="../linkcheck/docs/linkcheck.xml"
  +       stylesheet="${plugin.resources}/linkcheck.jsl"
  +       omitXmlDeclaration="true"
  +       outputMode="xml"
  +       prettyPrint="true"
  +       />
              
  -         <j:set var="maven.xdoc.src" value="${maven.build.dir}/linkcheck/docs"/>
  -         <echo>maven.xdoc.src: ${maven.xdoc.src}</echo>
  -         <attainGoal name="xdoc:performJSL"/>
  -       </j:when>
  -      <j:otherwise>
  -        <echo>LinkCheck not enabled as maven.linkcheck.enable is not defined.</echo>
  -      </j:otherwise>
  -    </j:choose>
  -
  +     <j:set var="maven.xdoc.src" value="${maven.build.dir}/linkcheck/docs"/>
  +     <attainGoal name="xdoc:performJSL"/>
     </goal> 
     
     <goal name="maven-linkcheck-plugin:clearcache"
  
  
  

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

Reply via email to