geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jb...@apache.org
Subject svn commit: r673786 - /geronimo/server/branches/2.1/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/repository/DefaultArtifactResolver.java
Date Thu, 03 Jul 2008 20:14:25 GMT
Author: jbohn
Date: Thu Jul  3 13:14:24 2008
New Revision: 673786

URL: http://svn.apache.org/viewvc?rev=673786&view=rev
Log:
merge in 673785 from trunk - GERONIMO-4182 Include aliases when querying the repository for
an artifact

Modified:
    geronimo/server/branches/2.1/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/repository/DefaultArtifactResolver.java

Modified: geronimo/server/branches/2.1/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/repository/DefaultArtifactResolver.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.1/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/repository/DefaultArtifactResolver.java?rev=673786&r1=673785&r2=673786&view=diff
==============================================================================
--- geronimo/server/branches/2.1/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/repository/DefaultArtifactResolver.java
(original)
+++ geronimo/server/branches/2.1/framework/modules/geronimo-kernel/src/main/java/org/apache/geronimo/kernel/repository/DefaultArtifactResolver.java
Thu Jul  3 13:14:24 2008
@@ -78,6 +78,11 @@
     }
 
     public Artifact[] queryArtifacts(Artifact artifact) {
+        //see if there is an explicit resolution for this artifact.
+        Artifact deAliased = explicitResolution.get(artifact);
+        if (deAliased != null) {
+            artifact = deAliased;
+        }
         LinkedHashSet<Artifact> set = new LinkedHashSet<Artifact>();
         for (ListableRepository repository : repositories) {
             set.addAll(repository.list(artifact));



Mime
View raw message