Work on the modular distribution - generate binaries, work on layout.

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

diff --git a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/NormalizeGroup.java b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/NormalizeGroup.java
index 0d1eded0847b9b7131cd4bd7db42e3c5f6e28efa..34e1aee249e0d24fee5d3c76190bb59b64efc536 100644 (file)
--- a/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/NormalizeGroup.java
+++ b/runtime/org.argeo.slc.repo/src/main/java/org/argeo/slc/repo/osgi/NormalizeGroup.java
@@ -178,8 +178,9 @@ public class NormalizeGroup implements Runnable, SlcNames {
                                version = allArtifactsHighestVersion.getProperty(
                                                SLC_ARTIFACT_VERSION).getString();
                        else
-                               throw new SlcException("Group version " + version
-                                               + " is empty.");
+                               version = "0.0";
+//                             throw new SlcException("Group version " + version
+//                                             + " is empty.");
 
                int bundleCount = symbolicNamesToNodes.size();
                if (log.isDebugEnabled())
@@ -243,12 +244,8 @@ public class NormalizeGroup implements Runnable, SlcNames {
 
        protected void preProcessBundleArtifact(Node bundleNode)
                        throws RepositoryException {
-               // we assume nodes are already indexed
-               // artifactIndexer.index(bundleNode);
-               // jarFileIndexer.index(bundleNode);
 
                String symbolicName = JcrUtils.get(bundleNode, SLC_SYMBOLIC_NAME);
-
                if (symbolicName.endsWith(".source")) {
                        // TODO make a shared node with classifier 'sources'?
                        String bundleName = RepoUtils
@@ -313,7 +310,6 @@ public class NormalizeGroup implements Runnable, SlcNames {
                p.append("<modelVersion>4.0.0</modelVersion>");
 
                // Artifact
-               // p.append("<parent><groupId>org.argeo</groupId><artifactId>parent</artifactId><version>1.2.0</version></parent>\n");
                p.append("<groupId>").append(JcrUtils.get(n, SLC_GROUP_ID))
                                .append("</groupId>\n");
                p.append("<artifactId>").append(JcrUtils.get(n, SLC_ARTIFACT_ID))
@@ -362,6 +358,8 @@ public class NormalizeGroup implements Runnable, SlcNames {
 
                // TODO require bundles
 
+               
+               
                List<Node> dependencyNodes = new ArrayList<Node>();
                for (String depSymbName : dependenciesSymbolicNames) {
                        if (depSymbName.equals(ownSymbolicName))