You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by be...@apache.org on 2008/03/14 19:34:26 UTC
svn commit: r637204 - in /maven/plugin-tools/trunk: maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/ maven-plugin-tools-javadoc/src/test/java/org/apache/maven/tools/plugin/javadoc/ maven-plugin-tools-javadoc/src/test/java/o...

Author: bentmann
Date: Fri Mar 14 11:34:21 2008
New Revision: 637204

URL: http://svn.apache.org/viewvc?rev=637204&view=rev
Log:
o Fixed usage of FileReader to get correct/reliable character decoding

Modified:
    maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGeneratorTest.java
    maven/plugin-tools/trunk/maven-plugin-tools-javadoc/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocReportTest.java
    maven/plugin-tools/trunk/maven-plugin-tools-javadoc/src/test/java/org/apache/maven/tools/plugin/javadoc/stubs/DefaultMavenProjectStub.java
    maven/plugin-tools/trunk/maven-plugin-tools-javadoc/src/test/resources/unit/javadoc/javadoc-plugin-config.xml

Modified: maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGeneratorTest.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGeneratorTest.java?rev=637204&r1=637203&r2=637204&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGeneratorTest.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-api/src/test/java/org/apache/maven/tools/plugin/generator/PluginDescriptorGeneratorTest.java Fri Mar 14 11:34:21 2008
@@ -24,10 +24,10 @@
 import org.apache.maven.plugin.descriptor.PluginDescriptor;
 import org.apache.maven.plugin.descriptor.PluginDescriptorBuilder;
 import org.codehaus.plexus.component.repository.ComponentDependency;
+import org.codehaus.plexus.util.ReaderFactory;
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileReader;
 import java.io.IOException;
 import java.io.PrintWriter;
 import java.io.StringReader;
@@ -81,7 +81,7 @@
         StringWriter sWriter = new StringWriter();
         PrintWriter pWriter = new PrintWriter( sWriter );
 
-        BufferedReader reader = new BufferedReader( new FileReader( pluginDescriptorFile ) );
+        BufferedReader reader = new BufferedReader( ReaderFactory.newXmlReader( pluginDescriptorFile ) );
 
         String line = null;
         while ( ( line = reader.readLine() ) != null )

Modified: maven/plugin-tools/trunk/maven-plugin-tools-javadoc/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-javadoc/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocReportTest.java?rev=637204&r1=637203&r2=637204&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-javadoc/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocReportTest.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-javadoc/src/test/java/org/apache/maven/tools/plugin/javadoc/JavadocReportTest.java Fri Mar 14 11:34:21 2008
@@ -21,8 +21,9 @@
 
 import java.io.BufferedReader;
 import java.io.File;
-import java.io.FileReader;
+import java.io.FileInputStream;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.util.Collections;
 
 import org.apache.maven.artifact.Artifact;
@@ -85,7 +86,7 @@
         throws IOException
     {
         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 )
         {

Modified: maven/plugin-tools/trunk/maven-plugin-tools-javadoc/src/test/java/org/apache/maven/tools/plugin/javadoc/stubs/DefaultMavenProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-javadoc/src/test/java/org/apache/maven/tools/plugin/javadoc/stubs/DefaultMavenProjectStub.java?rev=637204&r1=637203&r2=637204&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-javadoc/src/test/java/org/apache/maven/tools/plugin/javadoc/stubs/DefaultMavenProjectStub.java (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-javadoc/src/test/java/org/apache/maven/tools/plugin/javadoc/stubs/DefaultMavenProjectStub.java Fri Mar 14 11:34:21 2008
@@ -20,7 +20,6 @@
  */
 
 import java.io.File;
-import java.io.FileReader;
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
@@ -37,6 +36,7 @@
 import org.apache.maven.model.Resource;
 import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
 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>
@@ -54,7 +54,8 @@
 
         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 );
         }
         catch ( Exception e )

Modified: maven/plugin-tools/trunk/maven-plugin-tools-javadoc/src/test/resources/unit/javadoc/javadoc-plugin-config.xml
URL: http://svn.apache.org/viewvc/maven/plugin-tools/trunk/maven-plugin-tools-javadoc/src/test/resources/unit/javadoc/javadoc-plugin-config.xml?rev=637204&r1=637203&r2=637204&view=diff
==============================================================================
--- maven/plugin-tools/trunk/maven-plugin-tools-javadoc/src/test/resources/unit/javadoc/javadoc-plugin-config.xml (original)
+++ maven/plugin-tools/trunk/maven-plugin-tools-javadoc/src/test/resources/unit/javadoc/javadoc-plugin-config.xml Fri Mar 14 11:34:21 2008
@@ -56,6 +56,9 @@
 
           <debug>true</debug>
           <show>private</show>
+          <encoding>ISO-8859-1</encoding>
+          <docencoding>ISO-8859-1</docencoding>
+          <charset>ISO-8859-1</charset>
 
           <taglets>
             <taglet>