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=d16a797420f7f39c71d5887bd76485134be1b614;hpb=b9505fef5ba8186433e903e9de3c73c17bdf6562;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 d16a79742..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,16 +8,15 @@ 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;
 import org.argeo.slc.repo.ModularDistributionFactory;
 import org.argeo.slc.repo.OsgiFactory;
 import org.argeo.slc.repo.maven.MavenConventionsUtils;
-import org.sonatype.aether.artifact.Artifact;
-import org.sonatype.aether.util.artifact.DefaultArtifact;
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.artifact.DefaultArtifact;
 
 /** Executes the processes required so that all managed bundles are available. */
 public class ProcessDistribution implements Runnable {
@@ -37,7 +36,7 @@ public class ProcessDistribution implements Runnable {
 			// Check sources
 			for (Iterator<? extends NameVersion> 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);