You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2007/09/22 09:13:01 UTC

svn commit: r578384 - in /maven/artifact/branches/maven-artifact-GFR: ./ src/main/java/org/apache/maven/artifact/ src/main/java/org/apache/maven/artifact/resolver/metadata/ src/main/resources/META-INF/plexus/

Author: jvanzyl
Date: Sat Sep 22 00:12:59 2007
New Revision: 578384

URL: http://svn.apache.org/viewvc?rev=578384&view=rev
Log:
o hybrid graph-based resolution

Added:
    maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java   (with props)
    maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java   (with props)
    maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java   (with props)
    maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java   (with props)
    maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertice.java   (with props)
    maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java   (with props)
    maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java   (with props)
    maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java   (with props)
Modified:
    maven/artifact/branches/maven-artifact-GFR/pom.xml
    maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/Artifact.java
    maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultMetadataResolver.java
    maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequest.java
    maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java
    maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolver.java
    maven/artifact/branches/maven-artifact-GFR/src/main/resources/META-INF/plexus/components.xml

Modified: maven/artifact/branches/maven-artifact-GFR/pom.xml
URL: http://svn.apache.org/viewvc/maven/artifact/branches/maven-artifact-GFR/pom.xml?rev=578384&r1=578383&r2=578384&view=diff
==============================================================================
--- maven/artifact/branches/maven-artifact-GFR/pom.xml (original)
+++ maven/artifact/branches/maven-artifact-GFR/pom.xml Sat Sep 22 00:12:59 2007
@@ -102,6 +102,25 @@
           </excludes>
         </configuration>
       </plugin>
+      
+      <plugin>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>package</phase>
+            <configuration>
+              <tasks>
+              	<copy file="target/${pom.artifactId}-${pom.version}.jar" 
+              		  todir="/opt/maven/apache-maven-2.1-SNAPSHOT/lib"/>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
+      
     </plugins>
   </build>
 </project>

Modified: maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/Artifact.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/Artifact.java?rev=578384&r1=578383&r2=578384&view=diff
==============================================================================
--- maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/Artifact.java (original)
+++ maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/Artifact.java Sat Sep 22 00:12:59 2007
@@ -48,15 +48,16 @@
     Pattern VERSION_FILE_PATTERN = Pattern.compile( "^(.*)-([0-9]{8}.[0-9]{6})-([0-9]+)$" );
 
     // TODO: into scope handler
-    String SCOPE_COMPILE = "compile";
+    
+    String SCOPE_COMPILE = ArtifactScopeEnum.compile.toString();
 
-    String SCOPE_TEST = "test";
+    String SCOPE_TEST = ArtifactScopeEnum.test.toString();
 
-    String SCOPE_RUNTIME = "runtime";
+    String SCOPE_RUNTIME = ArtifactScopeEnum.runtime.toString();
 
-    String SCOPE_PROVIDED = "provided";
+    String SCOPE_PROVIDED = ArtifactScopeEnum.provided.toString();
 
-    String SCOPE_SYSTEM = "system";
+    String SCOPE_SYSTEM = ArtifactScopeEnum.system.toString();
 
     String RELEASE_VERSION = "RELEASE";
 

Added: maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java?rev=578384&view=auto
==============================================================================
--- maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java (added)
+++ maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java Sat Sep 22 00:12:59 2007
@@ -0,0 +1,24 @@
+package org.apache.maven.artifact;
+
+public enum ArtifactScopeEnum 
+{
+      compile(1)
+    , test(2)
+    , runtime(3)
+    , provided(4)
+    , system(5)
+    ;
+
+	private int id;
+
+	// Constructor 
+	ArtifactScopeEnum( int id )
+	{
+	  this.id = id;
+	}
+
+	int getId()
+	{
+	  return id;
+	}
+}

Propchange: maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/ArtifactScopeEnum.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java?rev=578384&view=auto
==============================================================================
--- maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java (added)
+++ maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java Sat Sep 22 00:12:59 2007
@@ -0,0 +1,114 @@
+package org.apache.maven.artifact.resolver.metadata;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.ArtifactScopeEnum;
+
+/** @author Oleg Gusakov */
+public class ArtifactMetadata
+{
+	protected String groupId;
+	protected String artifactId;
+	protected String version;
+	protected String type;
+	protected ArtifactScopeEnum scope;
+	protected String classifier;
+	//------------------------------------------------------------------
+	public ArtifactMetadata( String groupId, String name, String version )
+	{
+		this( groupId, name, version, null );
+	}
+	//------------------------------------------------------------------
+	public ArtifactMetadata( String groupId, String name, String version,	String type )
+	{
+		this( groupId, name, version, type, null );
+	}
+	//------------------------------------------------------------------
+	public ArtifactMetadata( String groupId, String name, String version,	String type, ArtifactScopeEnum scope )
+	{
+		this( groupId, name, version, type, scope, null );
+	}
+	//------------------------------------------------------------------
+	public ArtifactMetadata( String groupId, String name, String version, String type, ArtifactScopeEnum scope, String classifier )
+	{
+		this.groupId = groupId;
+		this.artifactId = name;
+		this.version = version;
+		this.type = type;
+		this.scope = scope;
+		this.classifier = classifier;
+	}
+	//------------------------------------------------------------------
+	public ArtifactMetadata( Artifact af )
+	{
+		if( af != null )
+			init( af );
+	}
+	//------------------------------------------------------------------
+	public void init( Artifact af )
+	{
+		setGroupId(af.getGroupId());
+		setArtifactId(af.getArtifactId());
+		setVersion(af.getVersion());
+		setType(af.getType());
+		setScope( af.getScope() );
+		setClassifier( af.getClassifier() );
+	}
+	//------------------------------------------------------------------
+	@Override
+	public String toString()
+	{
+		return groupId+":"+artifactId+":"+version;
+	}
+	//------------------------------------------------------------------
+	public String toDomainString()
+	{
+		return groupId+":"+artifactId;
+	}
+	//------------------------------------------------------------------
+	public String getGroupId() {
+		return groupId;
+	}
+	public void setGroupId(String groupId) {
+		this.groupId = groupId;
+	}
+	public String getArtifactId() {
+		return artifactId;
+	}
+	public void setArtifactId(String name) {
+		this.artifactId = name;
+	}
+	public String getVersion() {
+		return version;
+	}
+	public void setVersion(String version) {
+		this.version = version;
+	}
+	public String getType() {
+		return type;
+	}
+	public void setType(String type) {
+		this.type = type;
+	}
+	public ArtifactScopeEnum getScope() {
+		return scope;
+	}
+	public void setScope(ArtifactScopeEnum scope)
+	{
+		this.scope = scope;
+	}
+	public void setScope(String scope)
+	{
+		this.scope = scope == null 
+				? ArtifactScopeEnum.compile
+				: ArtifactScopeEnum.valueOf(scope)
+				;
+	}
+	public String getClassifier() {
+		return classifier;
+	}
+	public void setClassifier(String classifier) {
+		this.classifier = classifier;
+	}
+	//------------------------------------------------------------------
+	//------------------------------------------------------------------
+}

Propchange: maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultMetadataResolver.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultMetadataResolver.java?rev=578384&r1=578383&r2=578384&view=diff
==============================================================================
--- maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultMetadataResolver.java (original)
+++ maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultMetadataResolver.java Sat Sep 22 00:12:59 2007
@@ -1,11 +1,101 @@
 package org.apache.maven.artifact.resolver.metadata;
 
-/** @author Jason van Zyl */
+import java.util.ArrayList;
+import java.util.Set;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.metadata.ArtifactMetadataSource;
+import org.apache.maven.artifact.metadata.ResolutionGroup;
+import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
+import org.apache.maven.artifact.resolver.ArtifactResolutionException;
+import org.apache.maven.artifact.resolver.ArtifactResolver;
+import org.codehaus.plexus.logging.AbstractLogEnabled;
+
+/** @author Oleg Gusakov */
 public class DefaultMetadataResolver
-    implements MetadataResolver
+extends AbstractLogEnabled
+implements MetadataResolver
 {
-    public MetadataResolutionResult resolveMetadata( MetadataResolutionRequest request )
+    //------------------------------------------------------------------------
+	ArtifactResolver ar;
+	ArtifactFactory  af;
+	ArtifactMetadataSource ams;
+    //------------------------------------------------------------------------
+    public MetadataResolutionResult resolveMetadata( MetadataResolutionRequest req )
+    throws MetadataResolutionException
     {
+		try {
+			MetadataResolutionResult res = new MetadataResolutionResult();
+			if( req.type == null ) {
+				throw new MetadataResolutionException("no type in the request");
+			}
+			
+			MetadataTreeNode tree = resolveTree( req, null );
+			MetadataGraph graph = null;
+
+			if( MetadataResolutionRequestTypeEnum.tree.equals(req.type) ) {
+				res.setTree( tree );
+			}
+			if( MetadataResolutionRequestTypeEnum.graph.equals(req.type) ) {
+				graph = new MetadataGraph( tree );
+				res.setTree(tree);
+				res.setGraph(graph);
+			}
 
+	    	return res;
+		} catch( MetadataResolutionException mrEx ) {
+			throw mrEx;
+		} catch( Exception anyEx ) {
+			anyEx.printStackTrace();
+			throw new MetadataResolutionException(anyEx);
+		}
+    }
+    //------------------------------------------------------------------------
+    private MetadataTreeNode resolveTree( MetadataResolutionRequest req, MetadataTreeNode parent )
+    throws MetadataResolutionException
+    {
+		try {
+			ArtifactMetadata query = req.getQuery();
+			Artifact pomArtifact = af.createArtifact(
+											query.getGroupId()
+											, query.getArtifactId()
+											, query.getVersion()
+											, null
+											, "pom"
+													);
+getLogger().debug("resolveMetadata request:"
+		+ "\n> artifact   : "+pomArtifact.toString()
+		+ "\n> remoteRepos: "+req.getRemoteRepositories()
+		+ "\n> localRepo  : "+req.getLocalRepository()
+		);
+			ar.resolve( pomArtifact
+						, req.getRemoteRepositories()
+						, req.getLocalRepository()
+						);
+			if( pomArtifact.isResolved() ) {
+				ResolutionGroup rg = ams.retrieve( pomArtifact, req.getLocalRepository(), req.getRemoteRepositories() );
+				MetadataTreeNode node = new MetadataTreeNode( pomArtifact, parent, true );
+				Set<Artifact> dependencies = (Set<Artifact>)rg.getArtifacts();
+				if( dependencies != null && dependencies.size() > 0 ) {
+					ArrayList<MetadataTreeNode> kids = new ArrayList<MetadataTreeNode>( dependencies.size() );
+					for( Artifact a : dependencies ) {
+						req.query.init( a );
+						req.query.setType("pom");
+						kids.add( resolveTree( req, node ) );
+					}
+					node.addChildren(kids);
+				}
+				return node;
+			}
+			else {
+				return new MetadataTreeNode( pomArtifact, parent, false );
+			}
+		} catch( Exception anyEx ) {
+			anyEx.printStackTrace();
+			throw new MetadataResolutionException(anyEx);
+		}
     }
+    //------------------------------------------------------------------------
+    //------------------------------------------------------------------------
 }

Added: maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java?rev=578384&view=auto
==============================================================================
--- maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java (added)
+++ maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java Sat Sep 22 00:12:59 2007
@@ -0,0 +1,116 @@
+package org.apache.maven.artifact.resolver.metadata;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+/** @author Oleg Gusakov */
+
+public class MetadataGraph
+{
+	MetadataGraphVertice entry;
+	Map< String, MetadataGraphVertice > vertices;
+	Map< String, List<MetadataGraphEdge> > edges; 
+	//------------------------------------------------------------------------
+	public MetadataGraph( MetadataTreeNode tree )
+	throws MetadataResolutionException
+	{
+		if( tree == null )
+			throw new MetadataResolutionException("tree is null");
+
+		int count = countNodes(tree);
+		vertices = new HashMap<String, MetadataGraphVertice>( count );
+		edges = new HashMap<String, List<MetadataGraphEdge>>( count + (count/2) );
+
+		processNodes( null, tree, 0 );
+	}
+	//------------------------------------------------------------------------
+	private void processNodes( MetadataGraphVertice parentVertice, MetadataTreeNode node, int depth )
+	throws MetadataResolutionException
+	{
+		if( node == null )
+			return;
+		
+		String nodeHash = node.graphHash();
+		MetadataGraphVertice vertice = vertices.get(nodeHash);
+		if( vertice == null ) { // does not exist yet ?
+			vertice = new MetadataGraphVertice( node.md );
+			vertices.put( nodeHash, vertice );
+		}
+		
+		if( parentVertice != null ) { // then create links
+			String edgeId = edgeHash( parentVertice, vertice );
+			List<MetadataGraphEdge> edgeList = edges.get(edgeId);
+			if( edgeList == null ) {
+				edgeList = new ArrayList<MetadataGraphEdge>(4);
+				edges.put( edgeId, edgeList );
+			}
+			
+			MetadataGraphEdge e = new MetadataGraphEdge( node.md.version, node.md.scope, depth );
+			if( !edgeList.contains(e) ) {
+				edgeList.add(e);
+			} else {
+				e = null;
+			}
+		}
+
+		MetadataTreeNode [] kids = node.getChildren(); 
+		if( kids == null || kids.length < 1 )
+			return;
+
+		for( MetadataTreeNode n : kids )
+			processNodes( vertice, n, depth+1 );
+	}
+	//------------------------------------------------------------------------
+	public static String edgeHash( MetadataGraphVertice v1, MetadataGraphVertice v2 )
+	{
+		return v1.md.toDomainString()+">"+v2.md.toDomainString();
+//		return h1.compareTo(h2) > 0
+//				? h1.hashCode()+""+h2.hashCode()
+//				: h2.hashCode()+""+h1.hashCode()
+//		;
+	}
+	//------------------------------------------------------------------------
+	private static int countNodes(MetadataTreeNode tree )
+	{
+		if( tree == null )
+			return 0;
+		
+		int count = 1;
+		MetadataTreeNode [] kids = tree.getChildren(); 
+		if( kids == null || kids.length < 1 )
+			return count;
+		for( MetadataTreeNode n : kids )
+			count += countNodes(n);
+		
+		return count;
+	}
+	//------------------------------------------------------------------------
+	public MetadataGraphVertice getEntry()
+	{
+		return entry;
+	}
+	public void setEntry(MetadataGraphVertice entry)
+	{
+		this.entry = entry;
+	}
+	public Map<String, MetadataGraphVertice> getVertices()
+	{
+		return vertices;
+	}
+	public void setVertices(Map<String, MetadataGraphVertice> vertices)
+	{
+		this.vertices = vertices;
+	}
+	public Map<String, List<MetadataGraphEdge>> getEdges()
+	{
+		return edges;
+	}
+	public void setEdges(Map<String, List<MetadataGraphEdge>> edges)
+	{
+		this.edges = edges;
+	}
+	//------------------------------------------------------------------------
+	//------------------------------------------------------------------------
+}

Propchange: maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java?rev=578384&view=auto
==============================================================================
--- maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java (added)
+++ maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java Sat Sep 22 00:12:59 2007
@@ -0,0 +1,64 @@
+package org.apache.maven.artifact.resolver.metadata;
+
+import org.apache.maven.artifact.ArtifactScopeEnum;
+
+/** @author Oleg Gusakov */
+public class MetadataGraphEdge
+{
+	String version;
+	ArtifactScopeEnum scope;
+	int depth = -1;
+
+	public MetadataGraphEdge(String version, ArtifactScopeEnum scope, int depth)
+	{
+		super();
+		this.version = version;
+		this.scope = scope;
+		this.depth = depth;
+	}
+	//----------------------------------------------------------------------------
+	private static boolean objectsEqual( Object o1, Object o2 )
+	{
+		if( o1 == null && o2 == null )
+			return true;
+		if( (o1 == null && o2 != null)
+			|| (o1 != null && o2 == null)
+		) return false;
+		return o1.equals(o2);
+	}
+	//----------------------------------------------------------------------------
+	@Override
+	public boolean equals(Object o)
+	{
+		if( o instanceof MetadataGraphEdge ) {
+			MetadataGraphEdge e = (MetadataGraphEdge) o;
+			return
+				objectsEqual(version, e.version )
+					&& objectsEqual(scope, e.scope)
+					&& depth == e.depth
+			;
+		}
+		return false;
+	}
+	//----------------------------------------------------------------------------
+	public String getVersion() {
+		return version;
+	}
+	public void setVersion(String version) {
+		this.version = version;
+	}
+	public ArtifactScopeEnum getScope() {
+		return scope;
+	}
+	public void setScope(ArtifactScopeEnum scope) {
+		this.scope = scope;
+	}
+	public int getDepth() {
+		return depth;
+	}
+	public void setDepth(int depth) {
+		this.depth = depth;
+	}
+	//----------------------------------------------------------------------------
+	//----------------------------------------------------------------------------
+}

Propchange: maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertice.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertice.java?rev=578384&view=auto
==============================================================================
--- maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertice.java (added)
+++ maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertice.java Sat Sep 22 00:12:59 2007
@@ -0,0 +1,24 @@
+package org.apache.maven.artifact.resolver.metadata;
+
+/** @author Oleg Gusakov */
+public class MetadataGraphVertice
+{
+	ArtifactMetadata md;
+
+	public MetadataGraphVertice(ArtifactMetadata md)
+	{
+		super();
+		this.md = md;
+	}
+
+	public ArtifactMetadata getMd()
+	{
+		return md;
+	}
+
+	public void setMd(ArtifactMetadata md)
+	{
+		this.md = md;
+	}
+
+}

Propchange: maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertice.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertice.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java?rev=578384&view=auto
==============================================================================
--- maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java (added)
+++ maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java Sat Sep 22 00:12:59 2007
@@ -0,0 +1,24 @@
+package org.apache.maven.artifact.resolver.metadata;
+
+public class MetadataResolutionException extends Exception {
+
+	public MetadataResolutionException() {
+		// TODO Auto-generated constructor stub
+	}
+
+	public MetadataResolutionException(String message) {
+		super(message);
+		// TODO Auto-generated constructor stub
+	}
+
+	public MetadataResolutionException(Throwable cause) {
+		super(cause);
+		// TODO Auto-generated constructor stub
+	}
+
+	public MetadataResolutionException(String message, Throwable cause) {
+		super(message, cause);
+		// TODO Auto-generated constructor stub
+	}
+
+}

Propchange: maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequest.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequest.java?rev=578384&r1=578383&r2=578384&view=diff
==============================================================================
--- maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequest.java (original)
+++ maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequest.java Sat Sep 22 00:12:59 2007
@@ -1,6 +1,52 @@
 package org.apache.maven.artifact.resolver.metadata;
 
-/** @author Jason van Zyl */
+import java.util.List;
+
+import org.apache.maven.artifact.repository.ArtifactRepository;
+
+
+/** @author Oleg Gusakov */
 public class MetadataResolutionRequest
 {
+	protected ArtifactMetadata query;
+	protected MetadataResolutionRequestTypeEnum type;
+	
+	protected ArtifactRepository localRepository;
+	protected List<ArtifactRepository> remoteRepositories;
+
+	//--------------------------------------------------------------------
+	public MetadataResolutionRequest()
+	{
+	}
+	//--------------------------------------------------------------------
+	public MetadataResolutionRequest(MetadataResolutionRequestTypeEnum type, ArtifactMetadata query, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
+	{
+		this.type = type;
+		this.query = query;
+		this.localRepository = localRepository;
+		this.remoteRepositories = remoteRepositories;
+	}
+	//--------------------------------------------------------------------
+	public ArtifactMetadata getQuery()
+	{
+		return query;
+	}
+	public void setQuery(ArtifactMetadata query)
+	{
+		this.query = query;
+	}	
+	public ArtifactRepository getLocalRepository() {
+		return localRepository;
+	}
+	public void setLocalRepository(ArtifactRepository localRepository) {
+		this.localRepository = localRepository;
+	}
+	public List<ArtifactRepository> getRemoteRepositories() {
+		return remoteRepositories;
+	}
+	public void setRemoteRepositories(List<ArtifactRepository> remoteRepositories) {
+		this.remoteRepositories = remoteRepositories;
+	}
+	//--------------------------------------------------------------------
+	//--------------------------------------------------------------------
 }

Added: maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java?rev=578384&view=auto
==============================================================================
--- maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java (added)
+++ maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java Sat Sep 22 00:12:59 2007
@@ -0,0 +1,23 @@
+package org.apache.maven.artifact.resolver.metadata;
+
+public enum MetadataResolutionRequestTypeEnum
+{
+      tree(1)
+    , graph(2)
+    , noConflictGraph(3)
+    , subGraph(4)
+    ;
+
+	private int id;
+
+	// Constructor 
+	MetadataResolutionRequestTypeEnum( int id )
+	{
+	  this.id = id;
+	}
+
+	int getId()
+	{
+	  return id;
+	}
+}

Propchange: maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java?rev=578384&r1=578383&r2=578384&view=diff
==============================================================================
--- maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java (original)
+++ maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java Sat Sep 22 00:12:59 2007
@@ -1,6 +1,37 @@
 package org.apache.maven.artifact.resolver.metadata;
 
-/** @author Jason van Zyl */
+import org.apache.maven.artifact.Artifact;
+
+/** @author Oleg Gusakov */
 public class MetadataResolutionResult
 {
+	MetadataTreeNode root;
+	MetadataGraph graph;
+	//----------------------------------------------------------------------------
+	public MetadataResolutionResult()
+	{
+	}
+	//----------------------------------------------------------------------------
+	public MetadataResolutionResult( MetadataTreeNode root )
+	{
+		this.root = root;
+	}
+	//----------------------------------------------------------------------------
+	public MetadataTreeNode getTree() {
+		return root;
+	}
+	public void setTree(MetadataTreeNode root) {
+		this.root = root;
+	}
+	public MetadataGraph getGraph()
+	{
+		return graph;
+	}
+	public void setGraph(MetadataGraph graph)
+	{
+		this.graph = graph;
+	}
+	
+	//----------------------------------------------------------------------------
+	//----------------------------------------------------------------------------
 }

Modified: maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolver.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolver.java?rev=578384&r1=578383&r2=578384&view=diff
==============================================================================
--- maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolver.java (original)
+++ maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolver.java Sat Sep 22 00:12:59 2007
@@ -1,9 +1,10 @@
 package org.apache.maven.artifact.resolver.metadata;
 
-/** @author Jason van Zyl */
+/** @author Oleg Gusakov */
 public interface MetadataResolver
 {
     String ROLE = MetadataResolver.class.getName();
 
-    MetadataResolutionResult resolveMetadata( MetadataResolutionRequest request );    
+    MetadataResolutionResult resolveMetadata( MetadataResolutionRequest request )
+    throws MetadataResolutionException;    
 }

Added: maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java?rev=578384&view=auto
==============================================================================
--- maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java (added)
+++ maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java Sat Sep 22 00:12:59 2007
@@ -0,0 +1,99 @@
+package org.apache.maven.artifact.resolver.metadata;
+
+import java.util.List;
+
+import org.apache.maven.artifact.Artifact;
+
+public class MetadataTreeNode
+{
+	ArtifactMetadata md; // this node
+	
+	MetadataTreeNode parent; // papa of cause
+	MetadataTreeNode [] children; // of cause
+	
+	boolean resolved = false; // if current node was resolved
+    //------------------------------------------------------------------------
+	public MetadataTreeNode()
+	{
+	}
+    //------------------------------------------------------------------------
+	public MetadataTreeNode( ArtifactMetadata md, MetadataTreeNode parent, boolean resolved )
+	{
+		this.md = md;
+		this.parent = parent;
+		this.resolved = resolved;
+	}
+    //------------------------------------------------------------------------
+	public MetadataTreeNode( Artifact af, MetadataTreeNode parent, boolean resolved )
+	{
+		this( new ArtifactMetadata(af), parent, resolved );
+	}
+    //------------------------------------------------------------------------
+	public void addChildren( List<MetadataTreeNode> kidList )
+	{
+		if( kidList == null || kidList.size() < 1)
+			return;
+		
+		children = new MetadataTreeNode[ kidList.size() ];
+		int i = 0;
+		for( MetadataTreeNode n : kidList )
+			children[i++] = n;
+	}
+	//------------------------------------------------------------------
+	@Override
+	public String toString()
+	{
+		return md == null ? "no metadata" : md.toString();
+	}
+	//------------------------------------------------------------------
+	public String graphHash()
+	throws MetadataResolutionException
+	{
+		if( md == null )
+			throw new MetadataResolutionException("treenode without metadata, parent: " 
+					+ ( parent==null?"null": parent.toString() )
+							);
+
+		return md.groupId+":"+md.artifactId;
+	}
+    //------------------------------------------------------------------------
+	public boolean hasChildren()
+	{
+		return children != null;
+	}
+    //------------------------------------------------------------------------
+	public ArtifactMetadata getMd()
+	{
+		return md;
+	}
+	public void setMd(ArtifactMetadata md)
+	{
+		this.md = md;
+	}
+	public MetadataTreeNode getParent()
+	{
+		return parent;
+	}
+	public void setParent(MetadataTreeNode parent)
+	{
+		this.parent = parent;
+	}
+	public boolean isResolved()
+	{
+		return resolved;
+	}
+	public void setResolved(boolean resolved)
+	{
+		this.resolved = resolved;
+	}
+	public MetadataTreeNode[] getChildren() {
+		return children;
+	}
+	public void setChildren(MetadataTreeNode[] children) {
+		this.children = children;
+	}
+	
+    //------------------------------------------------------------------------
+    //------------------------------------------------------------------------
+
+}

Propchange: maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/artifact/branches/maven-artifact-GFR/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: maven/artifact/branches/maven-artifact-GFR/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/maven/artifact/branches/maven-artifact-GFR/src/main/resources/META-INF/plexus/components.xml?rev=578384&r1=578383&r2=578384&view=diff
==============================================================================
--- maven/artifact/branches/maven-artifact-GFR/src/main/resources/META-INF/plexus/components.xml (original)
+++ maven/artifact/branches/maven-artifact-GFR/src/main/resources/META-INF/plexus/components.xml Sat Sep 22 00:12:59 2007
@@ -370,6 +370,28 @@
 
     <!--
      |
+     | MetadataResolver
+     |
+     -->
+    <component>
+      <role>org.apache.maven.artifact.resolver.metadata.MetadataResolver</role>
+      <implementation>org.apache.maven.artifact.resolver.metadata.DefaultMetadataResolver</implementation>
+      <role-hint>default</role-hint>
+      <requirements>
+        <requirement>
+          <role>org.apache.maven.artifact.resolver.ArtifactResolver</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.factory.ArtifactFactory</role>
+        </requirement>
+        <requirement>
+          <role>org.apache.maven.artifact.metadata.ArtifactMetadataSource</role>
+        </requirement>
+      </requirements>
+    </component>
+
+    <!--
+     |
      | ArtifactInstaller
      |
      -->