You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jd...@apache.org on 2006/07/28 15:18:51 UTC
svn commit: r426505 - in /geronimo/sandbox/svkmerge/trunk: ./
modules/kernel/src/java/org/apache/geronimo/kernel/repository/ArtifactResolver.java
Author: jdillon
Date: Fri Jul 28 06:18:51 2006
New Revision: 426505
URL: http://svn.apache.org/viewvc?rev=426505&view=rev
Log:
r554@Bliss (orig r426225): ammulder | 2006-07-27 13:11:40 -0700
Add JavaDoc fix to trunk
Modified:
geronimo/sandbox/svkmerge/trunk/ (props changed)
geronimo/sandbox/svkmerge/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/repository/ArtifactResolver.java
Propchange: geronimo/sandbox/svkmerge/trunk/
------------------------------------------------------------------------------
--- svk:merge (original)
+++ svk:merge Fri Jul 28 06:18:51 2006
@@ -1,2 +1,2 @@
13f79535-47bb-0310-9956-ffa450edef68:/geronimo/sandbox/svkmerge/m2migration:419395
-13f79535-47bb-0310-9956-ffa450edef68:/geronimo/trunk:426199
+13f79535-47bb-0310-9956-ffa450edef68:/geronimo/trunk:426225
Modified: geronimo/sandbox/svkmerge/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/repository/ArtifactResolver.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/svkmerge/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/repository/ArtifactResolver.java?rev=426505&r1=426504&r2=426505&view=diff
==============================================================================
--- geronimo/sandbox/svkmerge/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/repository/ArtifactResolver.java (original)
+++ geronimo/sandbox/svkmerge/trunk/modules/kernel/src/java/org/apache/geronimo/kernel/repository/ArtifactResolver.java Fri Jul 28 06:18:51 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