svn commit: r649286 - /maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java

[hb...@apache.org]

Author: hboutemy
Date: Thu Apr 17 14:32:28 2008
New Revision: 649286

URL: http://svn.apache.org/viewvc?rev=649286&view=rev
Log:
[MCOMPILER-70] use ${project.build.sourceEncoding} as default value for "encoding" parameter

Modified:
    maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java

Modified: maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java?rev=649286&r1=649285&r2=649286&view=diff
==============================================================================
--- maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java (original)
+++ maven/plugins/trunk/maven-compiler-plugin/src/main/java/org/apache/maven/plugin/AbstractCompilerMojo.java Thu Apr 17 14:32:28 2008
@@ -122,7 +122,7 @@
      * <br/>
      * <b>Note</b>: Since 2.1, the default value is locked to <code>ISO-8859-1</code> to better reproducing build.
      *
-     * @parameter expression="${maven.compiler.encoding}" default-value="ISO-8859-1"
+     * @parameter expression="${maven.compiler.encoding}" default-value="${project.build.sourceEncoding}"
      */
     private String encoding;
 
@@ -255,6 +255,16 @@
      */
     private CompilerManager compilerManager;
 
+    /**
+     * Gets the source file encoding.
+     *
+     * @return The source file encoding, never <code>null</code>.
+     */
+    protected String getEncoding()
+    {
+        return ( encoding == null ) ? "ISO-8859-1" : encoding;
+    }
+
     protected abstract SourceInclusionScanner getSourceInclusionScanner( int staleMillis );
 
     protected abstract SourceInclusionScanner getSourceInclusionScanner( String inputFileEnding );
@@ -348,7 +358,7 @@
 
         compilerConfiguration.setTargetVersion( target );
 
-        compilerConfiguration.setSourceEncoding( encoding );
+        compilerConfiguration.setSourceEncoding( getEncoding() );
 
         if ( ( compilerArguments != null ) || ( compilerArgument != null ) )
         {