geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jdil...@apache.org
Subject svn commit: r426511 - in /geronimo/sandbox/svkmerge/m2migration/modules/kernel/src: ./ java/org/apache/geronimo/kernel/repository/ArtifactResolver.java
Date Fri, 28 Jul 2006 13:21:16 GMT
Author: jdillon
Date: Fri Jul 28 06:21:16 2006
New Revision: 426511

URL: http://svn.apache.org/viewvc?rev=426511&view=rev
Log:
 r567@Bliss (orig r426505):  jdillon | 2006-07-28 06:18:51 -0700
  r554@Bliss (orig r426225):  ammulder | 2006-07-27 13:11:40 -0700
  Add JavaDoc fix to trunk
  
 

Modified:
    geronimo/sandbox/svkmerge/m2migration/modules/kernel/src/   (props changed)
    geronimo/sandbox/svkmerge/m2migration/modules/kernel/src/java/org/apache/geronimo/kernel/repository/ArtifactResolver.java

Propchange: geronimo/sandbox/svkmerge/m2migration/modules/kernel/src/
------------------------------------------------------------------------------
--- svk:merge (added)
+++ svk:merge Fri Jul 28 06:21:16 2006
@@ -0,0 +1 @@
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/trunk/modules/kernel/src:426505

Modified: geronimo/sandbox/svkmerge/m2migration/modules/kernel/src/java/org/apache/geronimo/kernel/repository/ArtifactResolver.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/m2migration/modules/kernel/src/java/org/apache/geronimo/kernel/repository/ArtifactResolver.java?rev=426511&r1=426510&r2=426511&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/m2migration/modules/kernel/src/java/org/apache/geronimo/kernel/repository/ArtifactResolver.java
(original)
+++ geronimo/sandbox/svkmerge/m2migration/modules/kernel/src/java/org/apache/geronimo/kernel/repository/ArtifactResolver.java
Fri Jul 28 06:21:16 2006
@@ -52,6 +52,8 @@
      * may be partially-populated).  Preference is given to artifacts that are already
      * loaded, or that exist in the parent configurations, to reduce duplication.  If
      * nothing can be found that's an error, because something depends on this.
+     *
+     * @param parentConfigurations A Collection with entries of type Configuration
      */
     Artifact resolveInClassLoader(Artifact source, Collection parentConfigurations) throws
MissingDependencyException;
     /**
@@ -69,6 +71,8 @@
      * may be partially-populated).  Preference is given to artifacts that are already
      * loaded, or that exist in the parent configurations, to reduce duplication.  If
      * nothing can be found that's an error, because something depends on this.
+     *
+     * @param parentConfigurations A Collection with entries of type Configuration
      *
      * @return A sorted set ordered in the same way the input was ordered, with
      *         entries of type Artifact



Mime
View raw message