X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.slc.agent%2Fsrc%2Fmain%2Fjava%2Forg%2Fargeo%2Fslc%2Fmaven%2FMavenManager.java;h=236d718503b99a10f72023762f6bc923ae183a75;hb=6db299ae52f556d428415d532ef47cbe252282c0;hp=3a07e227a447f2be8a62ef67d0b7a86d37e32ac9;hpb=a7b136d40c14e4559faa5c34dc2b4dd2170ac2d4;p=gpl%2Fargeo-slc.git

diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/maven/MavenManager.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/maven/MavenManager.java
index 3a07e227a..236d71850 100644
--- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/maven/MavenManager.java
+++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/maven/MavenManager.java
@@ -16,12 +16,11 @@ import org.argeo.slc.core.SlcException;
 public class MavenManager {
 	private final Log log = LogFactory.getLog(getClass());
 
-	private String repositoryId;
-	private String repositoryUrl;
 	private String localRepositoryPath;
 
 	private ArtifactRepository localRepository;
-	private List<ArtifactRepository> remoteRepositories;
+	private List<ArtifactRepository> remoteRepositoriesInternal;
+	private List<RemoteRepository> remoteRepositories = new Vector<RemoteRepository>();
 
 	private MavenEmbedder mavenEmbedder;
 
@@ -38,14 +37,14 @@ public class MavenManager {
 
 			localRepository = mavenEmbedder.getLocalRepository();
 
-			// localRepository = mavenEmbedder.createLocalRepository(new File(
-			// localRepositoryPath));
+			remoteRepositoriesInternal = new Vector<ArtifactRepository>();
+			for (RemoteRepository remoteRepository : remoteRepositories) {
 
-			ArtifactRepository repository = mavenEmbedder.createRepository(
-					repositoryUrl, repositoryId);
+				ArtifactRepository repository = mavenEmbedder.createRepository(
+						remoteRepository.getUrl(), remoteRepository.getId());
+				remoteRepositoriesInternal.add(repository);
+			}
 
-			remoteRepositories = new Vector<ArtifactRepository>();
-			remoteRepositories.add(repository);
 		} catch (Exception e) {
 			throw new SlcException("Cannot initialize Maven manager", e);
 		}
@@ -67,8 +66,8 @@ public class MavenManager {
 						mavenDistribution.getClassifier());
 			}
 
-			mavenEmbedder
-					.resolve(artifact, remoteRepositories, localRepository);
+			mavenEmbedder.resolve(artifact, remoteRepositoriesInternal,
+					localRepository);
 
 			return artifact;
 		} catch (Exception e) {
@@ -90,16 +89,16 @@ public class MavenManager {
 		}
 	}
 
-	public void setRepositoryId(String repositoryId) {
-		this.repositoryId = repositoryId;
+	public void setLocalRepositoryPath(String localRepositoryPath) {
+		this.localRepositoryPath = localRepositoryPath;
 	}
 
-	public void setRepositoryUrl(String repositoryUrl) {
-		this.repositoryUrl = repositoryUrl;
+	public List<RemoteRepository> getRemoteRepositories() {
+		return remoteRepositories;
 	}
 
-	public void setLocalRepositoryPath(String localRepositoryPath) {
-		this.localRepositoryPath = localRepositoryPath;
+	public void setRemoteRepositories(List<RemoteRepository> remoteRepositories) {
+		this.remoteRepositories = remoteRepositories;
 	}
 
 }