X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.repo%2Fsrc%2Forg%2Fargeo%2Fslc%2Frepo%2Fosgi%2FProcessDistribution.java;h=7d5d77900536796ec85ae289868a81c218a55067;hb=305ecfa036fac8562fbb3af875c6ecf5822b6dcb;hp=74c54252827a4d3c9330ba14c2d68fd017ca5981;hpb=40fb326ca1e1e45f95e3a89c23fc3d07177da20d;p=gpl%2Fargeo-slc.git diff --git a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ProcessDistribution.java b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ProcessDistribution.java index 74c542528..7d5d77900 100644 --- a/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ProcessDistribution.java +++ b/org.argeo.slc.repo/src/org/argeo/slc/repo/osgi/ProcessDistribution.java @@ -8,8 +8,7 @@ import javax.jcr.Session; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.argeo.jcr.JcrUtils; -import org.argeo.slc.CategorizedNameVersion; -import org.argeo.slc.DefaultNameVersion; +import org.argeo.slc.CategoryNameVersion; import org.argeo.slc.NameVersion; import org.argeo.slc.SlcException; import org.argeo.slc.repo.ArgeoOsgiDistribution; @@ -37,7 +36,7 @@ public class ProcessDistribution implements Runnable { // Check sources for (Iterator it = osgiDistribution .nameVersions(); it.hasNext();) { - CategorizedNameVersion nv = (CategorizedNameVersion) it.next(); + CategoryNameVersion nv = (CategoryNameVersion) it.next(); Artifact artifact = new DefaultArtifact(nv.getCategory(), nv.getName() + ".source", "jar", nv.getVersion()); String path = MavenConventionsUtils.artifactPath("/", artifact); @@ -63,9 +62,9 @@ public class ProcessDistribution implements Runnable { NameVersion nameVersion) throws RepositoryException { if (log.isTraceEnabled()) log.trace("Check " + nameVersion + "..."); - if (!(nameVersion instanceof CategorizedNameVersion)) + if (!(nameVersion instanceof CategoryNameVersion)) throw new SlcException("Unsupported type " + nameVersion.getClass()); - CategorizedNameVersion nv = (CategorizedNameVersion) nameVersion; + CategoryNameVersion nv = (CategoryNameVersion) nameVersion; Artifact artifact = new DefaultArtifact(nv.getCategory(), nv.getName(), "jar", nv.getVersion()); String path = MavenConventionsUtils.artifactPath("/", artifact);