[DOXIASITETOOLS-160] Normalize line endings in skin template content on SiteRenderer side rather that Velocity side
git-svn-id: https://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/trunk@1733839 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
index e1ce0a1..cc94f62 100644
--- a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
+++ b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
@@ -54,6 +54,7 @@
import java.util.zip.ZipFile;
import org.apache.commons.lang.ArrayUtils;
+import org.apache.commons.lang.SystemUtils;
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
@@ -701,7 +702,9 @@
try
{
- template.merge( context, writer );
+ StringWriter sw = new StringWriter();
+ template.merge( context, sw );
+ writer.write( sw.toString().replaceAll( "\r?\n", SystemUtils.LINE_SEPARATOR ) );
}
catch ( Exception e )
{
diff --git a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SkinResourceLoader.java b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SkinResourceLoader.java
index 3e4d722..b1bedc4 100644
--- a/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SkinResourceLoader.java
+++ b/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/SkinResourceLoader.java
@@ -33,9 +33,10 @@
/**
* Skin resource loader: gets content from context classloader, which should contain skin artifact,
* and normalizes newlines (see <a href="https://issues.apache.org/jira/browse/DOXIASITETOOLS-87">DOXIASITETOOLS-87</a>.
- *
+ *
* @author Hervé Boutemy
*/
+@Deprecated
public class SkinResourceLoader
extends ResourceLoader
{
@@ -69,7 +70,7 @@
byte[] content = IOUtil.toByteArray( in );
// following code based on org.apache.maven.doxia.sink.AbstractSink.unifyEOLs(String)
-
+
byte[] eol = System.getProperty( "line.separator" ).getBytes();
final int size = content.length;
