Make modular distribution more robust

git-svn-id: https://svn.argeo.org/slc/trunk@7621 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/ModularDistributionFactory.java b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/ModularDistributionFactory.java
index f79b4ed4af8e445ca5d6a9785bdabde829cdc952..c4cc89a918badede5bdeacb0c4ba92eeaa48935a 100644 (file)
--- a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/ModularDistributionFactory.java
+++ b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/ModularDistributionFactory.java
@@ -19,7 +19,6 @@ import javax.jcr.nodetype.NodeType;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
-import org.argeo.jcr.JcrUtils;
 import org.argeo.slc.CategorizedNameVersion;
 import org.argeo.slc.NameVersion;
 import org.argeo.slc.SlcException;
@@ -127,7 +126,9 @@ public class ModularDistributionFactory implements Runnable {
                distNode.setProperty(SlcNames.SLC_VERSION,
                                osgiDistribution.getVersion());
 
-               Node modules = JcrUtils.mkdirs(distNode, SlcNames.SLC_MODULES,
+               if (distNode.hasNode(SlcNames.SLC_MODULES))
+                       distNode.getNode(SlcNames.SLC_MODULES).remove();
+               Node modules = distNode.addNode(SlcNames.SLC_MODULES,
                                NodeType.NT_UNSTRUCTURED);
 
                for (Iterator<? extends NameVersion> it = osgiDistribution