Return-Path: Delivered-To: apmail-maven-commits-archive@www.apache.org Received: (qmail 15641 invoked from network); 23 May 2008 14:58:58 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 23 May 2008 14:58:58 -0000 Received: (qmail 2314 invoked by uid 500); 23 May 2008 14:58:58 -0000 Delivered-To: apmail-maven-commits-archive@maven.apache.org Received: (qmail 2261 invoked by uid 500); 23 May 2008 14:58:57 -0000 Mailing-List: contact commits-help@maven.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@maven.apache.org Delivered-To: mailing list commits@maven.apache.org Received: (qmail 2223 invoked by uid 99); 23 May 2008 14:58:57 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 May 2008 07:58:57 -0700 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 May 2008 14:58:16 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id A0EDE2388A2A; Fri, 23 May 2008 07:58:32 -0700 (PDT) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r659561 [2/2] - in /maven/artifact/branches/CAP/src: main/java/org/apache/maven/artifact/ main/java/org/apache/maven/artifact/deployer/ main/java/org/apache/maven/artifact/installer/ main/java/org/apache/maven/artifact/manager/ main/java/or... Date: Fri, 23 May 2008 14:58:26 -0000 To: commits@maven.apache.org From: jvanzyl@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080523145832.A0EDE2388A2A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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=659561&r1=659560&r2=659561&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:58:21 2008 @@ -1,8 +1,8 @@ package org.apache.maven.artifact.resolver.metadata.conflict; import org.apache.maven.artifact.resolver.metadata.resolver.MetadataGraphEdge; -import org.apache.maven.artifact.versioning.ArtifactVersion; -import org.apache.maven.artifact.versioning.DefaultArtifactVersion; +import org.apache.maven.artifact.resolver.metadata.version.ArtifactVersion; +import org.apache.maven.artifact.resolver.metadata.version.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=659561&r1=659560&r2=659561&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:58:21 2008 @@ -19,17 +19,17 @@ * under the License. */ -import org.apache.maven.artifact.ArtifactScopeEnum; +import java.util.ArrayList; +import java.util.List; +import java.util.TreeSet; + +import org.apache.maven.artifact.resolver.metadata.ArtifactScopeEnum; 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; -import java.util.TreeSet; - /** * Default conflict resolver.Implements closer newer first policy * by default, but could be configured via plexus 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=659561&r1=659560&r2=659561&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:58:21 2008 @@ -19,7 +19,7 @@ * under the License. */ -import org.apache.maven.artifact.ArtifactScopeEnum; +import org.apache.maven.artifact.resolver.metadata.ArtifactScopeEnum; import org.apache.maven.artifact.resolver.metadata.resolver.MetadataGraph; /** Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/AbstractArtifactResolutionException.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/AbstractArtifactResolutionException.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/AbstractArtifactResolutionException.java (original) +++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/AbstractArtifactResolutionException.java Fri May 23 07:58:21 2008 @@ -15,13 +15,13 @@ * the License. */ -import org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.repository.ArtifactRepository; - import java.util.HashSet; import java.util.Iterator; import java.util.List; +import org.apache.maven.artifact.resolver.metadata.Artifact; +import org.apache.maven.artifact.resolver.metadata.ArtifactRepository; + /* * Base class for artifact resolution exceptions. * Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactMetadata.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactMetadata.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactMetadata.java (original) +++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactMetadata.java Fri May 23 07:58:21 2008 @@ -2,8 +2,8 @@ import java.util.Collection; -import org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.ArtifactScopeEnum; +import org.apache.maven.artifact.resolver.metadata.Artifact; +import org.apache.maven.artifact.resolver.metadata.ArtifactScopeEnum; /** * Artifact Metadata that is resolved independent of Artifact itself. Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactNotFoundException.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactNotFoundException.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactNotFoundException.java (original) +++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactNotFoundException.java Fri May 23 07:58:21 2008 @@ -19,11 +19,11 @@ * under the License. */ -import org.apache.maven.artifact.Artifact; -import org.apache.maven.wagon.ResourceDoesNotExistException; - import java.util.List; +import org.apache.maven.artifact.resolver.metadata.Artifact; +import org.apache.maven.wagon.ResourceDoesNotExistException; + /** * @author Jason van Zyl * @version $Id$ Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactResolutionException.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactResolutionException.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactResolutionException.java (original) +++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactResolutionException.java Fri May 23 07:58:21 2008 @@ -19,14 +19,14 @@ * under the License. */ -import org.apache.maven.artifact.Artifact; +import java.io.IOException; +import java.util.List; + import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException; import org.apache.maven.artifact.repository.metadata.RepositoryMetadataResolutionException; +import org.apache.maven.artifact.resolver.metadata.Artifact; import org.apache.maven.wagon.TransferFailedException; -import java.io.IOException; -import java.util.List; - /** * @author Jason van Zyl * @version $Id$ Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultArtifactResolver.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultArtifactResolver.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultArtifactResolver.java (original) +++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultArtifactResolver.java Fri May 23 07:58:21 2008 @@ -19,11 +19,6 @@ * under the License. */ -import java.util.List; - -import org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.manager.WagonManager; -import org.apache.maven.artifact.repository.ArtifactRepository; import org.codehaus.plexus.logging.AbstractLogEnabled; /** Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultMetadataResolver.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultMetadataResolver.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultMetadataResolver.java (original) +++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultMetadataResolver.java Fri May 23 07:58:21 2008 @@ -4,14 +4,13 @@ import java.util.Collection; import java.util.List; -import org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.DefaultArtifact; -import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; -import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.resolver.ArtifactNotFoundException; import org.apache.maven.artifact.resolver.ArtifactResolutionException; import org.apache.maven.artifact.resolver.ArtifactResolutionRequest; import org.apache.maven.artifact.resolver.ArtifactResolver; +import org.apache.maven.artifact.resolver.metadata.Artifact; +import org.apache.maven.artifact.resolver.metadata.ArtifactRepository; +import org.apache.maven.artifact.resolver.metadata.DefaultArtifact; import org.apache.maven.artifact.resolver.metadata.conflict.GraphConflictResolver; import org.apache.maven.artifact.resolver.metadata.transform.ClasspathTransformation; import org.codehaus.plexus.logging.AbstractLogEnabled; Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataGraph.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataGraph.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataGraph.java (original) +++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataGraph.java Fri May 23 07:58:21 2008 @@ -6,7 +6,7 @@ import java.util.Map; import java.util.TreeSet; -import org.apache.maven.artifact.ArtifactScopeEnum; +import org.apache.maven.artifact.resolver.metadata.ArtifactScopeEnum; /** * maven dependency metadata graph Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataGraphEdge.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataGraphEdge.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataGraphEdge.java (original) +++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataGraphEdge.java Fri May 23 07:58:21 2008 @@ -1,6 +1,6 @@ package org.apache.maven.artifact.resolver.metadata.resolver; -import org.apache.maven.artifact.ArtifactScopeEnum; +import org.apache.maven.artifact.resolver.metadata.ArtifactScopeEnum; /** Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataGraphVertex.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataGraphVertex.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataGraphVertex.java (original) +++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataGraphVertex.java Fri May 23 07:58:21 2008 @@ -1,8 +1,6 @@ package org.apache.maven.artifact.resolver.metadata.resolver; -import org.apache.maven.artifact.ArtifactScopeEnum; - -import sun.misc.BASE64Encoder; +import org.apache.maven.artifact.resolver.metadata.ArtifactScopeEnum; /** Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolution.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolution.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolution.java (original) +++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolution.java Fri May 23 07:58:21 2008 @@ -2,7 +2,7 @@ import java.util.Collection; -import org.apache.maven.artifact.repository.ArtifactRepository; +import org.apache.maven.artifact.resolver.metadata.ArtifactRepository; /** * Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionRequest.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionRequest.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionRequest.java (original) +++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionRequest.java Fri May 23 07:58:21 2008 @@ -2,7 +2,7 @@ import java.util.List; -import org.apache.maven.artifact.repository.ArtifactRepository; +import org.apache.maven.artifact.resolver.metadata.ArtifactRepository; /** @author Oleg Gusakov */ Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionResult.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionResult.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionResult.java (original) +++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionResult.java Fri May 23 07:58:21 2008 @@ -1,6 +1,6 @@ package org.apache.maven.artifact.resolver.metadata.resolver; -import org.apache.maven.artifact.ArtifactScopeEnum; +import org.apache.maven.artifact.resolver.metadata.ArtifactScopeEnum; 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.transform.ClasspathContainer; Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolver.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolver.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolver.java (original) +++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolver.java Fri May 23 07:58:21 2008 @@ -1,11 +1,10 @@ package org.apache.maven.artifact.resolver.metadata.resolver; -import java.util.Collection; import java.util.List; -import org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.resolver.ArtifactResolutionException; +import org.apache.maven.artifact.resolver.metadata.Artifact; +import org.apache.maven.artifact.resolver.metadata.ArtifactRepository; /** * entry point into metadata resolution component Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataSource.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataSource.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataSource.java (original) +++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataSource.java Fri May 23 07:58:21 2008 @@ -19,10 +19,10 @@ * under the License. */ -import org.apache.maven.artifact.repository.ArtifactRepository; - import java.util.List; +import org.apache.maven.artifact.resolver.metadata.ArtifactRepository; + /** * Provides some metadata operations, like querying the remote repository for a list of versions available for an * artifact. Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataTreeNode.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataTreeNode.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataTreeNode.java (original) +++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataTreeNode.java Fri May 23 07:58:21 2008 @@ -1,7 +1,7 @@ package org.apache.maven.artifact.resolver.metadata.resolver; -import org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.ArtifactScopeEnum; +import org.apache.maven.artifact.resolver.metadata.Artifact; +import org.apache.maven.artifact.resolver.metadata.ArtifactScopeEnum; /** * metadata [dirty] Tree * Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ResolutionRequest.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ResolutionRequest.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ResolutionRequest.java (original) +++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ResolutionRequest.java Fri May 23 07:58:21 2008 @@ -1,14 +1,10 @@ package org.apache.maven.artifact.resolver.metadata.resolver; -import org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.metadata.ArtifactMetadataSource; -import org.apache.maven.artifact.repository.ArtifactRepository; -import org.apache.maven.artifact.resolver.filter.ArtifactFilter; - import java.util.ArrayList; import java.util.List; -import java.util.Map; -import java.util.Set; + +import org.apache.maven.artifact.resolver.metadata.Artifact; +import org.apache.maven.artifact.resolver.metadata.ArtifactRepository; /** * A resolution request allows you to either use an existing MavenProject, or a coordinate (gid:aid:version) Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ResolutionResult.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ResolutionResult.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ResolutionResult.java (original) +++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ResolutionResult.java Fri May 23 07:58:21 2008 @@ -19,16 +19,14 @@ * under the License. */ -import org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.versioning.OverConstrainedVersionException; - import java.util.ArrayList; import java.util.Collections; -import java.util.Iterator; -import java.util.LinkedHashSet; import java.util.List; import java.util.Set; +import org.apache.maven.artifact.resolver.metadata.Artifact; +import org.apache.maven.artifact.resolver.metadata.version.OverConstrainedVersionException; + /** * Specific problems during resolution that we want to account for: *

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=659561&r1=659560&r2=659561&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:58:21 2008 @@ -4,7 +4,7 @@ import java.util.Iterator; import java.util.List; -import org.apache.maven.artifact.ArtifactScopeEnum; +import org.apache.maven.artifact.resolver.metadata.ArtifactScopeEnum; 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; 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=659561&r1=659560&r2=659561&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:58:21 2008 @@ -1,6 +1,6 @@ package org.apache.maven.artifact.resolver.metadata.transform; -import org.apache.maven.artifact.ArtifactScopeEnum; +import org.apache.maven.artifact.resolver.metadata.ArtifactScopeEnum; 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=659561&r1=659560&r2=659561&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:58:21 2008 @@ -5,7 +5,7 @@ import java.util.Comparator; import java.util.List; -import org.apache.maven.artifact.ArtifactScopeEnum; +import org.apache.maven.artifact.resolver.metadata.ArtifactScopeEnum; 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; Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/ArtifactVersion.java (from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/versioning/ArtifactVersion.java) URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/ArtifactVersion.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/ArtifactVersion.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/versioning/ArtifactVersion.java&r1=659112&r2=659561&rev=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/versioning/ArtifactVersion.java (original) +++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/ArtifactVersion.java Fri May 23 07:58:21 2008 @@ -1,4 +1,4 @@ -package org.apache.maven.artifact.versioning; +package org.apache.maven.artifact.resolver.metadata.version; /* * Licensed to the Apache Software Foundation (ASF) under one Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/ArtifactVersion.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/ArtifactVersion.java ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/ArtifactVersion.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri May 23 07:58:21 2008 @@ -0,0 +1 @@ +/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/ArtifactVersion.java:658725 Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/ComparableVersion.java (from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java) URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/ComparableVersion.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/ComparableVersion.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java&r1=659112&r2=659561&rev=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java (original) +++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/ComparableVersion.java Fri May 23 07:58:21 2008 @@ -1,4 +1,4 @@ -package org.apache.maven.artifact.versioning; +package org.apache.maven.artifact.resolver.metadata.version; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,8 +24,8 @@ import java.util.Iterator; import java.util.List; import java.util.ListIterator; -import java.util.Properties; import java.util.Locale; +import java.util.Properties; import java.util.Stack; /** Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/ComparableVersion.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/ComparableVersion.java ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/ComparableVersion.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri May 23 07:58:21 2008 @@ -0,0 +1 @@ +/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/ComparableVersion.java:658725 Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/DefaultArtifactVersion.java (from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java) URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/DefaultArtifactVersion.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/DefaultArtifactVersion.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java&r1=659112&r2=659561&rev=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java (original) +++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/DefaultArtifactVersion.java Fri May 23 07:58:21 2008 @@ -1,4 +1,4 @@ -package org.apache.maven.artifact.versioning; +package org.apache.maven.artifact.resolver.metadata.version; /* * Licensed to the Apache Software Foundation (ASF) under one Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/DefaultArtifactVersion.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/DefaultArtifactVersion.java ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/DefaultArtifactVersion.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri May 23 07:58:21 2008 @@ -0,0 +1 @@ +/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/DefaultArtifactVersion.java:658725 Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/InvalidVersionSpecificationException.java (from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/versioning/InvalidVersionSpecificationException.java) URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/InvalidVersionSpecificationException.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/InvalidVersionSpecificationException.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/versioning/InvalidVersionSpecificationException.java&r1=659112&r2=659561&rev=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/versioning/InvalidVersionSpecificationException.java (original) +++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/InvalidVersionSpecificationException.java Fri May 23 07:58:21 2008 @@ -1,4 +1,4 @@ -package org.apache.maven.artifact.versioning; +package org.apache.maven.artifact.resolver.metadata.version; /* * Licensed to the Apache Software Foundation (ASF) under one Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/InvalidVersionSpecificationException.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/InvalidVersionSpecificationException.java ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/InvalidVersionSpecificationException.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri May 23 07:58:21 2008 @@ -0,0 +1 @@ +/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/InvalidVersionSpecificationException.java:658725 Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/ManagedVersionMap.java (from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java) URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/ManagedVersionMap.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/ManagedVersionMap.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java&r1=659112&r2=659561&rev=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java (original) +++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/ManagedVersionMap.java Fri May 23 07:58:21 2008 @@ -1,4 +1,4 @@ -package org.apache.maven.artifact.versioning; +package org.apache.maven.artifact.resolver.metadata.version; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -20,8 +20,8 @@ */ import java.util.HashMap; -import java.util.Map; import java.util.Iterator; +import java.util.Map; public class ManagedVersionMap extends HashMap Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/ManagedVersionMap.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/ManagedVersionMap.java ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/ManagedVersionMap.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri May 23 07:58:21 2008 @@ -0,0 +1 @@ +/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/ManagedVersionMap.java:658725 Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/OverConstrainedVersionException.java (from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java) URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/OverConstrainedVersionException.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/OverConstrainedVersionException.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java&r1=659112&r2=659561&rev=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java (original) +++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/OverConstrainedVersionException.java Fri May 23 07:58:21 2008 @@ -1,4 +1,4 @@ -package org.apache.maven.artifact.versioning; +package org.apache.maven.artifact.resolver.metadata.version; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -19,12 +19,12 @@ * under the License. */ -import org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.repository.ArtifactRepository; -import org.apache.maven.artifact.resolver.ArtifactResolutionException; - import java.util.List; +import org.apache.maven.artifact.resolver.ArtifactResolutionException; +import org.apache.maven.artifact.resolver.metadata.Artifact; +import org.apache.maven.artifact.resolver.metadata.ArtifactRepository; + /** * Occurs when ranges exclude each other and no valid value remains. * Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/OverConstrainedVersionException.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/OverConstrainedVersionException.java ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/OverConstrainedVersionException.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri May 23 07:58:21 2008 @@ -0,0 +1 @@ +/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/OverConstrainedVersionException.java:658725 Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/Restriction.java (from r659112, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/versioning/Restriction.java) URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/Restriction.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/Restriction.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/versioning/Restriction.java&r1=659112&r2=659561&rev=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/versioning/Restriction.java (original) +++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/Restriction.java Fri May 23 07:58:21 2008 @@ -1,4 +1,4 @@ -package org.apache.maven.artifact.versioning; +package org.apache.maven.artifact.resolver.metadata.version; /* * Licensed to the Apache Software Foundation (ASF) under one Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/Restriction.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/Restriction.java ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/Restriction.java ------------------------------------------------------------------------------ --- svn:mergeinfo (added) +++ svn:mergeinfo Fri May 23 07:58:21 2008 @@ -0,0 +1 @@ +/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/versioning/Restriction.java:658725 Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/VersionRange.java (from r659119, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java) URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/VersionRange.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/VersionRange.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java&r1=659119&r2=659561&rev=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/versioning/VersionRange.java (original) +++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/VersionRange.java Fri May 23 07:58:21 2008 @@ -1,4 +1,4 @@ -package org.apache.maven.artifact.versioning; +package org.apache.maven.artifact.resolver.metadata.version; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -24,7 +24,8 @@ import java.util.Iterator; import java.util.List; -import org.apache.maven.artifact.Artifact; +import org.apache.maven.artifact.resolver.metadata.Artifact; + /** * Construct a version range from a specification. Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/VersionRange.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/VersionRange.java ------------------------------------------------------------------------------ svn:keywords = "Author Date Id Revision" Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/VersionRange.java ------------------------------------------------------------------------------ svn:mergeinfo = Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java (original) +++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/transform/AbstractVersionTransformation.java Fri May 23 07:58:21 2008 @@ -19,9 +19,7 @@ * under the License. */ -import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.manager.WagonManager; -import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata; import org.apache.maven.artifact.repository.metadata.Metadata; import org.apache.maven.artifact.repository.metadata.RepositoryMetadata; @@ -29,6 +27,8 @@ import org.apache.maven.artifact.repository.metadata.RepositoryMetadataResolutionException; import org.apache.maven.artifact.repository.metadata.SnapshotArtifactRepositoryMetadata; import org.apache.maven.artifact.repository.metadata.Versioning; +import org.apache.maven.artifact.resolver.metadata.Artifact; +import org.apache.maven.artifact.resolver.metadata.ArtifactRepository; import org.codehaus.plexus.logging.AbstractLogEnabled; import java.util.List; Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java (original) +++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformation.java Fri May 23 07:58:21 2008 @@ -19,12 +19,12 @@ * under the License. */ -import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.deployer.ArtifactDeploymentException; import org.apache.maven.artifact.installer.ArtifactInstallationException; -import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.resolver.ArtifactNotFoundException; import org.apache.maven.artifact.resolver.ArtifactResolutionException; +import org.apache.maven.artifact.resolver.metadata.Artifact; +import org.apache.maven.artifact.resolver.metadata.ArtifactRepository; import java.util.List; Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java (original) +++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/transform/ArtifactTransformationManager.java Fri May 23 07:58:21 2008 @@ -19,12 +19,12 @@ * under the License. */ -import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.deployer.ArtifactDeploymentException; import org.apache.maven.artifact.installer.ArtifactInstallationException; -import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.resolver.ArtifactNotFoundException; import org.apache.maven.artifact.resolver.ArtifactResolutionException; +import org.apache.maven.artifact.resolver.metadata.Artifact; +import org.apache.maven.artifact.resolver.metadata.ArtifactRepository; import java.util.List; import java.util.Map; Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java (original) +++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/transform/DefaultArtifactTransformationManager.java Fri May 23 07:58:21 2008 @@ -19,12 +19,12 @@ * under the License. */ -import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.deployer.ArtifactDeploymentException; import org.apache.maven.artifact.installer.ArtifactInstallationException; -import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.resolver.ArtifactNotFoundException; import org.apache.maven.artifact.resolver.ArtifactResolutionException; +import org.apache.maven.artifact.resolver.metadata.Artifact; +import org.apache.maven.artifact.resolver.metadata.ArtifactRepository; import java.util.Iterator; import java.util.List; Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java (original) +++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/transform/LatestArtifactTransformation.java Fri May 23 07:58:21 2008 @@ -19,12 +19,12 @@ * under the License. */ -import org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.metadata.RepositoryMetadataResolutionException; import org.apache.maven.artifact.repository.metadata.Versioning; import org.apache.maven.artifact.resolver.ArtifactNotFoundException; import org.apache.maven.artifact.resolver.ArtifactResolutionException; +import org.apache.maven.artifact.resolver.metadata.Artifact; +import org.apache.maven.artifact.resolver.metadata.ArtifactRepository; import java.util.List; Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java (original) +++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/transform/ReleaseArtifactTransformation.java Fri May 23 07:58:21 2008 @@ -19,14 +19,14 @@ * under the License. */ -import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.metadata.ArtifactMetadata; -import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata; import org.apache.maven.artifact.repository.metadata.RepositoryMetadataResolutionException; import org.apache.maven.artifact.repository.metadata.Versioning; import org.apache.maven.artifact.resolver.ArtifactNotFoundException; import org.apache.maven.artifact.resolver.ArtifactResolutionException; +import org.apache.maven.artifact.resolver.metadata.Artifact; +import org.apache.maven.artifact.resolver.metadata.ArtifactRepository; import java.util.List; Modified: maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java (original) +++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/transform/SnapshotTransformation.java Fri May 23 07:58:21 2008 @@ -19,9 +19,7 @@ * under the License. */ -import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.deployer.ArtifactDeploymentException; -import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.metadata.Metadata; import org.apache.maven.artifact.repository.metadata.RepositoryMetadata; import org.apache.maven.artifact.repository.metadata.RepositoryMetadataResolutionException; @@ -29,6 +27,8 @@ import org.apache.maven.artifact.repository.metadata.SnapshotArtifactRepositoryMetadata; import org.apache.maven.artifact.repository.metadata.Versioning; import org.apache.maven.artifact.resolver.ArtifactResolutionException; +import org.apache.maven.artifact.resolver.metadata.Artifact; +import org.apache.maven.artifact.resolver.metadata.ArtifactRepository; import org.codehaus.plexus.util.StringUtils; import java.text.DateFormat; Modified: maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java (original) +++ maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/AbstractArtifactComponentTestCase.java Fri May 23 07:58:21 2008 @@ -19,10 +19,12 @@ * under the License. */ -import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy; import org.apache.maven.artifact.repository.DefaultArtifactRepository; import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; +import org.apache.maven.artifact.resolver.metadata.Artifact; +import org.apache.maven.artifact.resolver.metadata.ArtifactRepository; +import org.apache.maven.artifact.resolver.metadata.DefaultArtifact; import org.codehaus.plexus.PlexusTestCase; import java.io.File; Modified: maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java (original) +++ maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/DefaultArtifactTest.java Fri May 23 07:58:21 2008 @@ -20,7 +20,8 @@ */ import org.apache.maven.artifact.handler.ArtifactHandlerMock; -import org.apache.maven.artifact.versioning.VersionRange; +import org.apache.maven.artifact.resolver.metadata.DefaultArtifact; +import org.apache.maven.artifact.resolver.metadata.version.VersionRange; import junit.framework.TestCase; Modified: maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java (original) +++ maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/deployer/ArtifactDeployerTest.java Fri May 23 07:58:21 2008 @@ -20,7 +20,7 @@ */ import org.apache.maven.artifact.AbstractArtifactComponentTestCase; -import org.apache.maven.artifact.Artifact; +import org.apache.maven.artifact.resolver.metadata.Artifact; import java.io.File; Modified: maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java (original) +++ maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java Fri May 23 07:58:21 2008 @@ -1,11 +1,11 @@ package org.apache.maven.artifact.deployer; -import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException; import org.apache.maven.artifact.metadata.ArtifactMetadataSource; import org.apache.maven.artifact.metadata.ResolutionGroup; -import org.apache.maven.artifact.repository.ArtifactRepository; -import org.apache.maven.artifact.versioning.DefaultArtifactVersion; +import org.apache.maven.artifact.resolver.metadata.Artifact; +import org.apache.maven.artifact.resolver.metadata.ArtifactRepository; +import org.apache.maven.artifact.resolver.metadata.version.DefaultArtifactVersion; import java.util.ArrayList; import java.util.List; Modified: maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java (original) +++ maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/installer/ArtifactInstallerTest.java Fri May 23 07:58:21 2008 @@ -20,7 +20,7 @@ */ import org.apache.maven.artifact.AbstractArtifactComponentTestCase; -import org.apache.maven.artifact.Artifact; +import org.apache.maven.artifact.resolver.metadata.Artifact; import java.io.File; Modified: maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java (original) +++ maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java Fri May 23 07:58:21 2008 @@ -21,13 +21,13 @@ import java.io.File; -import org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.DefaultArtifact; import org.apache.maven.artifact.metadata.ArtifactMetadata; -import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.DefaultArtifactRepository; import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; -import org.apache.maven.artifact.versioning.VersionRange; +import org.apache.maven.artifact.resolver.metadata.Artifact; +import org.apache.maven.artifact.resolver.metadata.ArtifactRepository; +import org.apache.maven.artifact.resolver.metadata.DefaultArtifact; +import org.apache.maven.artifact.resolver.metadata.version.VersionRange; import org.apache.maven.wagon.UnsupportedProtocolException; import org.apache.maven.wagon.Wagon; import org.apache.maven.wagon.events.TransferListener; Modified: maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactoryTest.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactoryTest.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactoryTest.java (original) +++ maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/repository/DefaultArtifactRepositoryFactoryTest.java Fri May 23 07:58:21 2008 @@ -4,6 +4,7 @@ import org.apache.maven.artifact.UnknownRepositoryLayoutException; import org.apache.maven.artifact.repository.layout.ArtifactRepositoryLayout; import org.apache.maven.artifact.repository.layout.DefaultRepositoryLayout; +import org.apache.maven.artifact.resolver.metadata.ArtifactRepository; import org.codehaus.plexus.PlexusTestCase; import org.codehaus.plexus.util.FileUtils; Modified: maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadataTest.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadataTest.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadataTest.java (original) +++ maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/repository/metadata/AbstractRepositoryMetadataTest.java Fri May 23 07:58:21 2008 @@ -20,8 +20,8 @@ */ import junit.framework.TestCase; -import org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.repository.ArtifactRepository; +import org.apache.maven.artifact.resolver.metadata.Artifact; +import org.apache.maven.artifact.resolver.metadata.ArtifactRepository; import org.apache.maven.artifact.testutils.MockManager; import org.apache.maven.artifact.testutils.TestFileManager; import org.codehaus.plexus.util.xml.pull.XmlPullParserException; Modified: maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManagerTest.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManagerTest.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManagerTest.java (original) +++ maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/repository/metadata/DefaultRepositoryMetadataManagerTest.java Fri May 23 07:58:21 2008 @@ -10,8 +10,8 @@ import org.apache.maven.artifact.manager.DefaultUpdateCheckManager; import org.apache.maven.artifact.manager.WagonManager; -import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.repository.ArtifactRepositoryPolicy; +import org.apache.maven.artifact.resolver.metadata.ArtifactRepository; import org.apache.maven.artifact.testutils.MockManager; import org.apache.maven.artifact.testutils.TestFileManager; import org.apache.maven.wagon.ResourceDoesNotExistException; Modified: maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/repository/metadata/MetadataTouchfileTest.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/repository/metadata/MetadataTouchfileTest.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/repository/metadata/MetadataTouchfileTest.java (original) +++ maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/repository/metadata/MetadataTouchfileTest.java Fri May 23 07:58:21 2008 @@ -1,6 +1,6 @@ package org.apache.maven.artifact.repository.metadata; -import org.apache.maven.artifact.repository.ArtifactRepository; +import org.apache.maven.artifact.resolver.metadata.ArtifactRepository; import org.apache.maven.artifact.testutils.MockManager; import org.apache.maven.artifact.testutils.TestFileManager; import org.codehaus.plexus.logging.Logger; Modified: maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java (original) +++ maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/resolver/ArtifactResolverTest.java Fri May 23 07:58:21 2008 @@ -20,11 +20,11 @@ */ import org.apache.maven.artifact.AbstractArtifactComponentTestCase; -import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException; import org.apache.maven.artifact.metadata.ArtifactMetadataSource; import org.apache.maven.artifact.metadata.ResolutionGroup; -import org.apache.maven.artifact.repository.ArtifactRepository; +import org.apache.maven.artifact.resolver.metadata.Artifact; +import org.apache.maven.artifact.resolver.metadata.ArtifactRepository; import java.util.ArrayList; import java.util.Collections; Modified: maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java (original) +++ maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java Fri May 23 07:58:21 2008 @@ -26,18 +26,18 @@ import java.util.Map; import java.util.Set; -import org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.DefaultArtifact; import org.apache.maven.artifact.metadata.ArtifactMetadataRetrievalException; import org.apache.maven.artifact.metadata.ArtifactMetadataSource; import org.apache.maven.artifact.metadata.ResolutionGroup; -import org.apache.maven.artifact.repository.ArtifactRepository; import org.apache.maven.artifact.resolver.filter.ArtifactFilter; import org.apache.maven.artifact.resolver.filter.ExclusionSetFilter; import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter; -import org.apache.maven.artifact.versioning.DefaultArtifactVersion; -import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; -import org.apache.maven.artifact.versioning.VersionRange; +import org.apache.maven.artifact.resolver.metadata.Artifact; +import org.apache.maven.artifact.resolver.metadata.ArtifactRepository; +import org.apache.maven.artifact.resolver.metadata.DefaultArtifact; +import org.apache.maven.artifact.resolver.metadata.version.DefaultArtifactVersion; +import org.apache.maven.artifact.resolver.metadata.version.InvalidVersionSpecificationException; +import org.apache.maven.artifact.resolver.metadata.version.VersionRange; import org.codehaus.plexus.PlexusTestCase; /* Modified: maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/resolver/conflict/AbstractConflictResolverTest.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/resolver/conflict/AbstractConflictResolverTest.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/resolver/conflict/AbstractConflictResolverTest.java (original) +++ maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/resolver/conflict/AbstractConflictResolverTest.java Fri May 23 07:58:21 2008 @@ -19,11 +19,11 @@ * under the License. */ -import org.apache.maven.artifact.Artifact; -import org.apache.maven.artifact.DefaultArtifact; import org.apache.maven.artifact.resolver.ResolutionNode; -import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException; -import org.apache.maven.artifact.versioning.VersionRange; +import org.apache.maven.artifact.resolver.metadata.Artifact; +import org.apache.maven.artifact.resolver.metadata.DefaultArtifact; +import org.apache.maven.artifact.resolver.metadata.version.InvalidVersionSpecificationException; +import org.apache.maven.artifact.resolver.metadata.version.VersionRange; 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=659561&r1=659560&r2=659561&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:58:21 2008 @@ -4,7 +4,7 @@ import java.util.List; import java.util.Map; -import org.apache.maven.artifact.ArtifactScopeEnum; +import org.apache.maven.artifact.resolver.metadata.ArtifactScopeEnum; 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; 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=659561&r1=659560&r2=659561&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:58:21 2008 @@ -6,7 +6,7 @@ import java.util.Map; import java.util.TreeSet; -import org.apache.maven.artifact.ArtifactScopeEnum; +import org.apache.maven.artifact.resolver.metadata.ArtifactScopeEnum; 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; Modified: maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java (original) +++ maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/versioning/DefaultArtifactVersionTest.java Fri May 23 07:58:21 2008 @@ -19,6 +19,8 @@ * under the License. */ +import org.apache.maven.artifact.resolver.metadata.version.DefaultArtifactVersion; + import junit.framework.TestCase; /** Modified: maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java?rev=659561&r1=659560&r2=659561&view=diff ============================================================================== --- maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java (original) +++ maven/artifact/branches/CAP/src/test/java/org/apache/maven/artifact/versioning/VersionRangeTest.java Fri May 23 07:58:21 2008 @@ -23,7 +23,13 @@ import java.util.List; -import org.apache.maven.artifact.Artifact; +import org.apache.maven.artifact.resolver.metadata.Artifact; +import org.apache.maven.artifact.resolver.metadata.version.ArtifactVersion; +import org.apache.maven.artifact.resolver.metadata.version.DefaultArtifactVersion; +import org.apache.maven.artifact.resolver.metadata.version.InvalidVersionSpecificationException; +import org.apache.maven.artifact.resolver.metadata.version.OverConstrainedVersionException; +import org.apache.maven.artifact.resolver.metadata.version.Restriction; +import org.apache.maven.artifact.resolver.metadata.version.VersionRange; /** * Tests version range construction.