First working version of modular distribution creation while running the ProcessDistr...

[gpl/argeo-slc.git] / runtime / org.argeo.slc.repo / src / main / java / org / argeo / slc / repo / osgi / ProcessDistribution.java

diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/ProcessDistribution.java b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/ProcessDistribution.java
index bca8356c92ba70b1f2578d6233bd5809bc685980..d852fb623b249fe9a41312797c484b5db4a139b8 100644 (file)
--- a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/ProcessDistribution.java
+++ b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/ProcessDistribution.java
@@ -12,6 +12,7 @@ import org.argeo.slc.CategorizedNameVersion;
 import org.argeo.slc.NameVersion;
 import org.argeo.slc.SlcException;
 import org.argeo.slc.repo.ArgeoOsgiDistribution;
+import org.argeo.slc.repo.ModularDistributionFactory;
 import org.argeo.slc.repo.OsgiFactory;
 import org.argeo.slc.repo.maven.MavenConventionsUtils;
 import org.sonatype.aether.artifact.Artifact;
@@ -33,8 +34,15 @@ public class ProcessDistribution implements Runnable {
                                        .nameVersions(); it.hasNext();)
                                processNameVersion(javaSession, it.next());
 
-                       // TODO generate distribution indexes (pom.xml, P2, OBR)
+                       ModularDistributionFactory mdf = new ModularDistributionFactory(
+                                       javaSession, osgiDistribution);
+                       mdf.run();
+                       // javaSession.save();
+
                        // osgiFactory.indexNode(node);
+                       // Node artifact = createDistributionArtifact(javaSession,
+                       // osgiDistribution);
+
                } catch (RepositoryException e) {
                        throw new SlcException("Cannot process distribution "
                                        + osgiDistribution, e);
@@ -65,9 +73,9 @@ public class ProcessDistribution implements Runnable {
                        if (log.isDebugEnabled())
                                log.debug("Already available : " + nv);
                }
-
        }
 
+       /* DEPENDENCY INJECTION */
        public void setOsgiDistribution(ArgeoOsgiDistribution osgiDistribution) {
                this.osgiDistribution = osgiDistribution;
        }
@@ -75,5 +83,4 @@ public class ProcessDistribution implements Runnable {
        public void setOsgiFactory(OsgiFactory osgiFactory) {
                this.osgiFactory = osgiFactory;
        }
-
-}
+}
\ No newline at end of file