fix non-bundle naming in repository tree

Signed-off-by: Raymond Augé <[email protected]>

Signed-off-by: BJ Hargrave <[email protected]>

bndtools.m2e/src/bndtools/m2e/MavenBndrunContainer.java

@@ -4,6 +4,7 @@
 import static aQute.lib.exceptions.FunctionWithException.asFunction;
 
 import java.io.File;
+import java.util.Map;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;
@@ -15,6 +16,7 @@
 import org.bndtools.api.ILogger;
 import org.bndtools.api.Logger;
 import org.eclipse.aether.RepositorySystem;
+import org.eclipse.aether.resolution.ArtifactResult;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.m2e.core.MavenPlugin;
 import org.eclipse.m2e.core.embedder.IMavenExecutionContext;
@@ -162,12 +164,11 @@ public Bndrun init(File runFile, String task, File workingDir) throws Exception
 			(c, m) -> unchecked(() -> bndrunContainer.init(runFile, task, workingDir)), monitor);
 	}
 
-	public Set<File> resolve() throws Exception {
+	public Map<File, ArtifactResult> resolve() throws Exception {
 		return context.execute( //
 			(c, m) -> unchecked(() -> bndrunContainer.getDependencyResolver(mavenProject)
 				.resolve()),
-			monitor)
-			.keySet();
+			monitor);
 	}
 
 }

bndtools.m2e/src/bndtools/m2e/MavenDependenciesRepository.java

@@ -1,10 +1,16 @@
 package bndtools.m2e;
 
-import java.io.File;
 import java.util.Arrays;
+import java.util.Collections;
 import java.util.HashSet;
 import java.util.Set;
 
+import org.eclipse.aether.artifact.Artifact;
+import org.eclipse.aether.repository.ArtifactRepository;
+import org.eclipse.aether.repository.LocalRepository;
+import org.eclipse.aether.repository.RemoteRepository;
+import org.eclipse.aether.repository.WorkspaceRepository;
+import org.eclipse.aether.resolution.ArtifactResult;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.m2e.core.project.IMavenProjectChangedListener;
 import org.eclipse.m2e.core.project.IMavenProjectFacade;
@@ -31,10 +37,10 @@ public String getName() {
 	}
 
 	@Override
-	Set<File> collect(IMavenProjectFacade projectFacade, IProgressMonitor monitor) {
+	Set<Artifact> collect(IMavenProjectFacade projectFacade, IProgressMonitor monitor) {
 		logger.debug("{}: Collecting files for project {}", getName(), projectFacade.getProject());
 
-		Set<File> files = new HashSet<>();
+		Set<Artifact> files = new HashSet<>();
 
 		if (!isValid(projectFacade.getProject())) {
 			logger.debug("{}: Project {} determined invalid", getName(), projectFacade.getProject());
@@ -43,17 +49,46 @@ Set<File> collect(IMavenProjectFacade projectFacade, IProgressMonitor monitor) {
 		}
 
 		try {
-			MavenBndrunContainer mavenBndrunContainer = MavenBndrunContainer.getBndrunContainer(projectFacade, null, true,
-				true, allScopes, monitor);
+			MavenBndrunContainer mavenBndrunContainer = MavenBndrunContainer.getBndrunContainer(projectFacade, null,
+				true, true, allScopes, monitor);
+
 			mavenBndrunContainer.resolve()
+				.values()
+				.stream()
+				.map(
+					this::fromArtifactResult)
 				.forEach(files::add);
 
-			logger.debug("{}: Collected files {} for project {}", getName(), files, projectFacade.getProject());
+			logger.debug("{}: Collected artifacts {} for project {}", getName(), files, projectFacade.getProject());
 		} catch (Exception e) {
-			logger.error("{}: Failed to collect files for project {}", getName(), projectFacade.getProject(), e);
+			logger.error("{}: Failed to collect artifacts for project {}", getName(), projectFacade.getProject(), e);
 		}
 
 		return files;
 	}
 
+	private Artifact fromArtifactResult(ArtifactResult ar) {
+		ArtifactRepository repository = ar.getRepository();
+		String from = "";
+
+		if (repository instanceof LocalRepository) {
+			LocalRepository localRepository = (LocalRepository) repository;
+
+			from = localRepository
+				.getBasedir()
+				.getAbsolutePath();
+		} else if (repository instanceof RemoteRepository) {
+			RemoteRepository remoteRepository = (RemoteRepository) repository;
+
+			from = remoteRepository.getUrl();
+		} else if (repository instanceof WorkspaceRepository) {
+			WorkspaceRepository workspaceRepository = (WorkspaceRepository) repository;
+
+			from = workspaceRepository.getId();
+		}
+
+		return ar.getArtifact()
+			.setProperties(Collections.singletonMap("from", from));
+	}
+
 }