You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2007/10/23 23:36:42 UTC
svn commit: r587665 - in
/maven/plugins/trunk/maven-project-info-reports-plugin/src:
main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java
Author: hboutemy
Date: Tue Oct 23 14:36:41 2007
New Revision: 587665
URL: http://svn.apache.org/viewvc?rev=587665&view=rev
Log:
encoding fixes
Modified:
maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java?rev=587665&r1=587664&r2=587665&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java Tue Oct 23 14:36:41 2007
@@ -42,8 +42,9 @@
import org.codehaus.plexus.i18n.I18N;
import java.io.File;
-import java.io.FileWriter;
+import java.io.FileOutputStream;
import java.io.IOException;
+import java.io.OutputStreamWriter;
import java.io.Writer;
import java.util.HashMap;
import java.util.Locale;
@@ -169,7 +170,7 @@
outputDirectory.mkdirs();
- Writer writer = new FileWriter( new File( outputDirectory, getOutputName() + ".html" ) );
+ Writer writer = new OutputStreamWriter( new FileOutputStream( new File( outputDirectory, getOutputName() + ".html" ) ), "UTF-8" );
siteRenderer.generateDocument( writer, sink, siteContext );
Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java?rev=587665&r1=587664&r2=587665&view=diff
==============================================================================
--- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java (original)
+++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java Tue Oct 23 14:36:41 2007
@@ -20,7 +20,8 @@
*/
import java.io.File;
-import java.io.FileReader;
+import java.io.FileInputStream;
+import java.io.InputStreamReader;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -58,7 +59,8 @@
MavenXpp3Reader pomReader = new MavenXpp3Reader();
try
{
- model = pomReader.read( new FileReader( new File( getBasedir(), getPOM() ) ) );
+ // TODO use ReaderFactory.newXmlReader() when plexus-util is upgraded to 1.4.5+
+ model = pomReader.read( new InputStreamReader( new FileInputStream( new File( getBasedir(), getPOM() ) ), "UTF-8" ) );
setModel( model );
}
catch ( Exception e )
Re: svn commit: r587665 - in /maven/plugins/trunk/maven-project-info-reports-plugin/src: main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java
Posted by Hervé BOUTEMY <he...@free.fr>.
Le mercredi 24 octobre 2007, Dennis Lundberg a écrit :
> hboutemy@apache.org wrote:
> > Author: hboutemy
> > Date: Tue Oct 23 14:36:41 2007
> > New Revision: 587665
> >
> > URL: http://svn.apache.org/viewvc?rev=587665&view=rev
> > Log:
> > encoding fixes
> >
> > Modified:
> >
> > maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/a
> >pache/maven/report/projectinfo/AbstractProjectInfoReport.java
> > maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/a
> >pache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java
> >
> > Modified:
> > maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/a
> >pache/maven/report/projectinfo/AbstractProjectInfoReport.java URL:
> > http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-repor
> >ts-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjec
> >tInfoReport.java?rev=587665&r1=587664&r2=587665&view=diff
> > =========================================================================
> >===== ---
> > maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/a
> >pache/maven/report/projectinfo/AbstractProjectInfoReport.java (original)
> > +++
> > maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/a
> >pache/maven/report/projectinfo/AbstractProjectInfoReport.java Tue Oct 23
> > 14:36:41 2007 @@ -42,8 +42,9 @@
> > import org.codehaus.plexus.i18n.I18N;
> >
> > import java.io.File;
> > -import java.io.FileWriter;
> > +import java.io.FileOutputStream;
> > import java.io.IOException;
> > +import java.io.OutputStreamWriter;
> > import java.io.Writer;
> > import java.util.HashMap;
> > import java.util.Locale;
> > @@ -169,7 +170,7 @@
> >
> > outputDirectory.mkdirs();
> >
> > - Writer writer = new FileWriter( new File( outputDirectory,
> > getOutputName() + ".html" ) ); + Writer writer = new
> > OutputStreamWriter( new FileOutputStream( new File( outputDirectory,
> > getOutputName() + ".html" ) ), "UTF-8" );
> >
> > siteRenderer.generateDocument( writer, sink, siteContext );
> >
> >
> > Modified:
> > maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/a
> >pache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java URL:
> > http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-repor
> >ts-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectI
> >nfoProjectStub.java?rev=587665&r1=587664&r2=587665&view=diff
> > =========================================================================
> >===== ---
> > maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/a
> >pache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java
> > (original) +++
> > maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/a
> >pache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java Tue Oct
> > 23 14:36:41 2007 @@ -20,7 +20,8 @@
> > */
> >
> > import java.io.File;
> > -import java.io.FileReader;
> > +import java.io.FileInputStream;
> > +import java.io.InputStreamReader;
> > import java.util.ArrayList;
> > import java.util.Collections;
> > import java.util.List;
> > @@ -58,7 +59,8 @@
> > MavenXpp3Reader pomReader = new MavenXpp3Reader();
> > try
> > {
> > - model = pomReader.read( new FileReader( new File(
> > getBasedir(), getPOM() ) ) ); + // TODO use
> > ReaderFactory.newXmlReader() when plexus-util is upgraded to 1.4.5+ +
> > model = pomReader.read( new InputStreamReader( new
> > FileInputStream( new File( getBasedir(), getPOM() ) ), "UTF-8" ) );
> > setModel( model );
> > }
> > catch ( Exception e )
>
> plexus-utils is already at 1.4.5 for MPIR
right, thank you
change done
Hervé
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org
Re: svn commit: r587665 - in /maven/plugins/trunk/maven-project-info-reports-plugin/src:
main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java
Posted by Dennis Lundberg <de...@apache.org>.
hboutemy@apache.org wrote:
> Author: hboutemy
> Date: Tue Oct 23 14:36:41 2007
> New Revision: 587665
>
> URL: http://svn.apache.org/viewvc?rev=587665&view=rev
> Log:
> encoding fixes
>
> Modified:
> maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
> maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java
>
> Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java
> URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java?rev=587665&r1=587664&r2=587665&view=diff
> ==============================================================================
> --- maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java (original)
> +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/main/java/org/apache/maven/report/projectinfo/AbstractProjectInfoReport.java Tue Oct 23 14:36:41 2007
> @@ -42,8 +42,9 @@
> import org.codehaus.plexus.i18n.I18N;
>
> import java.io.File;
> -import java.io.FileWriter;
> +import java.io.FileOutputStream;
> import java.io.IOException;
> +import java.io.OutputStreamWriter;
> import java.io.Writer;
> import java.util.HashMap;
> import java.util.Locale;
> @@ -169,7 +170,7 @@
>
> outputDirectory.mkdirs();
>
> - Writer writer = new FileWriter( new File( outputDirectory, getOutputName() + ".html" ) );
> + Writer writer = new OutputStreamWriter( new FileOutputStream( new File( outputDirectory, getOutputName() + ".html" ) ), "UTF-8" );
>
> siteRenderer.generateDocument( writer, sink, siteContext );
>
>
> Modified: maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java
> URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java?rev=587665&r1=587664&r2=587665&view=diff
> ==============================================================================
> --- maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java (original)
> +++ maven/plugins/trunk/maven-project-info-reports-plugin/src/test/java/org/apache/maven/report/projectinfo/stubs/ProjectInfoProjectStub.java Tue Oct 23 14:36:41 2007
> @@ -20,7 +20,8 @@
> */
>
> import java.io.File;
> -import java.io.FileReader;
> +import java.io.FileInputStream;
> +import java.io.InputStreamReader;
> import java.util.ArrayList;
> import java.util.Collections;
> import java.util.List;
> @@ -58,7 +59,8 @@
> MavenXpp3Reader pomReader = new MavenXpp3Reader();
> try
> {
> - model = pomReader.read( new FileReader( new File( getBasedir(), getPOM() ) ) );
> + // TODO use ReaderFactory.newXmlReader() when plexus-util is upgraded to 1.4.5+
> + model = pomReader.read( new InputStreamReader( new FileInputStream( new File( getBasedir(), getPOM() ) ), "UTF-8" ) );
> setModel( model );
> }
> catch ( Exception e )
plexus-utils is already at 1.4.5 for MPIR
--
Dennis Lundberg
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@maven.apache.org
For additional commands, e-mail: dev-help@maven.apache.org