You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by cz...@apache.org on 2014/10/08 17:39:56 UTC
svn commit: r1630147 - in
/sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model:
ModelUtility.java io/ModelWriter.java
Author: cziegeler
Date: Wed Oct 8 15:39:55 2014
New Revision: 1630147
URL: http://svn.apache.org/r1630147
Log:
Fix writing out raw configs
Modified:
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java
sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java
Modified: sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java?rev=1630147&r1=1630146&r2=1630147&view=diff
==============================================================================
--- sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java (original)
+++ sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/ModelUtility.java Wed Oct 8 15:39:55 2014
@@ -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());
Modified: sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java
URL: http://svn.apache.org/viewvc/sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java?rev=1630147&r1=1630146&r2=1630147&view=diff
==============================================================================
--- sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java (original)
+++ sling/trunk/tooling/support/provisioning-model/src/main/java/org/apache/sling/provisioning/model/io/ModelWriter.java Wed Oct 8 15:39:55 2014
@@ -211,6 +211,7 @@ public class ModelWriter {
}
pw.print(" ");
pw.println(line.trim());
+ pw.println();
}
pw.println();
}