tr...

jvanzyl Sat, 24 May 2008 19:12:37 -0700

Author: jvanzyl
Date: Sat May 24 19:12:09 2008
New Revision: 659891

URL: http://svn.apache.org/viewvc?rev=659891&view=rev
Log:
o start the tests over from scratch


Added:
    
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/
   (props changed)
      - copied from r659861, 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/
    
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/DefaultMetadataResolver.java
      - copied, changed from r659862, 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/DefaultMetadataResolver.java
Removed:
    
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/AbstractArtifactResolutionException.java
    
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/ArtifactResolutionException.java
    
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/ArtifactResolver.java
    
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/DefaultArtifactResolver.java
    
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/ResolutionRequest.java
    
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/ResolutionResult.java
    
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/metadata/
    maven/artifact/branches/CAP/src/test/java/
    maven/artifact/branches/CAP/src/test/resources/
Modified:
    
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/ConflictResolutionPolicy.java
    
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/ConflictResolver.java
    
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/DefaultConflictResolutionPolicy.java
    
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/DefaultConflictResolver.java
    
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/ArtifactMetadata.java
    
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataGraph.java
    
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataGraphEdge.java
    
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataGraphVertex.java
    
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataResolution.java
    
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionException.java
    
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionRequest.java
    
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionRequestTypeEnum.java
    
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionResult.java
    
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataResolver.java
    
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataRetrievalException.java
    
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataSource.java
    
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataTreeNode.java
    
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/transform/ClasspathContainer.java
    
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/transform/ClasspathTransformation.java
    
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/transform/DefaultClasspathTransformation.java

Modified: 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/ConflictResolutionPolicy.java
URL: 
http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/ConflictResolutionPolicy.java?rev=659891&r1=659890&r2=659891&view=diff
==============================================================================
--- 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/ConflictResolutionPolicy.java
 (original)
+++ 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/ConflictResolutionPolicy.java
 Sat May 24 19:12:09 2008
@@ -1,6 +1,6 @@
 package org.apache.maven.mercury.conflict;
 
-import org.apache.maven.mercury.resolver.MetadataGraphEdge;
+import org.apache.maven.mercury.representation.MetadataGraphEdge;
 
 /*
  * MetadataGraph edge selection policy. Complements GraphConflictResolver by 
being injected into it

Modified: 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/ConflictResolver.java
URL: 
http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/ConflictResolver.java?rev=659891&r1=659890&r2=659891&view=diff
==============================================================================
--- 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/ConflictResolver.java
 (original)
+++ 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/ConflictResolver.java
 Sat May 24 19:12:09 2008
@@ -16,7 +16,7 @@
  */
 
 import org.apache.maven.mercury.ArtifactScopeEnum;
-import org.apache.maven.mercury.resolver.MetadataGraph;
+import org.apache.maven.mercury.representation.MetadataGraph;
 
 /*
  * Resolves conflicts in the supplied dependency graph. Different 
implementations will implement

Modified: 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/DefaultConflictResolutionPolicy.java
URL: 
http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/DefaultConflictResolutionPolicy.java?rev=659891&r1=659890&r2=659891&view=diff
==============================================================================
--- 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/DefaultConflictResolutionPolicy.java
 (original)
+++ 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/DefaultConflictResolutionPolicy.java
 Sat May 24 19:12:09 2008
@@ -1,6 +1,6 @@
 package org.apache.maven.mercury.conflict;
 
-import org.apache.maven.mercury.resolver.MetadataGraphEdge;
+import org.apache.maven.mercury.representation.MetadataGraphEdge;
 import org.apache.maven.mercury.version.ArtifactVersion;
 import org.apache.maven.mercury.version.DefaultArtifactVersion;
 

Modified: 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/DefaultConflictResolver.java
URL: 
http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/DefaultConflictResolver.java?rev=659891&r1=659890&r2=659891&view=diff
==============================================================================
--- 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/DefaultConflictResolver.java
 (original)
+++ 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/DefaultConflictResolver.java
 Sat May 24 19:12:09 2008
@@ -20,11 +20,11 @@
 import java.util.TreeSet;
 
 import org.apache.maven.mercury.ArtifactScopeEnum;
-import org.apache.maven.mercury.resolver.ArtifactMetadata;
-import org.apache.maven.mercury.resolver.MetadataGraph;
-import org.apache.maven.mercury.resolver.MetadataGraphEdge;
-import org.apache.maven.mercury.resolver.MetadataGraphVertex;
-import org.apache.maven.mercury.resolver.MetadataResolutionException;
+import org.apache.maven.mercury.representation.ArtifactMetadata;
+import org.apache.maven.mercury.representation.MetadataGraph;
+import org.apache.maven.mercury.representation.MetadataGraphEdge;
+import org.apache.maven.mercury.representation.MetadataGraphVertex;
+import org.apache.maven.mercury.representation.MetadataResolutionException;
 
 /*
  * Default conflict resolver.Implements closer newer first policy by default, 
but could be

Propchange: 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat May 24 19:12:09 2008
@@ -0,0 +1 @@
+/maven/artifact/trunk/src/main/java/org/apache/maven/mercury/resolver:658725

Modified: 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/ArtifactMetadata.java
URL: 
http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/ArtifactMetadata.java?rev=659891&r1=659861&r2=659891&view=diff
==============================================================================
--- 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/ArtifactMetadata.java
 (original)
+++ 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/ArtifactMetadata.java
 Sat May 24 19:12:09 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.resolver;
+package org.apache.maven.mercury.representation;
 
 import java.util.Collection;
 

Copied: 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/DefaultMetadataResolver.java
 (from r659862, 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/DefaultMetadataResolver.java)
URL: 
http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/DefaultMetadataResolver.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/DefaultMetadataResolver.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/DefaultMetadataResolver.java&r1=659862&r2=659891&rev=659891&view=diff
==============================================================================
--- 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/DefaultMetadataResolver.java
 (original)
+++ 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/DefaultMetadataResolver.java
 Sat May 24 19:12:09 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.resolver;
+package org.apache.maven.mercury.representation;
 
 import java.util.Collection;
 import java.util.List;

Modified: 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataGraph.java
URL: 
http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataGraph.java?rev=659891&r1=659861&r2=659891&view=diff
==============================================================================
--- 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataGraph.java
 (original)
+++ 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataGraph.java
 Sat May 24 19:12:09 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.resolver;
+package org.apache.maven.mercury.representation;
 
 import java.util.ArrayList;
 import java.util.HashMap;

Modified: 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataGraphEdge.java
URL: 
http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataGraphEdge.java?rev=659891&r1=659861&r2=659891&view=diff
==============================================================================
--- 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataGraphEdge.java
 (original)
+++ 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataGraphEdge.java
 Sat May 24 19:12:09 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.resolver;
+package org.apache.maven.mercury.representation;
 
 import org.apache.maven.mercury.ArtifactScopeEnum;
 

Modified: 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataGraphVertex.java
URL: 
http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataGraphVertex.java?rev=659891&r1=659861&r2=659891&view=diff
==============================================================================
--- 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataGraphVertex.java
 (original)
+++ 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataGraphVertex.java
 Sat May 24 19:12:09 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.resolver;
+package org.apache.maven.mercury.representation;
 
 import org.apache.maven.mercury.ArtifactScopeEnum;
 

Modified: 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataResolution.java
URL: 
http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataResolution.java?rev=659891&r1=659861&r2=659891&view=diff
==============================================================================
--- 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataResolution.java
 (original)
+++ 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataResolution.java
 Sat May 24 19:12:09 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.resolver;
+package org.apache.maven.mercury.representation;
 
 import java.util.Collection;
 

Modified: 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionException.java
URL: 
http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionException.java?rev=659891&r1=659861&r2=659891&view=diff
==============================================================================
--- 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionException.java
 (original)
+++ 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionException.java
 Sat May 24 19:12:09 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.resolver;
+package org.apache.maven.mercury.representation;
 
 public class MetadataResolutionException
     extends Exception

Modified: 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionRequest.java
URL: 
http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionRequest.java?rev=659891&r1=659861&r2=659891&view=diff
==============================================================================
--- 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionRequest.java
 (original)
+++ 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionRequest.java
 Sat May 24 19:12:09 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.resolver;
+package org.apache.maven.mercury.representation;
 
 import java.util.List;
 

Modified: 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionRequestTypeEnum.java
URL: 
http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionRequestTypeEnum.java?rev=659891&r1=659861&r2=659891&view=diff
==============================================================================
--- 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionRequestTypeEnum.java
 (original)
+++ 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionRequestTypeEnum.java
 Sat May 24 19:12:09 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.resolver;
+package org.apache.maven.mercury.representation;
 
 public enum MetadataResolutionRequestTypeEnum
 {

Modified: 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionResult.java
URL: 
http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionResult.java?rev=659891&r1=659861&r2=659891&view=diff
==============================================================================
--- 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionResult.java
 (original)
+++ 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataResolutionResult.java
 Sat May 24 19:12:09 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.resolver;
+package org.apache.maven.mercury.representation;
 
 import org.apache.maven.mercury.ArtifactScopeEnum;
 import org.apache.maven.mercury.conflict.ConflictResolutionException;

Modified: 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataResolver.java
URL: 
http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataResolver.java?rev=659891&r1=659861&r2=659891&view=diff
==============================================================================
--- 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataResolver.java
 (original)
+++ 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataResolver.java
 Sat May 24 19:12:09 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.resolver;
+package org.apache.maven.mercury.representation;
 
 /**
  * entry point into metadata resolution component

Modified: 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataRetrievalException.java
URL: 
http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataRetrievalException.java?rev=659891&r1=659861&r2=659891&view=diff
==============================================================================
--- 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataRetrievalException.java
 (original)
+++ 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataRetrievalException.java
 Sat May 24 19:12:09 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.resolver;
+package org.apache.maven.mercury.representation;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Modified: 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataSource.java
URL: 
http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataSource.java?rev=659891&r1=659861&r2=659891&view=diff
==============================================================================
--- 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataSource.java
 (original)
+++ 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataSource.java
 Sat May 24 19:12:09 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.resolver;
+package org.apache.maven.mercury.representation;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

Modified: 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataTreeNode.java
URL: 
http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataTreeNode.java?rev=659891&r1=659861&r2=659891&view=diff
==============================================================================
--- 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataTreeNode.java
 (original)
+++ 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/representation/MetadataTreeNode.java
 Sat May 24 19:12:09 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.mercury.resolver;
+package org.apache.maven.mercury.representation;
 
 import org.apache.maven.mercury.Artifact;
 import org.apache.maven.mercury.ArtifactScopeEnum;

Modified: 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/transform/ClasspathContainer.java
URL: 
http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/transform/ClasspathContainer.java?rev=659891&r1=659890&r2=659891&view=diff
==============================================================================
--- 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/transform/ClasspathContainer.java
 (original)
+++ 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/transform/ClasspathContainer.java
 Sat May 24 19:12:09 2008
@@ -5,9 +5,9 @@
 import java.util.List;
 
 import org.apache.maven.mercury.ArtifactScopeEnum;
-import org.apache.maven.mercury.resolver.ArtifactMetadata;
-import org.apache.maven.mercury.resolver.MetadataResolutionException;
-import org.apache.maven.mercury.resolver.MetadataTreeNode;
+import org.apache.maven.mercury.representation.ArtifactMetadata;
+import org.apache.maven.mercury.representation.MetadataResolutionException;
+import org.apache.maven.mercury.representation.MetadataTreeNode;
 
 /*
  * classpath container that is aware of the classpath scope

Modified: 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/transform/ClasspathTransformation.java
URL: 
http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/transform/ClasspathTransformation.java?rev=659891&r1=659890&r2=659891&view=diff
==============================================================================
--- 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/transform/ClasspathTransformation.java
 (original)
+++ 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/transform/ClasspathTransformation.java
 Sat May 24 19:12:09 2008
@@ -1,7 +1,7 @@
 package org.apache.maven.mercury.transform;
 
 import org.apache.maven.mercury.ArtifactScopeEnum;
-import org.apache.maven.mercury.resolver.MetadataGraph;
+import org.apache.maven.mercury.representation.MetadataGraph;
 
 /*
  * Helper class to conver an Md Graph into some form of a classpath

Modified: 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/transform/DefaultClasspathTransformation.java
URL: 
http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/transform/DefaultClasspathTransformation.java?rev=659891&r1=659890&r2=659891&view=diff
==============================================================================
--- 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/transform/DefaultClasspathTransformation.java
 (original)
+++ 
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/transform/DefaultClasspathTransformation.java
 Sat May 24 19:12:09 2008
@@ -8,10 +8,10 @@
 import org.apache.maven.mercury.ArtifactScopeEnum;
 import org.apache.maven.mercury.conflict.ConflictResolutionException;
 import org.apache.maven.mercury.conflict.ConflictResolver;
-import org.apache.maven.mercury.resolver.ArtifactMetadata;
-import org.apache.maven.mercury.resolver.MetadataGraph;
-import org.apache.maven.mercury.resolver.MetadataGraphEdge;
-import org.apache.maven.mercury.resolver.MetadataGraphVertex;
+import org.apache.maven.mercury.representation.ArtifactMetadata;
+import org.apache.maven.mercury.representation.MetadataGraph;
+import org.apache.maven.mercury.representation.MetadataGraphEdge;
+import org.apache.maven.mercury.representation.MetadataGraphVertex;
 
 /*
  * default implementation of the metadata classpath transformer

svn commit: r659891 - in /maven/artifact/branches/CAP/src: main/java/org/apache/maven/mercury/conflict/ main/java/org/apache/maven/mercury/representation/ main/java/org/apache/maven/mercury/representation/metadata/ main/java/org/apache/maven/mercury/tr...

Reply via email to