X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=org.argeo.slc.repo%2Fsrc%2Forg%2Fargeo%2Fslc%2Frepo%2FModularDistributionFactory.java;h=19627d8ffdc7db66939a8498d0d7d159716c6092;hb=58b35f147f3c1c1a12a07c303105618f679c7161;hp=25b6c48c4f9f4d1d5408c4c0464e6d8586f0b5dc;hpb=94c490f2eca7bf99909070353d498d232e105810;p=gpl%2Fargeo-slc.git
diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/ModularDistributionFactory.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/ModularDistributionFactory.java
index 25b6c48c4..19627d8ff 100644
--- a/org.argeo.slc.repo/src/org/argeo/slc/repo/ModularDistributionFactory.java
+++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/ModularDistributionFactory.java
@@ -22,7 +22,7 @@ import javax.jcr.Session;
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.CategoryNameVersion;
import org.argeo.slc.NameVersion;
import org.argeo.slc.SlcException;
import org.eclipse.aether.artifact.Artifact;
@@ -149,7 +149,7 @@ public class ModularDistributionFactory implements Runnable {
addManifestAttribute(manifest, Constants.BUNDLE_NAME, osgiDistribution.getName());
// Categorized name version
- addManifestAttribute(manifest, RepoConstants.SLC_GROUP_ID, osgiDistribution.getCategory());
+ addManifestAttribute(manifest, RepoConstants.SLC_CATEGORY_ID, osgiDistribution.getCategory());
addManifestAttribute(manifest, Constants.BUNDLE_SYMBOLICNAME, osgiDistribution.getName());
String version = osgiDistribution.getVersion();
if (version.endsWith("-SNAPSHOT")) {
@@ -413,9 +413,9 @@ public class ModularDistributionFactory implements Runnable {
b.append("\n");
for (Iterator extends NameVersion> it = osgiDistribution.nameVersions(); it.hasNext();) {
NameVersion nameVersion = it.next();
- if (!(nameVersion instanceof CategorizedNameVersion))
+ if (!(nameVersion instanceof CategoryNameVersion))
throw new SlcException("Unsupported type " + nameVersion.getClass());
- CategorizedNameVersion nv = (CategorizedNameVersion) nameVersion;
+ CategoryNameVersion nv = (CategoryNameVersion) nameVersion;
b.append(getDependencySnippet(nv, false));
}
b.append("\n");
@@ -425,7 +425,7 @@ public class ModularDistributionFactory implements Runnable {
b.append("\n");
for (Iterator extends NameVersion> it = osgiDistribution.nameVersions(); it.hasNext();)
- b.append(getDependencySnippet((CategorizedNameVersion) it.next(), true));
+ b.append(getDependencySnippet((CategoryNameVersion) it.next(), true));
b.append("\n");
b.append("\n");
@@ -433,7 +433,7 @@ public class ModularDistributionFactory implements Runnable {
return b.toString().getBytes();
}
- private String getDependencySnippet(CategorizedNameVersion cnv, boolean includeVersion) { // , String type, String
+ private String getDependencySnippet(CategoryNameVersion cnv, boolean includeVersion) { // , String type, String
// scope
StringBuilder b = new StringBuilder();
b.append("\n");
@@ -469,9 +469,9 @@ public class ModularDistributionFactory implements Runnable {
}
private String getCsvLine(NameVersion nameVersion) throws RepositoryException {
- if (!(nameVersion instanceof CategorizedNameVersion))
+ if (!(nameVersion instanceof CategoryNameVersion))
throw new SlcException("Unsupported type " + nameVersion.getClass());
- CategorizedNameVersion cnv = (CategorizedNameVersion) nameVersion;
+ CategoryNameVersion cnv = (CategoryNameVersion) nameVersion;
StringBuilder builder = new StringBuilder();
builder.append(cnv.getName());