X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=runtime%2Forg.argeo.slc.repo%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Frepo%2Fosgi%2FNormalizeGroup.java;fp=runtime%2Forg.argeo.slc.repo%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Frepo%2Fosgi%2FNormalizeGroup.java;h=34e1aee249e0d24fee5d3c76190bb59b64efc536;hb=1d6a2ecc676aac7dde0491ea5047bebc2ce69e80;hp=0d1eded0847b9b7131cd4bd7db42e3c5f6e28efa;hpb=0dc6d1ec9f5b7fe454bd3ea5101f90d40163faac;p=gpl%2Fargeo-slc.git
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 0d1eded08..34e1aee24 100644
--- 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("4.0.0");
// Artifact
- // p.append("org.argeoparent1.2.0\n");
p.append("").append(JcrUtils.get(n, SLC_GROUP_ID))
.append("\n");
p.append("").append(JcrUtils.get(n, SLC_ARTIFACT_ID))
@@ -362,6 +358,8 @@ public class NormalizeGroup implements Runnable, SlcNames {
// TODO require bundles
+
+
List dependencyNodes = new ArrayList();
for (String depSymbName : dependenciesSymbolicNames) {
if (depSymbName.equals(ownSymbolicName))