You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by de...@apache.org on 2008/05/19 12:55:33 UTC
svn commit: r657785 - in /maven/plugins/trunk/maven-docck-plugin: pom.xml
src/main/java/org/apache/maven/plugin/docck/CheckPluginDocumentationMojo.java
Author: dennisl
Date: Mon May 19 03:55:33 2008
New Revision: 657785
URL: http://svn.apache.org/viewvc?rev=657785&view=rev
Log:
[MDOCCK-10] Use proper file encoding when checking site descriptor
Modified:
maven/plugins/trunk/maven-docck-plugin/pom.xml
maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/CheckPluginDocumentationMojo.java
Modified: maven/plugins/trunk/maven-docck-plugin/pom.xml
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-docck-plugin/pom.xml?rev=657785&r1=657784&r2=657785&view=diff
==============================================================================
--- maven/plugins/trunk/maven-docck-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-docck-plugin/pom.xml Mon May 19 03:55:33 2008
@@ -29,7 +29,7 @@
<version>1.0-beta-3-SNAPSHOT</version>
<name>Maven Documentation Checker Plugin</name>
<prerequisites>
- <maven>2.0</maven>
+ <maven>2.0.6</maven>
</prerequisites>
<!-- Not inherited correctly
-->
@@ -101,6 +101,11 @@
<version>2.0</version>
</dependency>
<dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.4.5</version>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
Modified: maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/CheckPluginDocumentationMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/CheckPluginDocumentationMojo.java?rev=657785&r1=657784&r2=657785&view=diff
==============================================================================
--- maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/CheckPluginDocumentationMojo.java (original)
+++ maven/plugins/trunk/maven-docck-plugin/src/main/java/org/apache/maven/plugin/docck/CheckPluginDocumentationMojo.java Mon May 19 03:55:33 2008
@@ -28,13 +28,15 @@
import org.apache.maven.project.MavenProject;
import org.apache.maven.tools.plugin.extractor.ExtractionException;
import org.apache.maven.tools.plugin.scanner.MojoScanner;
-import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.IOUtil;
+import org.codehaus.plexus.util.ReaderFactory;
+import org.codehaus.plexus.util.xml.XmlStreamReader;
+import java.io.File;
+import java.io.IOException;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-import java.io.File;
-import java.io.IOException;
/**
* Checks a plugin's documentation for the standard minimums.
@@ -144,9 +146,12 @@
}
else
{
+ XmlStreamReader streamReader = null;
try
{
- String siteHtml = FileUtils.fileRead( siteXml.getAbsolutePath() );
+ streamReader = ReaderFactory.newXmlReader( siteXml );
+
+ String siteHtml = IOUtil.toString( streamReader );
if ( siteHtml.indexOf( "href=\"index.html\"" ) < 0 )
{
@@ -173,6 +178,20 @@
reporter.error( "Unable to read site.xml file: \'" + siteXml.getAbsolutePath()
+ "\'.\nError: " + e.getMessage() );
}
+ finally
+ {
+ if ( streamReader != null )
+ {
+ try
+ {
+ streamReader.close();
+ }
+ catch ( IOException e )
+ {
+ // Ignore this, there is nothing we can do about it anyway
+ }
+ }
+ }
}
// check for index.(apt|html|xml)[.vm]