You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by jv...@apache.org on 2008/05/24 18:11:56 UTC
svn commit: r659846 - in
/maven/artifact/branches/CAP/src/main/java/org/apache/maven: artifact/
mercury/ mercury/conflict/ mercury/resolver/ mercury/resolver/metadata/
mercury/resolver/metadata/conflict/ mercury/resolver/metadata/resolver/
mercury/reso...
Author: jvanzyl
Date: Sat May 24 09:11:53 2008
New Revision: 659846
URL: http://svn.apache.org/viewvc?rev=659846&view=rev
Log:
o bundling all together for the mercury prototype
Added:
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/Artifact.java
- copied, changed from r659745, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/Artifact.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/ArtifactRepository.java
- copied, changed from r659622, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactRepository.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/ArtifactResolutionException.java (contents, props changed)
- copied, changed from r659640, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactResolutionException.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/ArtifactScopeEnum.java
- copied, changed from r659622, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactScopeEnum.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/DefaultArtifact.java
- copied, changed from r659745, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultArtifact.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/ (props changed)
- copied from r659622, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/ConflictResolutionException.java
- copied, changed from r659724, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/ConflictResolutionException.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/ConflictResolutionPolicy.java
- copied, changed from r659682, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/ConflictResolutionPolicy.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/ConflictResolver.java
- copied, changed from r659682, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/ConflictResolver.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/DefaultConflictResolutionPolicy.java
- copied, changed from r659682, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultConflictResolutionPolicy.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/DefaultConflictResolver.java
- copied, changed from r659682, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultConflictResolver.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/AbstractArtifactResolutionException.java
- copied, changed from r659622, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/AbstractArtifactResolutionException.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/ArtifactMetadata.java
- copied, changed from r659682, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactMetadata.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/ArtifactResolutionException.java
- copied, changed from r659745, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactResolutionException.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/ArtifactResolver.java
- copied, changed from r659682, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactResolver.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/DefaultArtifactResolver.java
- copied, changed from r659745, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultArtifactResolver.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/DefaultMetadataResolver.java
- copied, changed from r659745, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultMetadataResolver.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataGraph.java
- copied, changed from r659622, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataGraph.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataGraphEdge.java
- copied, changed from r659622, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataGraphEdge.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataGraphVertex.java
- copied, changed from r659622, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataGraphVertex.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataResolution.java
- copied, changed from r659622, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolution.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataResolutionException.java
- copied, changed from r659622, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionException.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataResolutionRequest.java
- copied, changed from r659622, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionRequest.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataResolutionRequestTypeEnum.java
- copied, changed from r659622, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionRequestTypeEnum.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataResolutionResult.java
- copied, changed from r659682, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionResult.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataResolver.java
- copied, changed from r659660, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolver.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataRetrievalException.java
- copied, changed from r659622, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataRetrievalException.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataSource.java
- copied, changed from r659622, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataSource.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataTreeNode.java
- copied, changed from r659622, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataTreeNode.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/ResolutionRequest.java
- copied, changed from r659622, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ResolutionRequest.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/ResolutionResult.java
- copied, changed from r659745, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ResolutionResult.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/conflict/ (props changed)
- copied from r659622, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/resolver/ (props changed)
- copied from r659622, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/transform/ (props changed)
- copied from r659622, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/version/ (props changed)
- copied from r659622, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/transform/ (props changed)
- copied from r659622, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/transform/ClasspathContainer.java
- copied, changed from r659660, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/ClasspathContainer.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/transform/ClasspathTransformation.java
- copied, changed from r659660, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/ClasspathTransformation.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/transform/DefaultClasspathTransformation.java
- copied, changed from r659682, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/DefaultClasspathTransformation.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/transform/MetadataGraphTransformationException.java
- copied, changed from r659660, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/MetadataGraphTransformationException.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/version/ (props changed)
- copied from r659622, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/version/ArtifactVersion.java
- copied, changed from r659660, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/ArtifactVersion.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/version/ComparableVersion.java
- copied, changed from r659660, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/ComparableVersion.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/version/DefaultArtifactVersion.java
- copied, changed from r659660, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/DefaultArtifactVersion.java
Removed:
maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/DefaultGraphConflictResolutionPolicy.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/DefaultGraphConflictResolver.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/GraphConflictResolutionException.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/GraphConflictResolutionPolicy.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/GraphConflictResolver.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/conflict/DefaultGraphConflictResolutionPolicy.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/conflict/DefaultGraphConflictResolver.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/conflict/GraphConflictResolutionException.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/conflict/GraphConflictResolutionPolicy.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/conflict/GraphConflictResolver.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/resolver/AbstractArtifactResolutionException.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/resolver/ArtifactMetadata.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/resolver/ArtifactNotFoundException.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/resolver/ArtifactResolutionException.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/resolver/ArtifactResolver.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/resolver/DefaultArtifactResolver.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/resolver/DefaultMetadataResolver.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/resolver/MetadataGraph.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/resolver/MetadataGraphEdge.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/resolver/MetadataGraphVertex.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/resolver/MetadataResolution.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/resolver/MetadataResolutionException.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/resolver/MetadataResolutionRequest.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/resolver/MetadataResolutionRequestTypeEnum.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/resolver/MetadataResolutionResult.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/resolver/MetadataResolver.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/resolver/MetadataRetrievalException.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/resolver/MetadataSource.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/resolver/MetadataTreeNode.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/resolver/ResolutionRequest.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/resolver/ResolutionResult.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/transform/ClasspathContainer.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/transform/ClasspathTransformation.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/transform/DefaultClasspathTransformation.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/transform/MetadataGraphTransformationException.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/version/ArtifactVersion.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/version/ComparableVersion.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/version/DefaultArtifactVersion.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/version/InvalidVersionSpecificationException.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/version/ManagedVersionMap.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/version/OverConstrainedVersionException.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/version/Restriction.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/version/VersionRange.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/version/InvalidVersionSpecificationException.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/version/ManagedVersionMap.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/version/OverConstrainedVersionException.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/version/Restriction.java
maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/version/VersionRange.java
Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/Artifact.java (from r659745, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/Artifact.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/Artifact.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/Artifact.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/Artifact.java&r1=659745&r2=659846&rev=659846&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/Artifact.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/Artifact.java Sat May 24 09:11:53 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.mercury;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license
Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/ArtifactRepository.java (from r659622, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactRepository.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/ArtifactRepository.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/ArtifactRepository.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactRepository.java&r1=659622&r2=659846&rev=659846&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactRepository.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/ArtifactRepository.java Sat May 24 09:11:53 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.mercury;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/ArtifactResolutionException.java (from r659640, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactResolutionException.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/ArtifactResolutionException.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/ArtifactResolutionException.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactResolutionException.java&r1=659640&r2=659846&rev=659846&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactResolutionException.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/ArtifactResolutionException.java Sat May 24 09:11:53 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.mercury;
public class ArtifactResolutionException
extends Exception
Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/ArtifactResolutionException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/ArtifactResolutionException.java
------------------------------------------------------------------------------
svn:keywords = "Author Date Id Revision"
Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/ArtifactResolutionException.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/ArtifactScopeEnum.java (from r659622, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactScopeEnum.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/ArtifactScopeEnum.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/ArtifactScopeEnum.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactScopeEnum.java&r1=659622&r2=659846&rev=659846&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/ArtifactScopeEnum.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/ArtifactScopeEnum.java Sat May 24 09:11:53 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.mercury;
/**
* Type safe reincarnation of Artifact scope. Also supplies the <code>DEFAULT_SCOPE<code> as well
Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/DefaultArtifact.java (from r659745, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultArtifact.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/DefaultArtifact.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/DefaultArtifact.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultArtifact.java&r1=659745&r2=659846&rev=659846&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/DefaultArtifact.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/DefaultArtifact.java Sat May 24 09:11:53 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.mercury;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license
Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat May 24 09:11:53 2008
@@ -0,0 +1 @@
+/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict:658725
Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/ConflictResolutionException.java (from r659724, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/ConflictResolutionException.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/ConflictResolutionException.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/ConflictResolutionException.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/ConflictResolutionException.java&r1=659724&r2=659846&rev=659846&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/ConflictResolutionException.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/ConflictResolutionException.java Sat May 24 09:11:53 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata.conflict;
+package org.apache.maven.mercury.conflict;
/**
*
Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/ConflictResolutionPolicy.java (from r659682, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/ConflictResolutionPolicy.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/ConflictResolutionPolicy.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/ConflictResolutionPolicy.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/ConflictResolutionPolicy.java&r1=659682&r2=659846&rev=659846&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/ConflictResolutionPolicy.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/ConflictResolutionPolicy.java Sat May 24 09:11:53 2008
@@ -1,6 +1,6 @@
-package org.apache.maven.artifact.resolver.metadata.conflict;
+package org.apache.maven.mercury.conflict;
-import org.apache.maven.artifact.resolver.metadata.resolver.MetadataGraphEdge;
+import org.apache.maven.mercury.resolver.MetadataGraphEdge;
/*
* MetadataGraph edge selection policy. Complements GraphConflictResolver by being injected into it
Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/ConflictResolver.java (from r659682, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/ConflictResolver.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/ConflictResolver.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/ConflictResolver.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/ConflictResolver.java&r1=659682&r2=659846&rev=659846&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/ConflictResolver.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/ConflictResolver.java Sat May 24 09:11:53 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata.conflict;
+package org.apache.maven.mercury.conflict;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license
@@ -15,8 +15,8 @@
* the License.
*/
-import org.apache.maven.artifact.resolver.metadata.ArtifactScopeEnum;
-import org.apache.maven.artifact.resolver.metadata.resolver.MetadataGraph;
+import org.apache.maven.mercury.ArtifactScopeEnum;
+import org.apache.maven.mercury.resolver.MetadataGraph;
/*
* Resolves conflicts in the supplied dependency graph. Different implementations will implement
Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/DefaultConflictResolutionPolicy.java (from r659682, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultConflictResolutionPolicy.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/DefaultConflictResolutionPolicy.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/DefaultConflictResolutionPolicy.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultConflictResolutionPolicy.java&r1=659682&r2=659846&rev=659846&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultConflictResolutionPolicy.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/DefaultConflictResolutionPolicy.java Sat May 24 09:11:53 2008
@@ -1,8 +1,8 @@
-package org.apache.maven.artifact.resolver.metadata.conflict;
+package org.apache.maven.mercury.conflict;
-import org.apache.maven.artifact.resolver.metadata.resolver.MetadataGraphEdge;
-import org.apache.maven.artifact.resolver.metadata.version.ArtifactVersion;
-import org.apache.maven.artifact.resolver.metadata.version.DefaultArtifactVersion;
+import org.apache.maven.mercury.resolver.MetadataGraphEdge;
+import org.apache.maven.mercury.version.ArtifactVersion;
+import org.apache.maven.mercury.version.DefaultArtifactVersion;
/*
*
Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/DefaultConflictResolver.java (from r659682, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultConflictResolver.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/DefaultConflictResolver.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/DefaultConflictResolver.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultConflictResolver.java&r1=659682&r2=659846&rev=659846&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/conflict/DefaultConflictResolver.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/conflict/DefaultConflictResolver.java Sat May 24 09:11:53 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata.conflict;
+package org.apache.maven.mercury.conflict;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license
@@ -19,12 +19,12 @@
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 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;
/*
* Default conflict resolver.Implements closer newer first policy by default, but could be
Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/AbstractArtifactResolutionException.java (from r659622, 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/mercury/resolver/AbstractArtifactResolutionException.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/AbstractArtifactResolutionException.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/AbstractArtifactResolutionException.java&r1=659622&r2=659846&rev=659846&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/mercury/resolver/AbstractArtifactResolutionException.java Sat May 24 09:11:53 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata.resolver;
+package org.apache.maven.mercury.resolver;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license
@@ -19,8 +19,8 @@
import java.util.Iterator;
import java.util.List;
-import org.apache.maven.artifact.resolver.metadata.Artifact;
-import org.apache.maven.artifact.resolver.metadata.ArtifactRepository;
+import org.apache.maven.mercury.Artifact;
+import org.apache.maven.mercury.ArtifactRepository;
/*
* Base class for artifact resolution exceptions.
Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/ArtifactMetadata.java (from r659682, 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/mercury/resolver/ArtifactMetadata.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/ArtifactMetadata.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactMetadata.java&r1=659682&r2=659846&rev=659846&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/mercury/resolver/ArtifactMetadata.java Sat May 24 09:11:53 2008
@@ -1,9 +1,9 @@
-package org.apache.maven.artifact.resolver.metadata.resolver;
+package org.apache.maven.mercury.resolver;
import java.util.Collection;
-import org.apache.maven.artifact.resolver.metadata.Artifact;
-import org.apache.maven.artifact.resolver.metadata.ArtifactScopeEnum;
+import org.apache.maven.mercury.Artifact;
+import org.apache.maven.mercury.ArtifactScopeEnum;
/*
* Artifact Metadata that is resolved independent of Artifact itself.
Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/ArtifactResolutionException.java (from r659745, 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/mercury/resolver/ArtifactResolutionException.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/ArtifactResolutionException.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactResolutionException.java&r1=659745&r2=659846&rev=659846&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/mercury/resolver/ArtifactResolutionException.java Sat May 24 09:11:53 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata.resolver;
+package org.apache.maven.mercury.resolver;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -22,7 +22,7 @@
import java.io.IOException;
import java.util.List;
-import org.apache.maven.artifact.resolver.metadata.Artifact;
+import org.apache.maven.mercury.Artifact;
/**
* @author Jason van Zyl
Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/ArtifactResolver.java (from r659682, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactResolver.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/ArtifactResolver.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/ArtifactResolver.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactResolver.java&r1=659682&r2=659846&rev=659846&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ArtifactResolver.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/ArtifactResolver.java Sat May 24 09:11:53 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata.resolver;
+package org.apache.maven.mercury.resolver;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/DefaultArtifactResolver.java (from r659745, 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/mercury/resolver/DefaultArtifactResolver.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/DefaultArtifactResolver.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultArtifactResolver.java&r1=659745&r2=659846&rev=659846&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/mercury/resolver/DefaultArtifactResolver.java Sat May 24 09:11:53 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata.resolver;
+package org.apache.maven.mercury.resolver;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -19,10 +19,17 @@
* under the License.
*/
+import java.io.File;
+
+import org.apache.maven.mercury.ArtifactRepository;
+import org.apache.maven.mercury.ArtifactRepositoryLayout;
+import org.apache.maven.mercury.DefaultRepositoryLayout;
+import org.apache.maven.mercury.client.Binding;
import org.apache.maven.mercury.client.MercuryException;
import org.apache.maven.mercury.client.retrieve.DefaultRetrievalRequest;
import org.apache.maven.mercury.client.retrieve.DefaultRetriever;
import org.apache.maven.mercury.client.retrieve.RetrievalRequest;
+import org.apache.maven.mercury.client.retrieve.RetrievalResponse;
import org.apache.maven.mercury.client.retrieve.Retriever;
/**
@@ -32,6 +39,8 @@
public class DefaultArtifactResolver
implements ArtifactResolver
{
+ ArtifactRepositoryLayout layout = new DefaultRepositoryLayout();
+
public ResolutionResult resolve( ResolutionRequest request )
{
ResolutionResult result = new ResolutionResult();
@@ -50,13 +59,24 @@
return result;
}
-
- // Create the retrieval request
-
- RetrievalRequest rr = new DefaultRetrievalRequest();
-
- retriever.retrieve( rr );
-
+
+ for ( ArtifactRepository remoteRepository : request.getRemoteRepostories() )
+ {
+ RetrievalRequest rr = new DefaultRetrievalRequest();
+ String remoteUrl = remoteRepository.getUrl() + "/" + layout.pathOf( request.getArtifact() );
+ File localFile = new File( request.getLocalRepository().getBasedir(), layout.pathOf( request.getArtifact() ) );
+ Binding binding = new Binding( remoteUrl, localFile, true );
+ RetrievalResponse response = retriever.retrieve( rr );
+
+ // Not found versus an error. We need to know for each repository exactly what happened.
+
+ if ( !response.hasExceptions() )
+ {
+ // What do I want to send back to make the graph trackable
+ return result;
+ }
+ }
+
return result;
}
}
Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/DefaultMetadataResolver.java (from r659745, 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/mercury/resolver/DefaultMetadataResolver.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/DefaultMetadataResolver.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/DefaultMetadataResolver.java&r1=659745&r2=659846&rev=659846&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/mercury/resolver/DefaultMetadataResolver.java Sat May 24 09:11:53 2008
@@ -1,11 +1,11 @@
-package org.apache.maven.artifact.resolver.metadata.resolver;
+package org.apache.maven.mercury.resolver;
import java.util.Collection;
import java.util.List;
-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.mercury.Artifact;
+import org.apache.maven.mercury.ArtifactRepository;
+import org.apache.maven.mercury.DefaultArtifact;
/*
* default implementation of the metadata resolver
Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataGraph.java (from r659622, 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/mercury/resolver/MetadataGraph.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataGraph.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataGraph.java&r1=659622&r2=659846&rev=659846&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/mercury/resolver/MetadataGraph.java Sat May 24 09:11:53 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata.resolver;
+package org.apache.maven.mercury.resolver;
import java.util.ArrayList;
import java.util.HashMap;
@@ -6,7 +6,7 @@
import java.util.Map;
import java.util.TreeSet;
-import org.apache.maven.artifact.resolver.metadata.ArtifactScopeEnum;
+import org.apache.maven.mercury.ArtifactScopeEnum;
/**
Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataGraphEdge.java (from r659622, 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/mercury/resolver/MetadataGraphEdge.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataGraphEdge.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataGraphEdge.java&r1=659622&r2=659846&rev=659846&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/mercury/resolver/MetadataGraphEdge.java Sat May 24 09:11:53 2008
@@ -1,6 +1,6 @@
-package org.apache.maven.artifact.resolver.metadata.resolver;
+package org.apache.maven.mercury.resolver;
-import org.apache.maven.artifact.resolver.metadata.ArtifactScopeEnum;
+import org.apache.maven.mercury.ArtifactScopeEnum;
/**
Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataGraphVertex.java (from r659622, 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/mercury/resolver/MetadataGraphVertex.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataGraphVertex.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataGraphVertex.java&r1=659622&r2=659846&rev=659846&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/mercury/resolver/MetadataGraphVertex.java Sat May 24 09:11:53 2008
@@ -1,6 +1,6 @@
-package org.apache.maven.artifact.resolver.metadata.resolver;
+package org.apache.maven.mercury.resolver;
-import org.apache.maven.artifact.resolver.metadata.ArtifactScopeEnum;
+import org.apache.maven.mercury.ArtifactScopeEnum;
/**
Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataResolution.java (from r659622, 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/mercury/resolver/MetadataResolution.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataResolution.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolution.java&r1=659622&r2=659846&rev=659846&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/mercury/resolver/MetadataResolution.java Sat May 24 09:11:53 2008
@@ -1,8 +1,8 @@
-package org.apache.maven.artifact.resolver.metadata.resolver;
+package org.apache.maven.mercury.resolver;
import java.util.Collection;
-import org.apache.maven.artifact.resolver.metadata.ArtifactRepository;
+import org.apache.maven.mercury.ArtifactRepository;
/**
*
Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataResolutionException.java (from r659622, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionException.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataResolutionException.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataResolutionException.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionException.java&r1=659622&r2=659846&rev=659846&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionException.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataResolutionException.java Sat May 24 09:11:53 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata.resolver;
+package org.apache.maven.mercury.resolver;
public class MetadataResolutionException
extends Exception
Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataResolutionRequest.java (from r659622, 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/mercury/resolver/MetadataResolutionRequest.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataResolutionRequest.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionRequest.java&r1=659622&r2=659846&rev=659846&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/mercury/resolver/MetadataResolutionRequest.java Sat May 24 09:11:53 2008
@@ -1,8 +1,8 @@
-package org.apache.maven.artifact.resolver.metadata.resolver;
+package org.apache.maven.mercury.resolver;
import java.util.List;
-import org.apache.maven.artifact.resolver.metadata.ArtifactRepository;
+import org.apache.maven.mercury.ArtifactRepository;
/** @author Oleg Gusakov */
Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataResolutionRequestTypeEnum.java (from r659622, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionRequestTypeEnum.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataResolutionRequestTypeEnum.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataResolutionRequestTypeEnum.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionRequestTypeEnum.java&r1=659622&r2=659846&rev=659846&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionRequestTypeEnum.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataResolutionRequestTypeEnum.java Sat May 24 09:11:53 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata.resolver;
+package org.apache.maven.mercury.resolver;
public enum MetadataResolutionRequestTypeEnum
{
Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataResolutionResult.java (from r659682, 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/mercury/resolver/MetadataResolutionResult.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataResolutionResult.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolutionResult.java&r1=659682&r2=659846&rev=659846&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/mercury/resolver/MetadataResolutionResult.java Sat May 24 09:11:53 2008
@@ -1,11 +1,11 @@
-package org.apache.maven.artifact.resolver.metadata.resolver;
+package org.apache.maven.mercury.resolver;
-import org.apache.maven.artifact.resolver.metadata.ArtifactScopeEnum;
-import org.apache.maven.artifact.resolver.metadata.conflict.ConflictResolutionException;
-import org.apache.maven.artifact.resolver.metadata.conflict.ConflictResolver;
-import org.apache.maven.artifact.resolver.metadata.transform.ClasspathContainer;
-import org.apache.maven.artifact.resolver.metadata.transform.ClasspathTransformation;
-import org.apache.maven.artifact.resolver.metadata.transform.MetadataGraphTransformationException;
+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.transform.ClasspathContainer;
+import org.apache.maven.mercury.transform.ClasspathTransformation;
+import org.apache.maven.mercury.transform.MetadataGraphTransformationException;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataResolver.java (from r659660, 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/mercury/resolver/MetadataResolver.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataResolver.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataResolver.java&r1=659660&r2=659846&rev=659846&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/mercury/resolver/MetadataResolver.java Sat May 24 09:11:53 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata.resolver;
+package org.apache.maven.mercury.resolver;
/**
* entry point into metadata resolution component
Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataRetrievalException.java (from r659622, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataRetrievalException.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataRetrievalException.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataRetrievalException.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataRetrievalException.java&r1=659622&r2=659846&rev=659846&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataRetrievalException.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataRetrievalException.java Sat May 24 09:11:53 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata.resolver;
+package org.apache.maven.mercury.resolver;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataSource.java (from r659622, 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/mercury/resolver/MetadataSource.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataSource.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataSource.java&r1=659622&r2=659846&rev=659846&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/mercury/resolver/MetadataSource.java Sat May 24 09:11:53 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata.resolver;
+package org.apache.maven.mercury.resolver;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,7 @@
import java.util.List;
-import org.apache.maven.artifact.resolver.metadata.ArtifactRepository;
+import org.apache.maven.mercury.ArtifactRepository;
/**
* Provides some metadata operations, like querying the remote repository for a list of versions available for an
Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataTreeNode.java (from r659622, 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/mercury/resolver/MetadataTreeNode.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/MetadataTreeNode.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/MetadataTreeNode.java&r1=659622&r2=659846&rev=659846&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/mercury/resolver/MetadataTreeNode.java Sat May 24 09:11:53 2008
@@ -1,7 +1,7 @@
-package org.apache.maven.artifact.resolver.metadata.resolver;
+package org.apache.maven.mercury.resolver;
-import org.apache.maven.artifact.resolver.metadata.Artifact;
-import org.apache.maven.artifact.resolver.metadata.ArtifactScopeEnum;
+import org.apache.maven.mercury.Artifact;
+import org.apache.maven.mercury.ArtifactScopeEnum;
/**
* metadata [dirty] Tree
*
Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/ResolutionRequest.java (from r659622, 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/mercury/resolver/ResolutionRequest.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/ResolutionRequest.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ResolutionRequest.java&r1=659622&r2=659846&rev=659846&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/mercury/resolver/ResolutionRequest.java Sat May 24 09:11:53 2008
@@ -1,10 +1,10 @@
-package org.apache.maven.artifact.resolver.metadata.resolver;
+package org.apache.maven.mercury.resolver;
import java.util.ArrayList;
import java.util.List;
-import org.apache.maven.artifact.resolver.metadata.Artifact;
-import org.apache.maven.artifact.resolver.metadata.ArtifactRepository;
+import org.apache.maven.mercury.Artifact;
+import org.apache.maven.mercury.ArtifactRepository;
/**
* A resolution request allows you to either use an existing MavenProject, or a coordinate (gid:aid:version)
@@ -24,7 +24,7 @@
private ArtifactRepository localRepository;
- private List remoteRepostories;
+ private List<ArtifactRepository> remoteRepostories;
private List listeners = new ArrayList();
@@ -108,12 +108,12 @@
return this;
}
- public List getRemoteRepostories()
+ public List<ArtifactRepository> getRemoteRepostories()
{
return remoteRepostories;
}
- public ResolutionRequest setRemoteRepostories( List remoteRepostories )
+ public ResolutionRequest setRemoteRepostories( List<ArtifactRepository> remoteRepostories )
{
this.remoteRepostories = remoteRepostories;
Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/ResolutionResult.java (from r659745, 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/mercury/resolver/ResolutionResult.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/ResolutionResult.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/resolver/ResolutionResult.java&r1=659745&r2=659846&rev=659846&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/mercury/resolver/ResolutionResult.java Sat May 24 09:11:53 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata.resolver;
+package org.apache.maven.mercury.resolver;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,8 +24,8 @@
import java.util.List;
import java.util.Set;
-import org.apache.maven.artifact.resolver.metadata.Artifact;
-import org.apache.maven.artifact.resolver.metadata.ArtifactRepository;
+import org.apache.maven.mercury.Artifact;
+import org.apache.maven.mercury.ArtifactRepository;
/**
* Specific problems during resolution that we want to account for:
Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/conflict/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/resolver/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/transform/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/resolver/metadata/version/
------------------------------------------------------------------------------
svn:mergeinfo =
Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/transform/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat May 24 09:11:53 2008
@@ -0,0 +1 @@
+/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/transform:658725
Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/transform/ClasspathContainer.java (from r659660, 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/mercury/transform/ClasspathContainer.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/transform/ClasspathContainer.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/ClasspathContainer.java&r1=659660&r2=659846&rev=659846&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/mercury/transform/ClasspathContainer.java Sat May 24 09:11:53 2008
@@ -1,13 +1,13 @@
-package org.apache.maven.artifact.resolver.metadata.transform;
+package org.apache.maven.mercury.transform;
import java.util.ArrayList;
import java.util.Iterator;
import java.util.List;
-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;
+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;
/*
* classpath container that is aware of the classpath scope
Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/transform/ClasspathTransformation.java (from r659660, 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/mercury/transform/ClasspathTransformation.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/transform/ClasspathTransformation.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/ClasspathTransformation.java&r1=659660&r2=659846&rev=659846&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/mercury/transform/ClasspathTransformation.java Sat May 24 09:11:53 2008
@@ -1,7 +1,7 @@
-package org.apache.maven.artifact.resolver.metadata.transform;
+package org.apache.maven.mercury.transform;
-import org.apache.maven.artifact.resolver.metadata.ArtifactScopeEnum;
-import org.apache.maven.artifact.resolver.metadata.resolver.MetadataGraph;
+import org.apache.maven.mercury.ArtifactScopeEnum;
+import org.apache.maven.mercury.resolver.MetadataGraph;
/*
* Helper class to conver an Md Graph into some form of a classpath
Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/transform/DefaultClasspathTransformation.java (from r659682, 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/mercury/transform/DefaultClasspathTransformation.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/transform/DefaultClasspathTransformation.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/DefaultClasspathTransformation.java&r1=659682&r2=659846&rev=659846&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/mercury/transform/DefaultClasspathTransformation.java Sat May 24 09:11:53 2008
@@ -1,17 +1,17 @@
-package org.apache.maven.artifact.resolver.metadata.transform;
+package org.apache.maven.mercury.transform;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Comparator;
import java.util.List;
-import org.apache.maven.artifact.resolver.metadata.ArtifactScopeEnum;
-import org.apache.maven.artifact.resolver.metadata.conflict.ConflictResolutionException;
-import org.apache.maven.artifact.resolver.metadata.conflict.ConflictResolver;
-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.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;
/*
* default implementation of the metadata classpath transformer
Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/transform/MetadataGraphTransformationException.java (from r659660, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/MetadataGraphTransformationException.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/transform/MetadataGraphTransformationException.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/transform/MetadataGraphTransformationException.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/MetadataGraphTransformationException.java&r1=659660&r2=659846&rev=659846&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/transform/MetadataGraphTransformationException.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/transform/MetadataGraphTransformationException.java Sat May 24 09:11:53 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata.transform;
+package org.apache.maven.mercury.transform;
/*
* @author <a href="oleg@codehaus.org">Oleg Gusakov</a>
Propchange: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/version/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sat May 24 09:11:53 2008
@@ -0,0 +1 @@
+/maven/artifact/trunk/src/main/java/org/apache/maven/artifact/resolver/metadata/version:658725
Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/version/ArtifactVersion.java (from r659660, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/ArtifactVersion.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/version/ArtifactVersion.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/version/ArtifactVersion.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/ArtifactVersion.java&r1=659660&r2=659846&rev=659846&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/ArtifactVersion.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/version/ArtifactVersion.java Sat May 24 09:11:53 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata.version;
+package org.apache.maven.mercury.version;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/version/ComparableVersion.java (from r659660, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/ComparableVersion.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/version/ComparableVersion.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/version/ComparableVersion.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/ComparableVersion.java&r1=659660&r2=659846&rev=659846&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/ComparableVersion.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/version/ComparableVersion.java Sat May 24 09:11:53 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata.version;
+package org.apache.maven.mercury.version;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license
Copied: maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/version/DefaultArtifactVersion.java (from r659660, maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/DefaultArtifactVersion.java)
URL: http://svn.apache.org/viewvc/maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/version/DefaultArtifactVersion.java?p2=maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/version/DefaultArtifactVersion.java&p1=maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/DefaultArtifactVersion.java&r1=659660&r2=659846&rev=659846&view=diff
==============================================================================
--- maven/artifact/branches/CAP/src/main/java/org/apache/maven/artifact/resolver/metadata/version/DefaultArtifactVersion.java (original)
+++ maven/artifact/branches/CAP/src/main/java/org/apache/maven/mercury/version/DefaultArtifactVersion.java Sat May 24 09:11:53 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata.version;
+package org.apache.maven.mercury.version;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more contributor license