[DOXIASITETOOLS-160] Normalize line endings in skin template content on SiteRenderer side rather that Velocity side

• Type: Improvement
• Status: Closed
• Priority: Major
• Resolution: Fixed
• Affects Version/s: 1.7
• Fix Version/s: 1.7.1
• Component/s: Site renderer
• Assignee: Michael Osipov
• Reporter: Michael Osipov
• Created: 06/Mar/16 18:29
• Updated: 06/Mar/16 20:39
• Resolved: 06/Mar/16 20:25

Description

In DOXIASITETOOLS-87 all template line ending is normalied with custom resource loader for Velocity but this is the wrong place because it is not a Velocity problem. This problem is solely at SiteRenderer side.

Revert DOXIASITETOOLS-87 and apply this rather simple patch to solve the problem in the correct spot:

Index: DefaultSiteRenderer.java
===================================================================
--- DefaultSiteRenderer.java	(revision 1733265)
+++ DefaultSiteRenderer.java	(working copy)
@@ -701,7 +698,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 )
             {

Issue Links

• supercedes: DOXIASITETOOLS-87 inconsistent newlines between template content from skin and generated content