From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sun, 31 Aug 2008 10:06:42 +0000 (+0000)
Subject: Support multiple repositories
X-Git-Tag: argeo-slc-2.1.7~2594
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=7b01b39a6bb1b1ef0c9902324ae714c85c674c7a;p=gpl%2Fargeo-slc.git

Support multiple repositories

git-svn-id: https://svn.argeo.org/slc/trunk@1579 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---

diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/cli/DefaultSlcRuntime.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/cli/DefaultSlcRuntime.java
index 3596dd61c..841a82301 100644
--- a/org.argeo.slc.agent/src/main/java/org/argeo/slc/cli/DefaultSlcRuntime.java
+++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/cli/DefaultSlcRuntime.java
@@ -193,8 +193,8 @@ public class DefaultSlcRuntime {
 	 * defined by {@link #SLC_ROOT_FILE_NAME}.
 	 */
 	protected Resource findSlcRootFile(Resource currDir) {
-		if (log.isDebugEnabled())
-			log.debug("Look for SLC root file in " + currDir);
+		if (log.isTraceEnabled())
+			log.trace("Look for SLC root file in " + currDir);
 
 		try {
 			Resource slcRootFile = currDir.createRelative(SLC_ROOT_FILE_NAME);
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;
 	}
 
 }
diff --git a/org.argeo.slc.agent/src/main/java/org/argeo/slc/maven/RemoteRepository.java b/org.argeo.slc.agent/src/main/java/org/argeo/slc/maven/RemoteRepository.java
new file mode 100644
index 000000000..cbf027c74
--- /dev/null
+++ b/org.argeo.slc.agent/src/main/java/org/argeo/slc/maven/RemoteRepository.java
@@ -0,0 +1,23 @@
+package org.argeo.slc.maven;
+
+public class RemoteRepository {
+	private String id;
+	private String url;
+
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getUrl() {
+		return url;
+	}
+
+	public void setUrl(String url) {
+		this.url = url;
+	}
+
+}