Author: hboutemy
Date: Sun Apr 6 09:25:59 2008
New Revision: 645260
URL: http://svn.apache.org/viewvc?rev=645260&view=rev
Log:
[JXR-60] added support for project.build.sourceEncoding property
Modified:
maven/sandbox/branches/MNG-2216/JXR-60/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java
maven/sandbox/branches/MNG-2216/JXR-60/maven-jxr/pom.xml
Modified:
maven/sandbox/branches/MNG-2216/JXR-60/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java
URL:
http://svn.apache.org/viewvc/maven/sandbox/branches/MNG-2216/JXR-60/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java?rev=645260&r1=645259&r2=645260&view=diff
==============================================================================
---
maven/sandbox/branches/MNG-2216/JXR-60/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java
(original)
+++
maven/sandbox/branches/MNG-2216/JXR-60/maven-jxr-plugin/src/main/java/org/apache/maven/plugin/jxr/AbstractJxrReport.java
Sun Apr 6 09:25:59 2008
@@ -39,6 +39,7 @@
import org.apache.maven.reporting.AbstractMavenReport;
import org.apache.maven.reporting.MavenReportException;
import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.ReaderFactory;
import org.codehaus.plexus.util.StringUtils;
/**
@@ -77,7 +78,7 @@
/**
* File input encoding.
*
- * @parameter default-value="ISO-8859-1"
+ * @parameter expression="${encoding}"
default-value="${project.build.sourceEncoding}"
*/
private String inputEncoding;
@@ -239,6 +240,16 @@
}
/**
+ * Gets the source file encoding.
+ *
+ * @return The source file encoding, never <code>null</code>.
+ */
+ protected String getInputEncoding()
+ {
+ return ( inputEncoding == null ) ? ReaderFactory.ISO_8859_1 :
inputEncoding;
+ }
+
+ /**
* Creates the Xref for the Java files found in the given source directory
and puts
* them in the given destination directory.
*
@@ -254,7 +265,7 @@
{
JXR jxr = new JXR();
jxr.setDest( destinationDirectory );
- jxr.setInputEncoding( inputEncoding );
+ jxr.setInputEncoding( getInputEncoding() );
jxr.setLocale( locale );
jxr.setLog( new PluginLogAdapter( getLog() ) );
jxr.setOutputEncoding( outputEncoding );
Modified: maven/sandbox/branches/MNG-2216/JXR-60/maven-jxr/pom.xml
URL:
http://svn.apache.org/viewvc/maven/sandbox/branches/MNG-2216/JXR-60/maven-jxr/pom.xml?rev=645260&r1=645259&r2=645260&view=diff
==============================================================================
--- maven/sandbox/branches/MNG-2216/JXR-60/maven-jxr/pom.xml (original)
+++ maven/sandbox/branches/MNG-2216/JXR-60/maven-jxr/pom.xml Sun Apr 6
09:25:59 2008
@@ -110,9 +110,9 @@
<version>2.0.7</version>
</dependency>
<dependency>
- <groupId>plexus</groupId>
+ <groupId>org.codehaus.plexus</groupId>
<artifactId>plexus-utils</artifactId>
- <version>1.0.3</version>
+ <version>1.5.1</version>
</dependency>
<dependency>
<groupId>velocity</groupId>
