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;
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")) {
b.append("<dependencies>\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("</dependencies>\n");
b.append("<dependencies>\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("</dependencies>\n");
b.append("</dependencyManagement>\n");
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("<dependency>\n");
}
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());