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 2008/05/23 16:37:13 UTC
svn commit: r659553 - in /maven/artifact/branches/CAP/src: main/java/org/apache/maven/artifact/resolver/metadata/ main/java/org/apache/maven/artifact/resolver/metadata/conflict/ main/java/org/apache/maven/artifact/resolver/metadata/resolver/ main/java/...

Author: jvanzyl
Date: Fri May 23 07:37:09 2008
New Revision: 659553

URL: http://svn.apache.org/viewvc?rev=659553&view=rev
Log:
o starting to isolate the graph-based resolver in its own package

Added:
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/AbstractArtifactResolutionException.java   (contents, props changed)
      - copied, changed from r659470, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/AbstractArtifactResolutionException.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactMetadata.java   (contents, props changed)
      - copied, changed from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactNotFoundException.java   (contents, props changed)
      - copied, changed from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactNotFoundException.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactResolutionException.java   (contents, props changed)
      - copied, changed from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactResolutionException.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactResolver.java   (contents, props changed)
      - copied, changed from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactResolver.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultArtifactResolver.java   (contents, props changed)
      - copied, changed from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultArtifactResolver.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultMetadataResolver.java   (contents, props changed)
      - copied, changed from r659470, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultMetadataResolver.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataGraph.java   (contents, props changed)
      - copied, changed from r659119, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataGraphEdge.java   (contents, props changed)
      - copied, changed from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataGraphVertex.java   (contents, props changed)
      - copied, changed from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertex.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolution.java   (contents, props changed)
      - copied, changed from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolution.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionException.java   (contents, props changed)
      - copied, changed from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionRequest.java   (contents, props changed)
      - copied, changed from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequest.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionRequestTypeEnum.java   (contents, props changed)
      - copied, changed from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionResult.java   (contents, props changed)
      - copied, changed from r659470, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolver.java   (contents, props changed)
      - copied, changed from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolver.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataRetrievalException.java   (contents, props changed)
      - copied, changed from r659119, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataRetrievalException.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataSource.java   (contents, props changed)
      - copied, changed from r659119, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataSource.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataTreeNode.java   (contents, props changed)
      - copied, changed from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ResolutionRequest.java   (contents, props changed)
      - copied, changed from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ResolutionRequest.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ResolutionResult.java   (contents, props changed)
      - copied, changed from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ResolutionResult.java
Removed:
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/AbstractArtifactResolutionException.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactNotFoundException.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactResolutionException.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactResolver.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultArtifactResolver.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultMetadataResolver.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertex.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolution.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequest.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolver.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataRetrievalException.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataSource.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ResolutionRequest.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ResolutionResult.java
Modified:
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultGraphConflictResolutionPolicy.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultGraphConflictResolver.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/GraphConflictResolutionPolicy.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/GraphConflictResolver.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/ClasspathContainer.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/ClasspathTransformation.java
    maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/DefaultClasspathTransformation.java
    maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicyTest.java
    maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolverTest.java
    maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/transform/DefaultClasspathTransformationTest.java

Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultGraphConflictResolutionPolicy.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultGraphConflictResolutionPolicy.java?rev=659553&r1=659552&r2=659553&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultGraphConflictResolutionPolicy.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultGraphConflictResolutionPolicy.java Fri May 23 07:37:09 2008
@@ -1,6 +1,6 @@
 package org.apache.maven.artifact.resolver.metadata.conflict;
 
-import org.apache.maven.artifact.resolver.metadata.MetadataGraphEdge;
+import org.apache.maven.artifact.resolver.metadata.resolver.MetadataGraphEdge;
 import org.apache.maven.artifact.versioning.ArtifactVersion;
 import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
 

Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultGraphConflictResolver.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultGraphConflictResolver.java?rev=659553&r1=659552&r2=659553&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultGraphConflictResolver.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultGraphConflictResolver.java Fri May 23 07:37:09 2008
@@ -20,11 +20,11 @@
  */
 
 import org.apache.maven.artifact.ArtifactScopeEnum;
-import org.apache.maven.artifact.resolver.metadata.ArtifactMetadata;
-import org.apache.maven.artifact.resolver.metadata.MetadataGraph;
-import org.apache.maven.artifact.resolver.metadata.MetadataGraphEdge;
-import org.apache.maven.artifact.resolver.metadata.MetadataGraphVertex;
-import org.apache.maven.artifact.resolver.metadata.MetadataResolutionException;
+import org.apache.maven.artifact.resolver.metadata.resolver.ArtifactMetadata;
+import org.apache.maven.artifact.resolver.metadata.resolver.MetadataGraph;
+import org.apache.maven.artifact.resolver.metadata.resolver.MetadataGraphEdge;
+import org.apache.maven.artifact.resolver.metadata.resolver.MetadataGraphVertex;
+import org.apache.maven.artifact.resolver.metadata.resolver.MetadataResolutionException;
 
 import java.util.ArrayList;
 import java.util.List;

Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/GraphConflictResolutionPolicy.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/GraphConflictResolutionPolicy.java?rev=659553&r1=659552&r2=659553&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/GraphConflictResolutionPolicy.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/GraphConflictResolutionPolicy.java Fri May 23 07:37:09 2008
@@ -1,6 +1,6 @@
 package org.apache.maven.artifact.resolver.metadata.conflict;
 
-import org.apache.maven.artifact.resolver.metadata.MetadataGraphEdge;
+import org.apache.maven.artifact.resolver.metadata.resolver.MetadataGraphEdge;
 
 /**
  *  MetadataGraph edge selection policy. Complements 

Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/GraphConflictResolver.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/GraphConflictResolver.java?rev=659553&r1=659552&r2=659553&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/GraphConflictResolver.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/GraphConflictResolver.java Fri May 23 07:37:09 2008
@@ -20,7 +20,7 @@
  */
 
 import org.apache.maven.artifact.ArtifactScopeEnum;
-import org.apache.maven.artifact.resolver.metadata.MetadataGraph;
+import org.apache.maven.artifact.resolver.metadata.resolver.MetadataGraph;
 
 /**
  * Resolves conflicts in the supplied dependency graph. 

Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/AbstractArtifactResolutionException.java (from r659470, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/AbstractArtifactResolutionException.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/AbstractArtifactResolutionException.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/AbstractArtifactResolutionException.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/AbstractArtifactResolutionException.java&r1=659470&r2=659553&rev=659553&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/AbstractArtifactResolutionException.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/AbstractArtifactResolutionException.java Fri May 23 07:37:09 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.artifact.resolver.metadata.resolver;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one or more contributor license

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

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

Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/AbstractArtifactResolutionException.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactMetadata.java (from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactMetadata.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactMetadata.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java&r1=659112&r2=659553&rev=659553&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactMetadata.java Fri May 23 07:37:09 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.artifact.resolver.metadata.resolver;
 
 import java.util.Collection;
 

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

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

Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactMetadata.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 23 07:37:09 2008
@@ -0,0 +1 @@
+/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactMetadata.java:658725

Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactNotFoundException.java (from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactNotFoundException.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactNotFoundException.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactNotFoundException.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactNotFoundException.java&r1=659112&r2=659553&rev=659553&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactNotFoundException.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactNotFoundException.java Fri May 23 07:37:09 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.artifact.resolver.metadata.resolver;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

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

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

Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactNotFoundException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 23 07:37:09 2008
@@ -0,0 +1 @@
+/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactNotFoundException.java:658725

Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactResolutionException.java (from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactResolutionException.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactResolutionException.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactResolutionException.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactResolutionException.java&r1=659112&r2=659553&rev=659553&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactResolutionException.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactResolutionException.java Fri May 23 07:37:09 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.artifact.resolver.metadata.resolver;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

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

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

Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactResolutionException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 23 07:37:09 2008
@@ -0,0 +1 @@
+/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactResolutionException.java:658725

Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactResolver.java (from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactResolver.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactResolver.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactResolver.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactResolver.java&r1=659112&r2=659553&rev=659553&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactResolver.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactResolver.java Fri May 23 07:37:09 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.artifact.resolver.metadata.resolver;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

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

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

Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactResolver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 23 07:37:09 2008
@@ -0,0 +1 @@
+/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactResolver.java:658725

Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultArtifactResolver.java (from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultArtifactResolver.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultArtifactResolver.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultArtifactResolver.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultArtifactResolver.java&r1=659112&r2=659553&rev=659553&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultArtifactResolver.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultArtifactResolver.java Fri May 23 07:37:09 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.artifact.resolver.metadata.resolver;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -34,21 +34,10 @@
     extends AbstractLogEnabled
     implements ArtifactResolver
 {
-    /** @plexus.requirement */
-    private WagonManager wagonManager;
-
     public ResolutionResult resolve( ResolutionRequest request )
     {
         ResolutionResult result = new ResolutionResult();
         
-        Artifact originatingArtifact = request.getArtifact();
-
-        ArtifactRepository localRepository = request.getLocalRepository();
-
-        List remoteRepositories = request.getRemoteRepostories();
-
-        result.setRepositories( remoteRepositories );
-
         return result;
     }
 }

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

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

Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultArtifactResolver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 23 07:37:09 2008
@@ -0,0 +1 @@
+/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultArtifactResolver.java:658725

Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultMetadataResolver.java (from r659470, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultMetadataResolver.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultMetadataResolver.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultMetadataResolver.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultMetadataResolver.java&r1=659470&r2=659553&rev=659553&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultMetadataResolver.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultMetadataResolver.java Fri May 23 07:37:09 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.artifact.resolver.metadata.resolver;
 
 import java.util.ArrayList;
 import java.util.Collection;

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

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

Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultMetadataResolver.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataGraph.java (from r659119, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataGraph.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataGraph.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java&r1=659119&r2=659553&rev=659553&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataGraph.java Fri May 23 07:37:09 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.artifact.resolver.metadata.resolver;
 
 import java.util.ArrayList;
 import java.util.HashMap;

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

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

Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataGraph.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataGraphEdge.java (from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataGraphEdge.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataGraphEdge.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java&r1=659112&r2=659553&rev=659553&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataGraphEdge.java Fri May 23 07:37:09 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.artifact.resolver.metadata.resolver;
 
 import org.apache.maven.artifact.ArtifactScopeEnum;
 

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

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

Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataGraphEdge.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 23 07:37:09 2008
@@ -0,0 +1 @@
+/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java:658725

Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataGraphVertex.java (from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertex.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataGraphVertex.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataGraphVertex.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertex.java&r1=659112&r2=659553&rev=659553&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertex.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataGraphVertex.java Fri May 23 07:37:09 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.artifact.resolver.metadata.resolver;
 
 import org.apache.maven.artifact.ArtifactScopeEnum;
 

Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataGraphVertex.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 23 07:37:09 2008
@@ -0,0 +1 @@
+/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertex.java:658725

Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolution.java (from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolution.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolution.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolution.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolution.java&r1=659112&r2=659553&rev=659553&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolution.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolution.java Fri May 23 07:37:09 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.artifact.resolver.metadata.resolver;
 
 import java.util.Collection;
 

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

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

Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolution.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 23 07:37:09 2008
@@ -0,0 +1 @@
+/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolution.java:658725

Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionException.java (from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionException.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionException.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java&r1=659112&r2=659553&rev=659553&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionException.java Fri May 23 07:37:09 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.artifact.resolver.metadata.resolver;
 
 public class MetadataResolutionException
     extends Exception

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

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

Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 23 07:37:09 2008
@@ -0,0 +1 @@
+/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java:658725

Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionRequest.java (from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequest.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionRequest.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionRequest.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequest.java&r1=659112&r2=659553&rev=659553&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequest.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionRequest.java Fri May 23 07:37:09 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.artifact.resolver.metadata.resolver;
 
 import java.util.List;
 

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

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

Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionRequest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 23 07:37:09 2008
@@ -0,0 +1 @@
+/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequest.java:658725

Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionRequestTypeEnum.java (from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionRequestTypeEnum.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionRequestTypeEnum.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java&r1=659112&r2=659553&rev=659553&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionRequestTypeEnum.java Fri May 23 07:37:09 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.artifact.resolver.metadata.resolver;
 
 public enum MetadataResolutionRequestTypeEnum
 {

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

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

Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionRequestTypeEnum.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 23 07:37:09 2008
@@ -0,0 +1 @@
+/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java:658725

Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionResult.java (from r659470, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionResult.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionResult.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java&r1=659470&r2=659553&rev=659553&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionResult.java Fri May 23 07:37:09 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.artifact.resolver.metadata.resolver;
 
 import org.apache.maven.artifact.ArtifactScopeEnum;
 import org.apache.maven.artifact.resolver.metadata.conflict.GraphConflictResolutionException;

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

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

Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionResult.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolver.java (from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolver.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolver.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolver.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolver.java&r1=659112&r2=659553&rev=659553&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolver.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolver.java Fri May 23 07:37:09 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.artifact.resolver.metadata.resolver;
 
 import java.util.Collection;
 import java.util.List;

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

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

Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 23 07:37:09 2008
@@ -0,0 +1 @@
+/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolver.java:658725

Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataRetrievalException.java (from r659119, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataRetrievalException.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataRetrievalException.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataRetrievalException.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataRetrievalException.java&r1=659119&r2=659553&rev=659553&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataRetrievalException.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataRetrievalException.java Fri May 23 07:37:09 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.artifact.resolver.metadata.resolver;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

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

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

Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataRetrievalException.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataSource.java (from r659119, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataSource.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataSource.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataSource.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataSource.java&r1=659119&r2=659553&rev=659553&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataSource.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataSource.java Fri May 23 07:37:09 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.artifact.resolver.metadata.resolver;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

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

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

Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataSource.java
------------------------------------------------------------------------------
    svn:mergeinfo = 

Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataTreeNode.java (from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataTreeNode.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataTreeNode.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java&r1=659112&r2=659553&rev=659553&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataTreeNode.java Fri May 23 07:37:09 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.artifact.resolver.metadata.resolver;
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.ArtifactScopeEnum;

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

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

Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataTreeNode.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 23 07:37:09 2008
@@ -0,0 +1 @@
+/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java:658725

Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ResolutionRequest.java (from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ResolutionRequest.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ResolutionRequest.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ResolutionRequest.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ResolutionRequest.java&r1=659112&r2=659553&rev=659553&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ResolutionRequest.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ResolutionRequest.java Fri May 23 07:37:09 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.artifact.resolver.metadata.resolver;
 
 import org.apache.maven.artifact.Artifact;
 import org.apache.maven.artifact.metadata.ArtifactMetadataSource;

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

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

Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ResolutionRequest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 23 07:37:09 2008
@@ -0,0 +1 @@
+/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/ResolutionRequest.java:658725

Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ResolutionResult.java (from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ResolutionResult.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ResolutionResult.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ResolutionResult.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ResolutionResult.java&r1=659112&r2=659553&rev=659553&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ResolutionResult.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ResolutionResult.java Fri May 23 07:37:09 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.artifact.resolver.metadata.resolver;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

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

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

Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ResolutionResult.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri May 23 07:37:09 2008
@@ -0,0 +1 @@
+/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/ResolutionResult.java:658725

Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/ClasspathContainer.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/ClasspathContainer.java?rev=659553&r1=659552&r2=659553&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/ClasspathContainer.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/ClasspathContainer.java Fri May 23 07:37:09 2008
@@ -5,9 +5,9 @@
 import java.util.List;
 
 import org.apache.maven.artifact.ArtifactScopeEnum;
-import org.apache.maven.artifact.resolver.metadata.ArtifactMetadata;
-import org.apache.maven.artifact.resolver.metadata.MetadataResolutionException;
-import org.apache.maven.artifact.resolver.metadata.MetadataTreeNode;
+import org.apache.maven.artifact.resolver.metadata.resolver.ArtifactMetadata;
+import org.apache.maven.artifact.resolver.metadata.resolver.MetadataResolutionException;
+import org.apache.maven.artifact.resolver.metadata.resolver.MetadataTreeNode;
 
 /**
  * classpath container that is aware of the classpath scope

Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/ClasspathTransformation.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/ClasspathTransformation.java?rev=659553&r1=659552&r2=659553&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/ClasspathTransformation.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/ClasspathTransformation.java Fri May 23 07:37:09 2008
@@ -1,7 +1,7 @@
 package org.apache.maven.artifact.resolver.metadata.transform;
 
 import org.apache.maven.artifact.ArtifactScopeEnum;
-import org.apache.maven.artifact.resolver.metadata.MetadataGraph;
+import org.apache.maven.artifact.resolver.metadata.resolver.MetadataGraph;
 import org.apache.maven.artifact.transform.MetadataGraphTransformationException;
 
 

Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/DefaultClasspathTransformation.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/DefaultClasspathTransformation.java?rev=659553&r1=659552&r2=659553&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/DefaultClasspathTransformation.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/DefaultClasspathTransformation.java Fri May 23 07:37:09 2008
@@ -6,12 +6,12 @@
 import java.util.List;
 
 import org.apache.maven.artifact.ArtifactScopeEnum;
-import org.apache.maven.artifact.resolver.metadata.ArtifactMetadata;
-import org.apache.maven.artifact.resolver.metadata.MetadataGraph;
-import org.apache.maven.artifact.resolver.metadata.MetadataGraphEdge;
-import org.apache.maven.artifact.resolver.metadata.MetadataGraphVertex;
 import org.apache.maven.artifact.resolver.metadata.conflict.GraphConflictResolutionException;
 import org.apache.maven.artifact.resolver.metadata.conflict.GraphConflictResolver;
+import org.apache.maven.artifact.resolver.metadata.resolver.ArtifactMetadata;
+import org.apache.maven.artifact.resolver.metadata.resolver.MetadataGraph;
+import org.apache.maven.artifact.resolver.metadata.resolver.MetadataGraphEdge;
+import org.apache.maven.artifact.resolver.metadata.resolver.MetadataGraphVertex;
 import org.apache.maven.artifact.transform.MetadataGraphTransformationException;
 
 /**

Modified: maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicyTest.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicyTest.java?rev=659553&r1=659552&r2=659553&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicyTest.java (original)
+++ maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicyTest.java Fri May 23 07:37:09 2008
@@ -1,7 +1,7 @@
 package org.apache.maven.artifact.resolver.conflict;
 
-import org.apache.maven.artifact.resolver.metadata.MetadataGraphEdge;
 import org.apache.maven.artifact.resolver.metadata.conflict.GraphConflictResolutionPolicy;
+import org.apache.maven.artifact.resolver.metadata.resolver.MetadataGraphEdge;
 import org.codehaus.plexus.PlexusTestCase;
 
 /**

Modified: maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolverTest.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolverTest.java?rev=659553&r1=659552&r2=659553&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolverTest.java (original)
+++ maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolverTest.java Fri May 23 07:37:09 2008
@@ -5,11 +5,11 @@
 import java.util.Map;
 
 import org.apache.maven.artifact.ArtifactScopeEnum;
-import org.apache.maven.artifact.resolver.metadata.ArtifactMetadata;
-import org.apache.maven.artifact.resolver.metadata.MetadataGraph;
-import org.apache.maven.artifact.resolver.metadata.MetadataGraphEdge;
-import org.apache.maven.artifact.resolver.metadata.MetadataGraphVertex;
 import org.apache.maven.artifact.resolver.metadata.conflict.GraphConflictResolver;
+import org.apache.maven.artifact.resolver.metadata.resolver.ArtifactMetadata;
+import org.apache.maven.artifact.resolver.metadata.resolver.MetadataGraph;
+import org.apache.maven.artifact.resolver.metadata.resolver.MetadataGraphEdge;
+import org.apache.maven.artifact.resolver.metadata.resolver.MetadataGraphVertex;
 import org.codehaus.plexus.PlexusTestCase;
 import org.codehaus.plexus.logging.Logger;
 

Modified: maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/transform/DefaultClasspathTransformationTest.java
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/transform/DefaultClasspathTransformationTest.java?rev=659553&r1=659552&r2=659553&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/transform/DefaultClasspathTransformationTest.java (original)
+++ maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/transform/DefaultClasspathTransformationTest.java Fri May 23 07:37:09 2008
@@ -7,10 +7,10 @@
 import java.util.TreeSet;
 
 import org.apache.maven.artifact.ArtifactScopeEnum;
-import org.apache.maven.artifact.resolver.metadata.ArtifactMetadata;
-import org.apache.maven.artifact.resolver.metadata.MetadataGraph;
-import org.apache.maven.artifact.resolver.metadata.MetadataGraphEdge;
-import org.apache.maven.artifact.resolver.metadata.MetadataGraphVertex;
+import org.apache.maven.artifact.resolver.metadata.resolver.ArtifactMetadata;
+import org.apache.maven.artifact.resolver.metadata.resolver.MetadataGraph;
+import org.apache.maven.artifact.resolver.metadata.resolver.MetadataGraphEdge;
+import org.apache.maven.artifact.resolver.metadata.resolver.MetadataGraphVertex;
 import org.apache.maven.artifact.resolver.metadata.transform.ClasspathContainer;
 import org.apache.maven.artifact.resolver.metadata.transform.ClasspathTransformation;
 import org.codehaus.plexus.PlexusTestCase;