diff options
| author | Manuel Bentele | 2022-02-04 12:19:44 +0100 |
|---|---|---|
| committer | Manuel Bentele | 2022-02-04 12:19:44 +0100 |
| commit | 255c829b598a7a3151489e7121c56b219e530777 (patch) | |
| tree | 2bd704054b6b3663b3bd9abbcc4604dace7da176 /src/main | |
| parent | Fix resource path for virtualizer config tests on Windows platforms (diff) | |
| download | master-sync-shared-255c829b598a7a3151489e7121c56b219e530777.tar.gz master-sync-shared-255c829b598a7a3151489e7121c56b219e530777.tar.xz master-sync-shared-255c829b598a7a3151489e7121c56b219e530777.zip | |
Force Unix line endings for Libvirt XML files (even on Windows platforms)
Diffstat (limited to 'src/main')
3 files changed, 9 insertions, 4 deletions
diff --git a/src/main/java/org/openslx/libvirt/xml/LibvirtXmlDocument.java b/src/main/java/org/openslx/libvirt/xml/LibvirtXmlDocument.java index f24ba4f..97180e3 100644 --- a/src/main/java/org/openslx/libvirt/xml/LibvirtXmlDocument.java +++ b/src/main/java/org/openslx/libvirt/xml/LibvirtXmlDocument.java @@ -312,7 +312,7 @@ public abstract class LibvirtXmlDocument implements LibvirtXmlSerializable, Libv DOMSource source = new DOMSource( this.xmlDocument ); StreamResult xmlString = new StreamResult( xmlWriter ); this.xmlTransformer.transform( source, xmlString ); - xml = xmlWriter.toString() + System.lineSeparator(); + xml = xmlWriter.toString(); xmlWriter.close(); } catch ( TransformerException | IOException e ) { throw new LibvirtXmlSerializationException( e.getLocalizedMessage() ); @@ -337,7 +337,6 @@ public abstract class LibvirtXmlDocument implements LibvirtXmlSerializable, Libv DOMSource source = new DOMSource( this.xmlDocument ); StreamResult xmlStream = new StreamResult( xmlWriter ); this.xmlTransformer.transform( source, xmlStream ); - xmlWriter.append( System.lineSeparator() ); xmlWriter.close(); } catch ( TransformerException | IOException e ) { throw new LibvirtXmlSerializationException( e.getLocalizedMessage() ); diff --git a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java index ced9160..7082e27 100644 --- a/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java +++ b/src/main/java/org/openslx/virtualization/configuration/VirtualizationConfigurationQemu.java @@ -746,7 +746,7 @@ public class VirtualizationConfigurationQemu extends VirtualizationConfiguration return null; } else { // append newline at the end of the XML content to match the structure of an original Libvirt XML file - configuration += System.lineSeparator(); + //configuration += LibvirtXmlDocument.LINE_SEPARATOR; return configuration.getBytes( StandardCharsets.UTF_8 ); } } diff --git a/src/main/resources/libvirt/xsl/xml-output-transformation.xsl b/src/main/resources/libvirt/xsl/xml-output-transformation.xsl index febed54..8cd615d 100644 --- a/src/main/resources/libvirt/xsl/xml-output-transformation.xsl +++ b/src/main/resources/libvirt/xsl/xml-output-transformation.xsl @@ -2,11 +2,17 @@ xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xalan="http://xml.apache.org/xalan"> <xsl:output method="xml" omit-xml-declaration="yes" - encoding="UTF-8" indent="yes" xalan:indent-amount="2" /> + encoding="UTF-8" indent="yes" xalan:indent-amount="2" + xalan:line-separator=" " /> <xsl:strip-space elements="*" /> <xsl:template match="@*|node()"> <xsl:copy> <xsl:apply-templates select="@*|node()" /> </xsl:copy> </xsl:template> + <xsl:template match="/"> + <xsl:apply-templates /> + <xsl:text> </xsl:text> + <xsl:text> </xsl:text> + </xsl:template> </xsl:stylesheet> |