Author: alien11689 Date: Sun Jan 15 14:46:54 2017 New Revision: 1778928 URL: http://svn.apache.org/viewvc?rev=1778928&view=rev Log: [ARIES-1664] Format generated blueprint XML
Added: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/cdi/CdiTransactionFactory.java - copied unchanged from r1778754, aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/javax/cdi/CdiTransactionFactory.java Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/config/ConfigWriter.java aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/pax/OsgiServiceProviderHandler.java Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml?rev=1778928&r1=1778927&r2=1778928&view=diff ============================================================================== --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/pom.xml Sun Jan 15 14:46:54 2017 @@ -273,6 +273,12 @@ <artifactId>junit</artifactId> <scope>test</scope> </dependency> + + <dependency> + <groupId>org.glassfish.jaxb</groupId> + <artifactId>txw2</artifactId> + <version>2.2.11</version> + </dependency> </dependencies> Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java?rev=1778928&r1=1778927&r2=1778928&view=diff ============================================================================== --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/Generator.java Sun Jan 15 14:46:54 2017 @@ -18,11 +18,12 @@ */ package org.apache.aries.blueprint.plugin; +import com.sun.xml.txw2.output.IndentingXMLStreamWriter; import org.apache.aries.blueprint.plugin.model.Argument; import org.apache.aries.blueprint.plugin.model.ArgumentWriter; import org.apache.aries.blueprint.plugin.model.Bean; -import org.apache.aries.blueprint.plugin.model.Context; import org.apache.aries.blueprint.plugin.model.BeanFromFactory; +import org.apache.aries.blueprint.plugin.model.Context; import org.apache.aries.blueprint.plugin.model.Property; import org.apache.aries.blueprint.plugin.model.PropertyWriter; import org.apache.aries.blueprint.plugin.spi.BlueprintConfiguration; @@ -34,6 +35,7 @@ import javax.xml.stream.XMLStreamWriter; import java.io.OutputStream; import java.util.Map; + public class Generator implements PropertyWriter, ArgumentWriter { private static final String NS_BLUEPRINT = "http://www.osgi.org/xmlns/blueprint/v1.0.0"; private static final String NS_EXT = "http://aries.apache.org/blueprint/xmlns/blueprint-ext/v1.0.0"; @@ -45,34 +47,31 @@ public class Generator implements Proper public Generator(Context context, OutputStream os, BlueprintConfiguration blueprintConfiguration) throws XMLStreamException { this.context = context; this.blueprintConfiguration = blueprintConfiguration; - XMLOutputFactory factory = XMLOutputFactory.newInstance(); - writer = factory.createXMLStreamWriter(os); + writer = createWriter(os); + } + + private XMLStreamWriter createWriter(OutputStream os) throws XMLStreamException { + return new IndentingXMLStreamWriter(XMLOutputFactory.newInstance().createXMLStreamWriter(os)); } public void generate() { try { writer.writeStartDocument(); - writer.writeCharacters("\n"); writeBlueprint(); - writer.writeCharacters("\n"); for (Bean bean : context.getBeans()) { writeBeanStart(bean); bean.writeArguments(this); bean.writeProperties(this); writer.writeEndElement(); - writer.writeCharacters("\n"); } for (XmlWriter bw : context.getBlueprintWriters().values()) { bw.write(writer); - writer.writeCharacters("\n"); } writer.writeEndElement(); - writer.writeCharacters("\n"); writer.writeEndDocument(); - writer.writeCharacters("\n"); writer.close(); } catch (XMLStreamException e) { throw new RuntimeException(e.getMessage(), e); @@ -106,12 +105,8 @@ public class Generator implements Proper if (bean instanceof BeanFromFactory) { writeFactory((BeanFromFactory) bean); } - writer.writeCharacters("\n"); - for (XmlWriter xmlWriter : bean.beanContentWriters.values()) { - writer.writeCharacters(" "); xmlWriter.write(writer); - writer.writeCharacters("\n"); } } @@ -123,7 +118,6 @@ public class Generator implements Proper @Override public void writeProperty(Property property) { try { - writer.writeCharacters(" "); writer.writeEmptyElement("property"); writer.writeAttribute("name", property.name); if (property.ref != null) { @@ -131,7 +125,6 @@ public class Generator implements Proper } else if (property.value != null) { writer.writeAttribute("value", property.value); } - writer.writeCharacters("\n"); } catch (XMLStreamException e) { throw new RuntimeException(e.getMessage(), e); } @@ -140,14 +133,12 @@ public class Generator implements Proper @Override public void writeArgument(Argument argument) { try { - writer.writeCharacters(" "); writer.writeEmptyElement("argument"); if (argument.getRef() != null) { writer.writeAttribute("ref", argument.getRef()); } else if (argument.getValue() != null) { writer.writeAttribute("value", argument.getValue()); } - writer.writeCharacters("\n"); } catch (XMLStreamException e) { throw new RuntimeException(e.getMessage(), e); } Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/config/ConfigWriter.java URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/config/ConfigWriter.java?rev=1778928&r1=1778927&r2=1778928&view=diff ============================================================================== --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/config/ConfigWriter.java (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/config/ConfigWriter.java Sun Jan 15 14:46:54 2017 @@ -46,20 +46,16 @@ public class ConfigWriter implements Xml writer.writeAttribute("placeholder-suffix", config.updatePolicy()); } writer.writeAttribute("update-strategy", config.updatePolicy()); - writer.writeCharacters("\n"); - + DefaultProperty[] defaults = config.defaults(); if (defaults.length > 0) { writer.writeStartElement("default-properties"); - writer.writeCharacters("\n"); for (DefaultProperty defaultProp : defaults) { writer.writeEmptyElement("property"); writer.writeAttribute("name", defaultProp.key()); writer.writeAttribute("value", defaultProp.value()); - writer.writeCharacters("\n"); } writer.writeEndElement(); - writer.writeCharacters("\n"); } writer.writeEndElement(); } Modified: aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/pax/OsgiServiceProviderHandler.java URL: http://svn.apache.org/viewvc/aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/pax/OsgiServiceProviderHandler.java?rev=1778928&r1=1778927&r2=1778928&view=diff ============================================================================== --- aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/pax/OsgiServiceProviderHandler.java (original) +++ aries/trunk/blueprint/plugin/blueprint-maven-plugin/src/main/java/org/apache/aries/blueprint/plugin/pax/OsgiServiceProviderHandler.java Sun Jan 15 14:46:54 2017 @@ -115,20 +115,13 @@ public class OsgiServiceProviderHandler } private void writeInterfacesElement(XMLStreamWriter writer, Iterable<String> interfaceNames) throws XMLStreamException { - writer.writeCharacters("\n"); - writer.writeCharacters(" "); writer.writeStartElement("interfaces"); - writer.writeCharacters("\n"); for (String interfaceName : interfaceNames) { - writer.writeCharacters(" "); writer.writeStartElement("value"); writer.writeCharacters(interfaceName); writer.writeEndElement(); - writer.writeCharacters("\n"); } - writer.writeCharacters(" "); writer.writeEndElement(); - writer.writeCharacters("\n"); } private void writeRanking(XMLStreamWriter writer, Map<String, String> propertiesAsMap) throws XMLStreamException { @@ -143,20 +136,14 @@ public class OsgiServiceProviderHandler } private void writeProperties(XMLStreamWriter writer, Map<String, String> properties) throws XMLStreamException { - writer.writeCharacters(" "); writer.writeStartElement("service-properties"); - writer.writeCharacters("\n"); for (Map.Entry<String, String> property : properties.entrySet()) { if (!SPECIAL_PROPERTIES.contains(property.getKey())) { - writer.writeCharacters(" "); writer.writeEmptyElement("entry"); writer.writeAttribute("key", property.getKey()); writer.writeAttribute("value", property.getValue()); - writer.writeCharacters("\n"); } } - writer.writeCharacters(" "); writer.writeEndElement(); - writer.writeCharacters("\n"); } }