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 3596dd61c6411141406e4c6172d0e446e8419e86..841a823012f96ceed2542a4101e96b220166384f 100644 (file)
--- 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 3a07e227a447f2be8a62ef67d0b7a86d37e32ac9..236d718503b99a10f72023762f6bc923ae183a75 100644 (file)
--- 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 {\r
        private final Log log = LogFactory.getLog(getClass());\r
 \r
-       private String repositoryId;\r
-       private String repositoryUrl;\r
        private String localRepositoryPath;\r
 \r
        private ArtifactRepository localRepository;\r
-       private List<ArtifactRepository> remoteRepositories;\r
+       private List<ArtifactRepository> remoteRepositoriesInternal;\r
+       private List<RemoteRepository> remoteRepositories = new Vector<RemoteRepository>();\r
 \r
        private MavenEmbedder mavenEmbedder;\r
 \r
@@ -38,14 +37,14 @@ public class MavenManager {
 \r
                        localRepository = mavenEmbedder.getLocalRepository();\r
 \r
-                       // localRepository = mavenEmbedder.createLocalRepository(new File(\r
-                       // localRepositoryPath));\r
+                       remoteRepositoriesInternal = new Vector<ArtifactRepository>();\r
+                       for (RemoteRepository remoteRepository : remoteRepositories) {\r
 \r
-                       ArtifactRepository repository = mavenEmbedder.createRepository(\r
-                                       repositoryUrl, repositoryId);\r
+                               ArtifactRepository repository = mavenEmbedder.createRepository(\r
+                                               remoteRepository.getUrl(), remoteRepository.getId());\r
+                               remoteRepositoriesInternal.add(repository);\r
+                       }\r
 \r
-                       remoteRepositories = new Vector<ArtifactRepository>();\r
-                       remoteRepositories.add(repository);\r
                } catch (Exception e) {\r
                        throw new SlcException("Cannot initialize Maven manager", e);\r
                }\r
@@ -67,8 +66,8 @@ public class MavenManager {
                                                mavenDistribution.getClassifier());\r
                        }\r
 \r
-                       mavenEmbedder\r
-                                       .resolve(artifact, remoteRepositories, localRepository);\r
+                       mavenEmbedder.resolve(artifact, remoteRepositoriesInternal,\r
+                                       localRepository);\r
 \r
                        return artifact;\r
                } catch (Exception e) {\r
@@ -90,16 +89,16 @@ public class MavenManager {
                }\r
        }\r
 \r
-       public void setRepositoryId(String repositoryId) {\r
-               this.repositoryId = repositoryId;\r
+       public void setLocalRepositoryPath(String localRepositoryPath) {\r
+               this.localRepositoryPath = localRepositoryPath;\r
        }\r
 \r
-       public void setRepositoryUrl(String repositoryUrl) {\r
-               this.repositoryUrl = repositoryUrl;\r
+       public List<RemoteRepository> getRemoteRepositories() {\r
+               return remoteRepositories;\r
        }\r
 \r
-       public void setLocalRepositoryPath(String localRepositoryPath) {\r
-               this.localRepositoryPath = localRepositoryPath;\r
+       public void setRemoteRepositories(List<RemoteRepository> remoteRepositories) {\r
+               this.remoteRepositories = remoteRepositories;\r
        }\r
 \r
 }\r

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 (file)
index 0000000..cbf027c
--- /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;
+       }
+
+}