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 2012/03/31 23:37:39 UTC
svn commit: r1307912 -
/maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishMojo.java
Author: hboutemy
Date: Sat Mar 31 21:37:39 2012
New Revision: 1307912
URL: http://svn.apache.org/viewvc?rev=1307912&view=rev
Log:
limit files with new line normalization
Modified:
maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishMojo.java
Modified: maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishMojo.java
URL: http://svn.apache.org/viewvc/maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishMojo.java?rev=1307912&r1=1307911&r2=1307912&view=diff
==============================================================================
--- maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishMojo.java (original)
+++ maven/sandbox/trunk/plugins/maven-site-scm-publish-plugin/src/main/java/org/apache/maven/plugins/scmpublish/ScmPublishPublishMojo.java Sat Mar 31 21:37:39 2012
@@ -35,6 +35,7 @@ import java.util.Set;
import java.util.TreeSet;
import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.MojoFailureException;
@@ -77,15 +78,25 @@ public class ScmPublishPublishMojo
*/
private String checkinComment;
+ /**
+ * Filename extensions of files which need new line normalization.
+ */
+ private final static String[] NORMALIZE_EXTENSIONS = { "html", "css", "js" };
+
private File relativize( File base, File file )
{
return new File( base.toURI().relativize( file.toURI() ).getPath() );
}
+ private boolean requireNormalizeNewlines( File f )
+ throws IOException
+ {
+ return FilenameUtils.isExtension( f.getName(), NORMALIZE_EXTENSIONS );
+ }
+
private void normalizeNewlines( File f )
throws IOException
{
- // FIXME: only text files should be normalized, not binary
File tmpFile = null;
BufferedReader in = null;
PrintWriter out = null;
@@ -123,7 +134,10 @@ public class ScmPublishPublishMojo
{
try
{
- normalizeNewlines( f );
+ if ( requireNormalizeNewlines( f ) )
+ {
+ normalizeNewlines( f );
+ }
}
catch ( IOException e )
{