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 2009/06/28 11:39:53 UTC
svn commit: r789077 [3/4] - in /maven/components/trunk/maven-compat: ./
src/main/java/org/apache/maven/artifact/deployer/
src/main/java/org/apache/maven/artifact/factory/
src/main/java/org/apache/maven/artifact/installer/
src/main/java/org/apache/maven...
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionException.java (from r788972, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionException.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionException.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionException.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionException.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionException.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionException.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.conflict;
+package org.apache.maven.repository.metadata;
/**
*
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionException.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionException.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionException.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionException.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionException.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionException.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionException.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionException.java:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionPolicy.java (from r788972, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionPolicy.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionPolicy.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionPolicy.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionPolicy.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionPolicy.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionPolicy.java Sun Jun 28 09:39:49 2009
@@ -1,6 +1,5 @@
-package org.apache.maven.artifact.resolver.conflict;
+package org.apache.maven.repository.metadata;
-import org.apache.maven.artifact.resolver.metadata.MetadataGraphEdge;
/**
* MetadataGraph edge selection policy. Complements
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionPolicy.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionPolicy.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolutionPolicy.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionPolicy.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionPolicy.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionPolicy.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionPolicy.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionPolicy.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionPolicy.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolutionPolicy.java:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolver.java (from r788972, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolver.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolver.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolver.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolver.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolver.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolver.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.conflict;
+package org.apache.maven.repository.metadata;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -20,7 +20,6 @@
*/
import org.apache.maven.artifact.ArtifactScopeEnum;
-import org.apache.maven.artifact.resolver.metadata.MetadataGraph;
/**
* Resolves conflicts in the supplied dependency graph.
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolver.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolver.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/GraphConflictResolver.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolver.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolver.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolver.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolver.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolver.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolver.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/conflict/GraphConflictResolver.java:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java (from r788972, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.repository.metadata;
import java.util.ArrayList;
import java.util.HashMap;
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraph.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraph.java:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java (from r788972, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.repository.metadata;
import org.apache.maven.artifact.ArtifactScopeEnum;
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphEdge.java:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java (from r788972, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/MetadataGraphTransformationException.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/MetadataGraphTransformationException.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/MetadataGraphTransformationException.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.transform;
+package org.apache.maven.repository.metadata;
/**
* @author <a href="oleg@codehaus.org">Oleg Gusakov</a>
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/transform/MetadataGraphTransformationException.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/MetadataGraphTransformationException.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/transform/MetadataGraphTransformationException.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/transform/MetadataGraphTransformationException.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/transform/MetadataGraphTransformationException.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/transform/MetadataGraphTransformationException.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/transform/MetadataGraphTransformationException.java:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java (from r788972, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertex.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertex.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertex.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.repository.metadata;
import org.apache.maven.artifact.ArtifactScopeEnum;
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertex.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertex.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertex.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertex.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertex.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertex.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataGraphVertex.java:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java (from r788972, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolution.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolution.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolution.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.repository.metadata;
import java.util.Collection;
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolution.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolution.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolution.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolution.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolution.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolution.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolution.java:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionException.java (from r788972, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionException.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionException.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionException.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.repository.metadata;
public class MetadataResolutionException
extends Exception
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionException.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionException.java:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java (from r788972, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequest.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequest.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequest.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.repository.metadata;
import java.util.List;
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequest.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequest.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequest.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequest.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequest.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequest.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequest.java:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequestTypeEnum.java (from r788972, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequestTypeEnum.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequestTypeEnum.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequestTypeEnum.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.repository.metadata;
public enum MetadataResolutionRequestTypeEnum
{
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequestTypeEnum.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequestTypeEnum.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequestTypeEnum.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionRequestTypeEnum.java:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java (from r788972, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java Sun Jun 28 09:39:49 2009
@@ -1,11 +1,6 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.repository.metadata;
import org.apache.maven.artifact.ArtifactScopeEnum;
-import org.apache.maven.artifact.resolver.conflict.GraphConflictResolutionException;
-import org.apache.maven.artifact.resolver.conflict.GraphConflictResolver;
-import org.apache.maven.artifact.transform.ClasspathContainer;
-import org.apache.maven.artifact.transform.ClasspathTransformation;
-import org.apache.maven.artifact.transform.MetadataGraphTransformationException;
import org.codehaus.plexus.PlexusContainer;
import org.codehaus.plexus.component.repository.exception.ComponentLookupException;
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataResolutionResult.java:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataRetrievalException.java (from r788972, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataRetrievalException.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataRetrievalException.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataRetrievalException.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataRetrievalException.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataRetrievalException.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataRetrievalException.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.repository.metadata;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataRetrievalException.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataRetrievalException.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataRetrievalException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataRetrievalException.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataRetrievalException.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataRetrievalException.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataRetrievalException.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataRetrievalException.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataRetrievalException.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataRetrievalException.java:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java (from r788972, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataSource.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataSource.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataSource.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.repository.metadata;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataSource.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataSource.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataSource.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataSource.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataSource.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataSource.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataSource.java:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataTreeNode.java (from r788972, maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataTreeNode.java?p2=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataTreeNode.java&p1=maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java (original)
+++ maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataTreeNode.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.metadata;
+package org.apache.maven.repository.metadata;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.ArtifactScopeEnum;
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataTreeNode.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataTreeNode.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataTreeNode.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java:738757-738972
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/artifact/resolver/metadata/MetadataTreeNode.java:751453-767358,767708-768832
Modified: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java?rev=789077&r1=789076&r2=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java (original)
+++ maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/deployer/SimpleArtifactMetadataSource.java Sun Jun 28 09:39:49 2009
@@ -23,13 +23,13 @@
import java.util.List;
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.filter.ArtifactFilter;
import org.apache.maven.artifact.versioning.ArtifactVersion;
import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
+import org.apache.maven.repository.legacy.metadata.ArtifactMetadataRetrievalException;
+import org.apache.maven.repository.legacy.metadata.ArtifactMetadataSource;
+import org.apache.maven.repository.legacy.metadata.ResolutionGroup;
/** @author Jason van Zyl */
public class SimpleArtifactMetadataSource
Modified: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java?rev=789077&r1=789076&r2=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java (original)
+++ maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactResolverTest.java Sun Jun 28 09:39:49 2009
@@ -11,5 +11,4 @@
{
ArtifactResolver resolver = lookup( ArtifactResolver.class, "default" );
}
-
}
Copied: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java (from r788972, maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManagerTest.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java?p2=maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java&p1=maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManagerTest.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManagerTest.java (original)
+++ maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.manager;
+package org.apache.maven.repository.legacy;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -27,6 +27,7 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.metadata.ArtifactRepositoryMetadata;
import org.apache.maven.artifact.repository.metadata.RepositoryMetadata;
+import org.apache.maven.repository.legacy.DefaultUpdateCheckManager;
import org.codehaus.plexus.logging.Logger;
import org.codehaus.plexus.logging.console.ConsoleLogger;
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManagerTest.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManagerTest.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManagerTest.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManagerTest.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManagerTest.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManagerTest.java:738757-738972
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultUpdateCheckManagerTest.java:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java (from r788972, maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java?p2=maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java&p1=maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java (original)
+++ maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.manager;
+package org.apache.maven.repository.legacy;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -23,7 +23,6 @@
import java.io.IOException;
import java.util.ArrayList;
import java.util.List;
-import java.util.Set;
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DefaultArtifact;
@@ -32,10 +31,13 @@
import org.apache.maven.artifact.repository.ArtifactRepository;
import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
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.repository.layout.DefaultRepositoryLayout;
import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.repository.legacy.ChecksumFailedException;
+import org.apache.maven.repository.legacy.DefaultWagonManager;
+import org.apache.maven.repository.legacy.UpdateCheckManager;
+import org.apache.maven.repository.legacy.WagonManager;
import org.apache.maven.wagon.ResourceDoesNotExistException;
import org.apache.maven.wagon.TransferFailedException;
import org.apache.maven.wagon.UnsupportedProtocolException;
@@ -45,10 +47,8 @@
import org.apache.maven.wagon.events.TransferListener;
import org.apache.maven.wagon.observers.AbstractTransferListener;
import org.apache.maven.wagon.observers.Debug;
-import org.apache.maven.wagon.repository.Repository;
import org.codehaus.plexus.PlexusTestCase;
import org.codehaus.plexus.util.FileUtils;
-import org.codehaus.plexus.util.xml.Xpp3Dom;
import org.easymock.MockControl;
/**
@@ -81,14 +81,7 @@
artifactFactory = null;
super.tearDown();
}
-
- public void testAvailableProtocols()
- throws Exception
- {
- Set<String> protocols = wagonManager.getSupportProtocols();
- System.out.println( protocols );
- }
-
+
public void testUnnecessaryRepositoryLookup() throws Exception {
Artifact artifact = createTestPomArtifact( "target/test-data/get-missing-pom" );
@@ -108,8 +101,7 @@
}
};
TransferListener listener = new TransferListener();
- wagonManager.setDownloadMonitor(listener);
- wagonManager.getArtifact( artifact, repos, listener, false );
+ wagonManager.getArtifact( artifact, repos, listener );
assertEquals(1, listener.events.size());
}
@@ -126,11 +118,9 @@
wagon.addExpectedContent( repo.getLayout().pathOf( artifact ), "expected" );
MockControl control = MockControl.createControl( UpdateCheckManager.class );
- UpdateCheckManager updateCheckManager = (UpdateCheckManager) control.getMock();
-
control.replay();
- wagonManager.getArtifact( artifact, repo, true );
+ wagonManager.getArtifact( artifact, repo, null );
assertTrue( artifact.getFile().exists() );
assertEquals( "expected", FileUtils.fileRead( artifact.getFile(), "UTF-8" ) );
@@ -146,7 +136,7 @@
try
{
- wagonManager.getArtifact( artifact, repo, false );
+ wagonManager.getArtifact( artifact, repo, null );
fail();
}
@@ -166,7 +156,7 @@
try
{
- wagonManager.getArtifact( artifact, repo, true );
+ wagonManager.getArtifact( artifact, repo, null );
fail();
}
@@ -190,11 +180,9 @@
wagon.addExpectedContent( repo.getLayout().pathOf( artifact ), "expected" );
MockControl control = MockControl.createControl( UpdateCheckManager.class );
- UpdateCheckManager updateCheckManager = (UpdateCheckManager) control.getMock();
-
control.replay();
- wagonManager.getArtifact( artifact, repo, false );
+ wagonManager.getArtifact( artifact, repo, null );
assertTrue( artifact.getFile().exists() );
assertEquals( "expected", FileUtils.fileRead( artifact.getFile(), "UTF-8" ) );
@@ -215,11 +203,9 @@
wagon.addExpectedContent( repo.getLayout().pathOf( artifact ), "expected" );
MockControl control = MockControl.createControl( UpdateCheckManager.class );
- UpdateCheckManager updateCheckManager = (UpdateCheckManager) control.getMock();
-
control.replay();
- wagonManager.getArtifact( artifact, repo, true );
+ wagonManager.getArtifact( artifact, repo, null );
assertTrue( artifact.getFile().exists() );
assertEquals( "expected", FileUtils.fileRead( artifact.getFile(), "UTF-8" ) );
@@ -311,26 +297,6 @@
}
}
- public void testGetWagonRepositoryNullProtocol()
- throws Exception
- {
- try
- {
- Repository repository = new Repository();
-
- repository.setProtocol( null );
-
- Wagon wagon = wagonManager.getWagon( repository );
-
- fail( "Expected :" + UnsupportedProtocolException.class.getName() );
- }
- catch ( UnsupportedProtocolException e )
- {
- // ok
- assertTrue( true );
- }
- }
-
/**
* Check that transfer listeners are properly removed after getArtifact and putArtifact
*/
@@ -345,8 +311,7 @@
/* getArtifact */
assertFalse( "Transfer listener is registered before test",
wagon.getTransferEventSupport().hasTransferListener( transferListener ) );
- wagonManager.setDownloadMonitor( transferListener );
- wagonManager.getArtifact( artifact, repo );
+ wagonManager.getArtifact( artifact, repo, transferListener);
assertFalse( "Transfer listener still registered after getArtifact",
wagon.getTransferEventSupport().hasTransferListener( transferListener ) );
@@ -354,12 +319,9 @@
File sampleFile = getTestFile( "target/test-file" );
FileUtils.fileWrite( sampleFile.getAbsolutePath(), "sample file" );
- assertFalse( "Transfer listener is registered before test",
- wagon.getTransferEventSupport().hasTransferListener( transferListener ) );
- wagonManager.setDownloadMonitor( transferListener );
- wagonManager.putArtifact( sampleFile, artifact, repo );
- assertFalse( "Transfer listener still registered after putArtifact",
- wagon.getTransferEventSupport().hasTransferListener( transferListener ) );
+ assertFalse( "Transfer listener is registered before test", wagon.getTransferEventSupport().hasTransferListener( transferListener ) );
+ wagonManager.putArtifact( sampleFile, artifact, repo, transferListener );
+ assertFalse( "Transfer listener still registered after putArtifact", wagon.getTransferEventSupport().hasTransferListener( transferListener ) );
}
/**
@@ -385,7 +347,7 @@
try
{
- wagonManager.getArtifact( artifact, repo, true );
+ wagonManager.getArtifact( artifact, repo, null );
}
catch ( ChecksumFailedException e )
{
@@ -398,7 +360,7 @@
try
{
- wagonManager.getArtifact( artifact, repo, true );
+ wagonManager.getArtifact( artifact, repo, null );
}
catch ( ChecksumFailedException e )
{
@@ -411,7 +373,7 @@
try
{
- wagonManager.getArtifact( artifact, repo, true );
+ wagonManager.getArtifact( artifact, repo, null );
fail( "Checksum verification did not fail" );
}
catch ( ChecksumFailedException e )
@@ -425,7 +387,7 @@
try
{
- wagonManager.getArtifact( artifact, repo, true );
+ wagonManager.getArtifact( artifact, repo, null );
}
catch ( ChecksumFailedException e )
{
@@ -438,7 +400,7 @@
try
{
- wagonManager.getArtifact( artifact, repo, true );
+ wagonManager.getArtifact( artifact, repo, null );
}
catch ( ChecksumFailedException e )
{
@@ -451,7 +413,7 @@
try
{
- wagonManager.getArtifact( artifact, repo, true );
+ wagonManager.getArtifact( artifact, repo, null );
fail( "Checksum verification did not fail" );
}
catch ( ChecksumFailedException e )
@@ -468,32 +430,6 @@
assertNotNull( "Check wagon, protocol=" + protocol, wagon );
}
- private void assertWagonRepository( String protocol )
- throws Exception
- {
- Repository repository = new Repository();
-
- String s = "value=" + protocol;
-
- repository.setId( "id=" + protocol );
-
- repository.setProtocol( protocol );
-
- Xpp3Dom conf = new Xpp3Dom( "configuration" );
-
- Xpp3Dom configurableField = new Xpp3Dom( "configurableField" );
-
- configurableField.setValue( s );
-
- conf.addChild( configurableField );
-
- WagonMock wagon = (WagonMock) wagonManager.getWagon( repository );
-
- assertNotNull( "Check wagon, protocol=" + protocol, wagon );
-
- assertEquals( "Check configuration for wagon, protocol=" + protocol, s, wagon.getConfigurableField() );
- }
-
private final class ArtifactRepositoryLayoutStub
implements ArtifactRepositoryLayout
{
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java:738757-738972
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/DefaultWagonManagerTest.java:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java (from r788972, maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/StringWagon.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java?p2=maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java&p1=maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/StringWagon.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/StringWagon.java (original)
+++ maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.manager;
+package org.apache.maven.repository.legacy;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/test/java/org/apache/maven/artifact/manager/StringWagon.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/StringWagon.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/StringWagon.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/manager/StringWagon.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/manager/StringWagon.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/manager/StringWagon.java:738757-738972
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/StringWagon.java:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonA.java (from r788972, maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonA.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonA.java?p2=maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonA.java&p1=maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonA.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonA.java (original)
+++ maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonA.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.manager;
+package org.apache.maven.repository.legacy;
import org.apache.maven.wagon.Wagon;
import org.codehaus.plexus.component.annotations.Component;
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonA.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.1
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonA.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonA.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonA.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonA.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonA.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonA.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/manager/WagonA.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonA.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonA.java:738757-738972
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonA.java:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonB.java (from r788972, maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonB.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonB.java?p2=maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonB.java&p1=maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonB.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonB.java (original)
+++ maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonB.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.manager;
+package org.apache.maven.repository.legacy;
import org.apache.maven.wagon.Wagon;
import org.codehaus.plexus.component.annotations.Component;
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonB.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.1
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonB.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonB.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonB.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonB.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonB.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonB.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/manager/WagonB.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonB.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonB.java:738757-738972
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonB.java:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonC.java (from r788972, maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonC.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonC.java?p2=maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonC.java&p1=maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonC.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonC.java (original)
+++ maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonC.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.manager;
+package org.apache.maven.repository.legacy;
import org.apache.maven.wagon.Wagon;
import org.codehaus.plexus.component.annotations.Component;
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonC.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.1
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonC.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonC.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonC.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonC.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonC.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonC.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/manager/WagonC.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonC.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonC.java:738757-738972
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonC.java:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonMock.java (from r788972, maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonMock.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonMock.java?p2=maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonMock.java&p1=maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonMock.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonMock.java (original)
+++ maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonMock.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.manager;
+package org.apache.maven.repository.legacy;
/*
* Licensed to the Apache Software Foundation (ASF) under one
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonMock.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonMock.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonMock.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonMock.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonMock.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/manager/WagonMock.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/manager/WagonMock.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonMock.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonMock.java:738757-738972
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/manager/WagonMock.java:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java (from r788972, maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java?p2=maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java&p1=maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java (original)
+++ maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver;
+package org.apache.maven.repository.legacy.resolver;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -36,6 +36,9 @@
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.ArtifactResolutionException;
+import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
+import org.apache.maven.artifact.resolver.CyclicDependencyException;
import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.resolver.filter.ExclusionSetFilter;
import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
@@ -44,6 +47,7 @@
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.artifact.versioning.OverConstrainedVersionException;
import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.repository.legacy.resolver.ArtifactCollector;
import org.codehaus.plexus.PlexusTestCase;
/**
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java:738757-738972
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/resolver/DefaultArtifactCollectorTest.java:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java (from r788972, maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/AbstractConflictResolverTest.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java?p2=maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java&p1=maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/AbstractConflictResolverTest.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/AbstractConflictResolverTest.java (original)
+++ maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.conflict;
+package org.apache.maven.repository.legacy.resolver.conflict;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,6 +24,7 @@
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.repository.legacy.resolver.conflict.ConflictResolver;
import org.codehaus.plexus.PlexusTestCase;
/**
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Jun 28 09:39:49 2009
@@ -0,0 +1,7 @@
+/maven/components/branches/MNG-3932-1/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/AbstractConflictResolverTest.java:746145-746157
+/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/AbstractConflictResolverTest.java:680477
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/AbstractConflictResolverTest.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/conflict/AbstractConflictResolverTest.java:679206
+/maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/AbstractConflictResolverTest.java:738973-739966
+/maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/AbstractConflictResolverTest.java:738757-738972
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/AbstractConflictResolverTest.java:751453-767358,767708-768832
Copied: maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java (from r788972, maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/FarthestConflictResolverTest.java)
URL: http://svn.apache.org/viewvc/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java?p2=maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java&p1=maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/FarthestConflictResolverTest.java&r1=788972&r2=789077&rev=789077&view=diff
==============================================================================
--- maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/FarthestConflictResolverTest.java (original)
+++ maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java Sun Jun 28 09:39:49 2009
@@ -1,4 +1,4 @@
-package org.apache.maven.artifact.resolver.conflict;
+package org.apache.maven.repository.legacy.resolver.conflict;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -22,6 +22,7 @@
import java.util.Collections;
import org.apache.maven.artifact.resolver.ResolutionNode;
+import org.apache.maven.repository.legacy.resolver.conflict.FarthestConflictResolver;
/**
* Tests <code>FarthestConflictResolver</code>.