stephenc
/
maven-plugin-tools
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

o Fixed usage of FileReader to get correct/reliable character decoding 

git-svn-id: https://svn.apache.org/repos/asf/maven/plugin-tools/trunk@637204 13f79535-47bb-0310-9956-ffa450edef68
master
Benjamin Bentmann 2008-03-14 18:34:21 +00:00
parent a4f7b4e719
commit d44a1c3888
4 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGeneratorTest.java
View File

@ -24,10 +24,10 @@ import org.apache.maven.plugin.descriptor.Parameter;
import org.apache.maven.plugin.descriptor.PluginDescriptor; import org.apache.maven.plugin.descriptor.PluginDescriptor;
import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder; import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder;
import org.codehaus.plexus.component.repository.ComponentDependency; import org.codehaus.plexus.component.repository.ComponentDependency;
import org.codehaus.plexus.util.ReaderFactory;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;
import java.io.FileReader;
import java.io.IOException; import java.io.IOException;
import java.io.PrintWriter; import java.io.PrintWriter;
import java.io.StringReader; import java.io.StringReader;
@ -81,7 +81,7 @@ public class PluginDescriptorGeneratorTest
StringWriter sWriter = new StringWriter(); StringWriter sWriter = new StringWriter();
PrintWriter pWriter = new PrintWriter( sWriter ); PrintWriter pWriter = new PrintWriter( sWriter );
BufferedReader reader = new BufferedReader( new FileReader( pluginDescriptorFile ) ); BufferedReader reader = new BufferedReader( ReaderFactory.newXmlReader( pluginDescriptorFile ) );
String line = null; String line = null;
while ( ( line = reader.readLine() ) != null ) while ( ( line = reader.readLine() ) != null )

5
maven-plugin-tools-javadoc/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocReportTest.java
View File

@ -21,8 +21,9 @@ package org.apache.maven.tools.plugin.javadoc;
import java.io.BufferedReader; import java.io.BufferedReader;
import java.io.File; import java.io.File;
import java.io.FileReader; import java.io.FileInputStream;
import java.io.IOException; import java.io.IOException;
import java.io.InputStreamReader;
import java.util.Collections; import java.util.Collections;
import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.Artifact;
@ -85,7 +86,7 @@ public class JavadocReportTest
throws IOException throws IOException
{ {
String str = "", strTmp = ""; String str = "", strTmp = "";
BufferedReader in = new BufferedReader( new FileReader( file ) ); BufferedReader in = new BufferedReader( new InputStreamReader( new FileInputStream( file ), "ISO-8859-1" ) );
while ( ( strTmp = in.readLine() ) != null ) while ( ( strTmp = in.readLine() ) != null )
{ {

5
maven-plugin-tools-javadoc/src/test/java/org/apache/maven/tools/plugin/javadoc/stubs/DefaultMavenProjectStub.java
View File

@ -20,7 +20,6 @@ package org.apache.maven.tools.plugin.javadoc.stubs;
*/ */
import java.io.File; import java.io.File;
import java.io.FileReader;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.List; import java.util.List;
@ -37,6 +36,7 @@ import org.apache.maven.model.Model;
import org.apache.maven.model.Resource; import org.apache.maven.model.Resource;
import org.apache.maven.model.io.xpp3.MavenXpp3Reader; import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
import org.apache.maven.plugin.testing.stubs.MavenProjectStub; import org.apache.maven.plugin.testing.stubs.MavenProjectStub;
import org.codehaus.plexus.util.ReaderFactory;
/** /**
* @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a> * @author <a href="mailto:vincent.siveton@gmail.com">Vincent Siveton</a>
@ -54,7 +54,8 @@ public class DefaultMavenProjectStub
try try
{ {
model = pomReader.read( new FileReader( new File( getBasedir(), "javadoc-plugin-config.xml" ) ) ); File pomFile = new File( getBasedir(), "javadoc-plugin-config.xml" );
model = pomReader.read( ReaderFactory.newXmlReader( pomFile ) );
setModel( model ); setModel( model );
} }
catch ( Exception e ) catch ( Exception e )

3
maven-plugin-tools-javadoc/src/test/resources/unit/javadoc/javadoc-plugin-config.xml
View File

@ -56,6 +56,9 @@ under the License.
<debug>true</debug> <debug>true</debug>
<show>private</show> <show>private</show>
<encoding>ISO-8859-1</encoding>
<docencoding>ISO-8859-1</docencoding>
<charset>ISO-8859-1</charset>
<taglets> <taglets>
<taglet> <taglet>