From c6a0dd6b017660d2db715881113f74af4f91e968 Mon Sep 17 00:00:00 2001
From: Sebastian Sdorra <sebastian.sdorra@cloudogu.com>
Date: Mon, 20 May 2013 17:34:16 +0200
Subject: [PATCH] added indent spaces to security.xml

---
 .../java/sonia/scm/xml/IndentXMLStreamWriter.java  | 14 +++++++++-----
 .../scm/store/JAXBConfigurationEntryStore.java     | 13 +++++++++----
 2 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/scm-core/src/main/java/sonia/scm/xml/IndentXMLStreamWriter.java b/scm-core/src/main/java/sonia/scm/xml/IndentXMLStreamWriter.java
index fb5ac62872..a4ec457dd1 100644
--- a/scm-core/src/main/java/sonia/scm/xml/IndentXMLStreamWriter.java
+++ b/scm-core/src/main/java/sonia/scm/xml/IndentXMLStreamWriter.java
@@ -227,7 +227,7 @@ public final class IndentXMLStreamWriter implements XMLStreamWriter
   public void writeEndDocument() throws XMLStreamException
   {
     writer.writeEndDocument();
-    writer.writeCharacters(LINE_SEPARATOR);
+    writeLineSeparator();
   }
 
   /**
@@ -286,7 +286,7 @@ public final class IndentXMLStreamWriter implements XMLStreamWriter
   public void writeStartDocument() throws XMLStreamException
   {
     writer.writeStartDocument();
-    writer.writeCharacters(LINE_SEPARATOR);
+    writeLineSeparator();
   }
 
   /**
@@ -296,7 +296,7 @@ public final class IndentXMLStreamWriter implements XMLStreamWriter
   public void writeStartDocument(String version) throws XMLStreamException
   {
     writer.writeStartDocument(version);
-    writer.writeCharacters(LINE_SEPARATOR);
+    writeLineSeparator();
   }
 
   /**
@@ -307,7 +307,7 @@ public final class IndentXMLStreamWriter implements XMLStreamWriter
     throws XMLStreamException
   {
     writer.writeStartDocument(encoding, version);
-    writer.writeCharacters(LINE_SEPARATOR);
+    writeLineSeparator();
   }
 
   /**
@@ -401,6 +401,10 @@ public final class IndentXMLStreamWriter implements XMLStreamWriter
   {
     writer.setPrefix(prefix, uri);
   }
+  
+  public void writeLineSeparator() throws XMLStreamException{
+    writer.writeCharacters(LINE_SEPARATOR);
+  }
 
   //~--- methods --------------------------------------------------------------
 
@@ -434,7 +438,7 @@ public final class IndentXMLStreamWriter implements XMLStreamWriter
 
     if (level == 0)
     {
-      writer.writeCharacters(LINE_SEPARATOR);
+      writeLineSeparator();
     }
 
     lastWasStart = false;
diff --git a/scm-dao-xml/src/main/java/sonia/scm/store/JAXBConfigurationEntryStore.java b/scm-dao-xml/src/main/java/sonia/scm/store/JAXBConfigurationEntryStore.java
index 6eeb25d96b..0aecc82c9c 100644
--- a/scm-dao-xml/src/main/java/sonia/scm/store/JAXBConfigurationEntryStore.java
+++ b/scm-dao-xml/src/main/java/sonia/scm/store/JAXBConfigurationEntryStore.java
@@ -41,6 +41,7 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import sonia.scm.security.KeyGenerator;
+import sonia.scm.xml.IndentXMLStreamWriter;
 
 //~--- JDK imports ------------------------------------------------------------
 
@@ -348,18 +349,22 @@ public class JAXBConfigurationEntryStore<V>
   {
     logger.debug("store configuration to {}", file);
 
-    XMLStreamWriter writer = null;
+    IndentXMLStreamWriter writer = null;
 
     try
     {
-      writer = XMLOutputFactory.newFactory().createXMLStreamWriter(
-        new FileOutputStream(file));
+      //J-
+      writer = new IndentXMLStreamWriter(
+        XMLOutputFactory.newFactory().createXMLStreamWriter(
+          new FileOutputStream(file)
+        )
+      );
+      //J+
       writer.writeStartDocument();
       writer.writeStartElement(TAG_CONFIGURATION);
 
       Marshaller m = context.createMarshaller();
 
-      m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
       m.setProperty(Marshaller.JAXB_FRAGMENT, Boolean.TRUE);
 
       for (Entry<String, V> e : entries.entrySet())