Author: vsiveton
Date: Tue Jan 29 04:07:40 2008
New Revision: 616279
URL: http://svn.apache.org/viewvc?rev=616279&view=rev
Log:
o updated due to r616277
Modified:
maven/sandbox/trunk/plugins/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java
Modified:
maven/sandbox/trunk/plugins/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java?rev=616279&r1=616278&r2=616279&view=diff
==============================================================================
---
maven/sandbox/trunk/plugins/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java
(original)
+++
maven/sandbox/trunk/plugins/maven-linkcheck-plugin/src/main/java/org/apache/maven/plugins/linkcheck/LinkcheckReport.java
Tue Jan 29 04:07:40 2008
@@ -34,6 +34,7 @@
import org.apache.commons.httpclient.HttpStatus;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.doxia.linkcheck.DefaultLinkCheck;
import org.apache.maven.doxia.linkcheck.HttpBean;
import org.apache.maven.doxia.linkcheck.LinkCheck;
import org.apache.maven.doxia.linkcheck.model.LinkcheckFile;
@@ -70,6 +71,38 @@
extends AbstractMavenReport
{
// ----------------------------------------------------------------------
+ // Report Components
+ // ----------------------------------------------------------------------
+
+ /**
+ * Internationalization.
+ *
+ * @component
+ */
+ protected I18N i18n;
+
+ /**
+ * Doxia Site Renderer.
+ *
+ * @component
+ */
+ protected Renderer siteRenderer;
+
+ /**
+ * SiteTool component.
+ *
+ * @component
+ */
+ protected SiteTool siteTool;
+
+ /**
+ * SiteTool component.
+ *
+ * @component
+ */
+ protected LinkCheck linkCheck;
+
+ // ----------------------------------------------------------------------
// Report Parameters
// ----------------------------------------------------------------------
@@ -92,20 +125,6 @@
protected List reactorProjects;
/**
- * Doxia Site Renderer.
- *
- * @component
- */
- protected Renderer siteRenderer;
-
- /**
- * Internationalization.
- *
- * @component
- */
- protected I18N i18n;
-
- /**
* Local Repository.
*
* @parameter expression="${localRepository}"
@@ -122,13 +141,6 @@
protected List repositories;
/**
- * SiteTool component.
- *
- * @component
- */
- protected SiteTool siteTool;
-
- /**
* Report output directory.
*
* @parameter expression="${project.reporting.outputDirectory}"
@@ -191,13 +203,6 @@
protected String linkcheckOutput;
/**
- * The current report level. Defaults to [EMAIL PROTECTED]
LinkcheckFileResult#WARNING_LEVEL}.
- *
- * @parameter default-value="2"
- */
- protected int reportLevel;
-
- /**
* The HTTP method to use. Currently supported are "GET" and "HEAD".
* <dl>
* <dt>HTTP GET</dt>
@@ -373,9 +378,9 @@
{
try
{
- LinkCheck lc = executeLinkCheck( locale );
+ LinkcheckModel result = executeLinkCheck( locale );
- generateReport( locale, lc );
+ generateReport( locale, result );
}
catch ( Exception e )
{
@@ -390,18 +395,17 @@
/**
* Execute the <code>Linkcheck</code> tool.
*/
- private LinkCheck executeLinkCheck( Locale locale )
+ private LinkcheckModel executeLinkCheck( Locale locale )
throws Exception
{
// Wrap linkcheck
- LinkCheck lc = new LinkCheck();
+ LinkCheck lc = new DefaultLinkCheck();
lc.setOnline( !offline );
lc.setBasedir( outputDirectory );
lc.setReportOutput( new File( linkcheckOutput ) );
lc.setLinkCheckCache( new File( linkcheckCache ) );
lc.setExcludedLinks( getExcludedLinks( locale ) );
lc.setExcludedPages( getExcludedPages() );
- lc.setReportLevel( reportLevel );
lc.setExcludedHttpStatusErrors( excludedHttpStatusErrors );
lc.setExcludedHttpStatusWarnings( excludedHttpStatusWarnings );
@@ -419,9 +423,7 @@
}
lc.setHttp( bean );
- lc.doExecute();
-
- return lc;
+ return lc.execute();
}
private String[] getExcludedLinks( Locale locale )
@@ -481,12 +483,10 @@
* Generate the Linkcheck report.
*
* @param locale the wanted locale
- * @param lc the lc object used
+ * @param linkcheckModel the result of the analysis
*/
- private void generateReport( Locale locale, LinkCheck lc )
+ private void generateReport( Locale locale, LinkcheckModel linkcheckModel )
{
- LinkcheckModel linkcheckModel = lc.getModel();
-
getSink().head();
getSink().text( i18n.getString( "linkcheck-report", locale,
"report.linkcheck.name" ) );
getSink().head_();
@@ -528,7 +528,7 @@
//Statistics
generateSummarySection( locale, linkcheckModel );
- //Statistics
+ //Details
generateDetailsSection( locale, linkcheckModel );
getSink().body_();
