This is an automated email from the ASF dual-hosted git repository. rombert pushed a commit to annotated tag org.apache.sling.provisioning.model-1.0.0 in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-provisioning-model.git
commit 43e7bcfe1c00baa454994b33fc203f151adbfd9e Author: Carsten Ziegeler <cziege...@apache.org> AuthorDate: Wed Oct 8 15:39:55 2014 +0000 Fix writing out raw configs git-svn-id: https://svn.apache.org/repos/asf/sling/trunk/tooling/support/provisioning-model@1630147 13f79535-47bb-0310-9956-ffa450edef68 --- src/main/java/org/apache/sling/provisioning/model/ModelUtility.java | 4 +--- src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java | 1 + 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java b/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java index d2536c5..cb711a9 100644 --- a/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java +++ b/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java @@ -147,7 +147,7 @@ public abstract class ModelUtility { newRunMode.getConfigurations().setComment(runMode.getConfigurations().getComment()); newRunMode.getConfigurations().setLocation(runMode.getConfigurations().getLocation()); for(final Configuration config : runMode.getConfigurations()) { - final Configuration newConfig = new Configuration(config.getPid(), config.getFactoryPid()); + final Configuration newConfig = newRunMode.getOrCreateConfiguration(config.getPid(), config.getFactoryPid()); newConfig.setComment(config.getComment()); newConfig.setLocation(config.getLocation()); @@ -205,8 +205,6 @@ public abstract class ModelUtility { newConfig.getProperties().put(key, config.getProperties().get(key)); } } - - newRunMode.getConfigurations().add(newConfig); } newRunMode.getSettings().setComment(runMode.getSettings().getComment()); diff --git a/src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java b/src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java index 3f371c6..09a5c6c 100644 --- a/src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java +++ b/src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java @@ -211,6 +211,7 @@ public class ModelWriter { } pw.print(" "); pw.println(line.trim()); + pw.println(); } pw.println(); } -- To stop receiving notification emails like this one, please contact "commits@sling.apache.org" <commits@sling.apache.org>.