You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2009/08/03 01:28:59 UTC
svn commit: r800158 [2/3] - in /maven/components/branches/MNG-4162: ./
apache-maven/ maven-compat/src/main/java/org/apache/maven/artifact/
maven-compat/src/main/java/org/apache/maven/artifact/repository/
maven-compat/src/main/java/org/apache/maven/prof...
Propchange: maven/components/branches/MNG-4162/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -1,7 +1,8 @@
/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/maven-2.0.x/maven-artifact-manager/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
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphEdge.java:799928-799938
Propchange: maven/components/branches/MNG-4162/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -1,7 +1,8 @@
/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/maven-2.0.x/maven-artifact-manager/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
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphTransformationException.java:799928-799938
Propchange: maven/components/branches/MNG-4162/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -1,7 +1,8 @@
/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/maven-2.0.x/maven-artifact-manager/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
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataGraphVertex.java:799928-799938
Propchange: maven/components/branches/MNG-4162/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -1,7 +1,8 @@
/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/maven-2.0.x/maven-artifact-manager/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
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolution.java:799928-799938
Propchange: maven/components/branches/MNG-4162/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -1,7 +1,8 @@
/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/maven-2.0.x/maven-artifact-manager/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
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionException.java:799928-799938
Propchange: maven/components/branches/MNG-4162/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -1,7 +1,8 @@
/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/maven-2.0.x/maven-artifact-manager/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
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequest.java:799928-799938
Propchange: maven/components/branches/MNG-4162/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequestTypeEnum.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -1,7 +1,8 @@
/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/maven-2.0.x/maven-artifact-manager/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
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionRequestTypeEnum.java:799928-799938
Propchange: maven/components/branches/MNG-4162/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -1,7 +1,8 @@
/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/maven-2.0.x/maven-artifact-manager/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
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataResolutionResult.java:799928-799938
Propchange: maven/components/branches/MNG-4162/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataRetrievalException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -1,7 +1,8 @@
/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/maven-2.0.x/maven-artifact-manager/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
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataRetrievalException.java:799928-799938
Propchange: maven/components/branches/MNG-4162/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -1,7 +1,8 @@
/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/maven-2.0.x/maven-artifact-manager/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
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataSource.java:799928-799938
Propchange: maven/components/branches/MNG-4162/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataTreeNode.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -1,7 +1,8 @@
/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/maven-2.0.x/maven-artifact-manager/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
+/maven/components/trunk/maven-compat/src/main/java/org/apache/maven/repository/metadata/MetadataTreeNode.java:799928-799938
Propchange: maven/components/branches/MNG-4162/maven-compat/src/main/mdo/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -4,4 +4,4 @@
/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/main/mdo:679206
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/main/mdo:738973-739966
/maven/components/sisbell-plugin-manager/maven-compat/src/main/mdo:738757-738972
-/maven/components/trunk/maven-compat/src/main/mdo:751453-767358,767708-768832
+/maven/components/trunk/maven-compat/src/main/mdo:751453-767358,767708-768832,799928-799938
Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -4,4 +4,4 @@
/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test:679206
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/test:738973-739966
/maven/components/sisbell-plugin-manager/maven-compat/src/test:738757-738972
-/maven/components/trunk/maven-compat/src/test:751453-767358,767708-768832
+/maven/components/trunk/maven-compat/src/test:751453-767358,767708-768832,799928-799938
Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/project/path/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -3,5 +3,5 @@
/maven/components/branches/maven-2.0.x/maven-project/src/test/java/org/apache/maven/project/path:679206,720042
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/project/path:738973-739966
/maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/project/path:738757-738972
-/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/project/path:751453-767358,767708-768832
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/project/path:751453-767358,767708-768832,799928-799938
/maven/components/trunk/maven-project/src/test/java/org/apache/maven/project/path:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-repository/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java:739385,741841,747468,747683,748815,749612,766523,768817
/maven/components/branches/sisbell-plugin-manager/maven-repository/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-repository/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java:738757-738972
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java:799928-799938
/maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/MirrorProcessorTest.java:751453-767358,767708-768832
Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -1,7 +1,8 @@
/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/maven-2.0.x/maven-artifact-manager/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
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultUpdateCheckManagerTest.java:799928-799938
Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -1,7 +1,8 @@
/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/maven-2.0.x/maven-artifact-manager/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
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/DefaultWagonManagerTest.java:799928-799938
Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-repository/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java:739385,741841,747468,747683,748815,749612,766523,768817
/maven/components/branches/sisbell-plugin-manager/maven-repository/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-repository/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java:738757-738972
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java:799928-799938
/maven/components/trunk/maven-repository/src/test/java/org/apache/maven/repository/legacy/LegacyRepositorySystemTest.java:751453-767358,767708-768832
Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -1,7 +1,8 @@
/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/maven-2.0.x/maven-artifact-manager/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
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/StringWagon.java:799928-799938
Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonA.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -1,7 +1,8 @@
/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/maven-2.0.x/maven-artifact-manager/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
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonA.java:799928-799938
Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonB.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -1,7 +1,8 @@
/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/maven-2.0.x/maven-artifact-manager/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
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonB.java:799928-799938
Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonC.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -1,7 +1,8 @@
/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/maven-2.0.x/maven-artifact-manager/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
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonC.java:799928-799938
Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonMock.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -1,7 +1,8 @@
/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/maven-2.0.x/maven-artifact-manager/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
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/WagonMock.java:799928-799938
Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -1,7 +1,8 @@
/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/maven-2.0.x/maven-artifact-manager/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
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/DefaultArtifactCollectorTest.java:799928-799938
Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -1,7 +1,8 @@
/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/maven-2.0.x/maven-artifact-manager/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
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/AbstractConflictResolverTest.java:799928-799938
Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -1,7 +1,8 @@
/maven/components/branches/MNG-3932-1/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/FarthestConflictResolverTest.java:746145-746157
/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/FarthestConflictResolverTest.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/FarthestConflictResolverTest.java:679206
/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/conflict/FarthestConflictResolverTest.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/FarthestConflictResolverTest.java:679206
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/FarthestConflictResolverTest.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/FarthestConflictResolverTest.java:738757-738972
/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/FarthestConflictResolverTest.java:751453-767358,767708-768832
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/FarthestConflictResolverTest.java:799928-799938
Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -1,7 +1,8 @@
/maven/components/branches/MNG-3932-1/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/NearestConflictResolverTest.java:746145-746157
/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/NearestConflictResolverTest.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/NearestConflictResolverTest.java:679206
/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/conflict/NearestConflictResolverTest.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/NearestConflictResolverTest.java:679206
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/NearestConflictResolverTest.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/NearestConflictResolverTest.java:738757-738972
/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/NearestConflictResolverTest.java:751453-767358,767708-768832
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NearestConflictResolverTest.java:799928-799938
Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -1,7 +1,8 @@
/maven/components/branches/MNG-3932-1/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/NewestConflictResolverTest.java:746145-746157
/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/NewestConflictResolverTest.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/NewestConflictResolverTest.java:679206
/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/conflict/NewestConflictResolverTest.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/NewestConflictResolverTest.java:679206
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/NewestConflictResolverTest.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/NewestConflictResolverTest.java:738757-738972
/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/NewestConflictResolverTest.java:751453-767358,767708-768832
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/NewestConflictResolverTest.java:799928-799938
Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -1,7 +1,8 @@
/maven/components/branches/MNG-3932-1/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/OldestConflictResolverTest.java:746145-746157
/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/OldestConflictResolverTest.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/OldestConflictResolverTest.java:679206
/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/conflict/OldestConflictResolverTest.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/OldestConflictResolverTest.java:679206
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/OldestConflictResolverTest.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/OldestConflictResolverTest.java:738757-738972
/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/OldestConflictResolverTest.java:751453-767358,767708-768832
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/legacy/resolver/conflict/OldestConflictResolverTest.java:799928-799938
Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -1,7 +1,8 @@
/maven/components/branches/MNG-3932-1/maven-compat/src/test/java/org/apache/maven/artifact/transform/DefaultClasspathTransformationTest.java:746145-746157
/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/transform/DefaultClasspathTransformationTest.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/transform/DefaultClasspathTransformationTest.java:679206
/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/transform/DefaultClasspathTransformationTest.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/transform/DefaultClasspathTransformationTest.java:679206
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/transform/DefaultClasspathTransformationTest.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/transform/DefaultClasspathTransformationTest.java:738757-738972
/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/transform/DefaultClasspathTransformationTest.java:751453-767358,767708-768832
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultClasspathTransformationTest.java:799928-799938
Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -1,7 +1,8 @@
/maven/components/branches/MNG-3932-1/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicyTest.java:746145-746157
/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicyTest.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicyTest.java:679206
/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicyTest.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicyTest.java:679206
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicyTest.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicyTest.java:738757-738972
/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolutionPolicyTest.java:751453-767358,767708-768832
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolutionPolicyTest.java:799928-799938
Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -1,7 +1,8 @@
/maven/components/branches/MNG-3932-1/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolverTest.java:746145-746157
/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolverTest.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolverTest.java:679206
/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolverTest.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolverTest.java:679206
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolverTest.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolverTest.java:738757-738972
/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/resolver/conflict/DefaultGraphConflictResolverTest.java:751453-767358,767708-768832
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/metadata/DefaultGraphConflictResolverTest.java:799928-799938
Propchange: maven/components/branches/MNG-4162/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -1,7 +1,8 @@
/maven/components/branches/MNG-3932-1/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java:746145-746157
/maven/components/branches/maven-2.0.10-RC/maven-artifact-manager/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java:680477
-/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java:679206
/maven/components/branches/maven-2.0.x/maven-artifact/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java:679206
+/maven/components/branches/maven-2.0.x/maven-artifact-manager/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java:679206
/maven/components/branches/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java:738757-738972
/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/artifact/metadata/TestMetadataSource.java:751453-767358,767708-768832
+/maven/components/trunk/maven-compat/src/test/java/org/apache/maven/repository/metadata/TestMetadataSource.java:799928-799938
Propchange: maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/MavenExecutionException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/reactor/MavenExecutionException.java:739385,741841,747468,747683,748815,749612,766523,768817
/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/reactor/MavenExecutionException.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/reactor/MavenExecutionException.java:738757-738972
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/MavenExecutionException.java:799928-799938
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/reactor/MavenExecutionException.java:751453-767358,767708-768832
Propchange: maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/MissingModuleException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/reactor/MissingModuleException.java:739385,741841,747468,747683,748815,749612,766523,768817
/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/reactor/MissingModuleException.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/reactor/MissingModuleException.java:738757-738972
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/MissingModuleException.java:799928-799938
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/reactor/MissingModuleException.java:751453-767358,767708-768832
Propchange: maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/classrealm/
------------------------------------------------------------------------------
bugtraq:label = Enter issue ID:
Propchange: maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/classrealm/
------------------------------------------------------------------------------
bugtraq:message = Issue id: %BUGID%
Propchange: maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/classrealm/
------------------------------------------------------------------------------
bugtraq:number = false
Propchange: maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/classrealm/
------------------------------------------------------------------------------
bugtraq:url = http://jira.codehaus.org/browse/%BUGID%
Copied: maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManager.java (from r799938, maven/components/trunk/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManager.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManager.java?p2=maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManager.java&p1=maven/components/trunk/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManager.java&r1=799938&r2=800158&rev=800158&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManager.java (original)
+++ maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/classrealm/ClassRealmManager.java Sun Aug 2 23:28:55 2009
@@ -19,6 +19,8 @@
* under the License.
*/
+import java.util.List;
+
import org.apache.maven.model.Model;
import org.apache.maven.model.Plugin;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
@@ -48,5 +50,7 @@
* @return The new plugin realm, never {@code null}.
*/
ClassRealm createPluginRealm( Plugin plugin );
+
+ ClassRealm createPluginRealm( Plugin plugin, ClassRealm importedRealm, List<String> importedPackages );
}
Copied: maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java (from r799938, maven/components/trunk/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java)
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java?p2=maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java&p1=maven/components/trunk/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java&r1=799938&r2=800158&rev=800158&view=diff
==============================================================================
--- maven/components/trunk/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java (original)
+++ maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/classrealm/DefaultClassRealmManager.java Sun Aug 2 23:28:55 2009
@@ -19,6 +19,7 @@
* under the License.
*/
+import java.util.List;
import java.util.Random;
import org.apache.maven.artifact.ArtifactUtils;
@@ -228,6 +229,60 @@
return createRealm( getKey( plugin ) );
}
+
+ public ClassRealm createPluginRealm( Plugin plugin, ClassRealm importedRealm, List<String> importedPackages )
+ {
+ if ( plugin == null )
+ {
+ throw new IllegalArgumentException( "plugin missing" );
+ }
+ String baseRealmId = getKey( plugin );
+ ClassWorld world = getClassWorld();
+
+ String realmId = baseRealmId;
+
+ Random random = new Random();
+
+ synchronized ( world )
+ {
+ ClassRealm classRealm;
+
+ while ( true )
+ {
+ try
+ {
+ classRealm = world.newRealm( realmId );
+
+ if ( logger.isDebugEnabled() )
+ {
+ logger.debug( "Created new class realm " + realmId );
+ }
+
+ break;
+ }
+ catch ( DuplicateRealmException e )
+ {
+ realmId = baseRealmId + '-' + random.nextInt();
+ }
+ }
+
+ classRealm.setParentRealm( importedRealm );
+ try
+ {
+ for ( String imported : importedPackages )
+ {
+ classRealm.importFrom( importedRealm.getId(), imported );
+ }
+ }
+ catch ( NoSuchRealmException e )
+ {
+ throw new IllegalStateException( e );
+ }
+ //importXpp3Dom( classRealm );
+
+ return classRealm;
+ }
+ }
private String getKey( Plugin plugin )
{
Propchange: maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/execution/ProjectSorter.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -4,4 +4,4 @@
/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/execution/ProjectSorter.java:739385,741841,747468,747683,748815,749612,766523,768817
/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/execution/ProjectSorter.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/execution/ProjectSorter.java:738757-738972
-/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/ProjectSorter.java:751453-767358,767708-768832
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/execution/ProjectSorter.java:751453-767358,767708-768832,799928-799938
Modified: maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java?rev=800158&r1=800157&r2=800158&view=diff
==============================================================================
--- maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java (original)
+++ maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/lifecycle/DefaultLifecycleExecutor.java Sun Aug 2 23:28:55 2009
@@ -651,7 +651,7 @@
return sb.toString();
}
- private void populateMojoExecutionConfiguration( MavenProject project, MojoExecution mojoExecution, boolean directInvocation )
+ public void populateMojoExecutionConfiguration( MavenProject project, MojoExecution mojoExecution, boolean directInvocation )
{
String g = mojoExecution.getGroupId();
Propchange: maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -4,4 +4,4 @@
/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java:738757-738972
-/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java:688587-696625,696644-699681,751453-767358,767708-768832
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/DefaultLifecycleMapping.java:688587-696625,696644-699681,751453-767358,767708-768832,799928-799938
Propchange: maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -4,4 +4,4 @@
/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java:738757-738972
-/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java:688587-696625,696644-699681,751453-767358,767708-768832
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/lifecycle/mapping/LifecycleMapping.java:688587-696625,696644-699681,751453-767358,767708-768832,799928-799938
Propchange: maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/listeners/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -3,5 +3,5 @@
/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/builder/listeners:679206
/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/listeners:738973-739966
/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/listeners:738757-738972
-/maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners:751453-767358,767708-768832
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners:751453-767358,767708-768832,799928-799938
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/listeners:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -3,5 +3,5 @@
/maven/components/branches/maven-2.0.x/maven-project/src/main/java/org/apache/maven/project/builder/listeners/PluginExtensionListener.java:679206
/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java:738757-738972
-/maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java:751453-767358,767708-768832
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/listeners/BuildExtensionListener.java:751453-767358,767708-768832,799928-799938
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project/builder/listeners/PluginExtensionListener.java:688587-696625,696644-699681
Modified: maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=800158&r1=800157&r2=800158&view=diff
==============================================================================
--- maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java (original)
+++ maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java Sun Aug 2 23:28:55 2009
@@ -40,7 +40,9 @@
import org.apache.maven.artifact.resolver.ArtifactResolutionResult;
import org.apache.maven.artifact.resolver.ResolutionErrorHandler;
import org.apache.maven.artifact.resolver.filter.AndArtifactFilter;
+import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
+import org.apache.maven.classrealm.ClassRealmManager;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.Plugin;
@@ -51,12 +53,8 @@
import org.apache.maven.project.DuplicateArtifactAttachmentException;
import org.apache.maven.project.MavenProject;
import org.apache.maven.repository.RepositorySystem;
-import org.codehaus.plexus.MutablePlexusContainer;
import org.codehaus.plexus.PlexusContainer;
-import org.codehaus.plexus.classworlds.ClassWorld;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
-import org.codehaus.plexus.classworlds.realm.DuplicateRealmException;
-import org.codehaus.plexus.classworlds.realm.NoSuchRealmException;
import org.codehaus.plexus.component.annotations.Component;
import org.codehaus.plexus.component.annotations.Requirement;
import org.codehaus.plexus.component.composition.CycleDetectedInComponentGraphException;
@@ -92,6 +90,9 @@
protected PlexusContainer container;
@Requirement
+ private ClassRealmManager classRealmManager;
+
+ @Requirement
protected ArtifactFilterManager coreArtifactFilterManager;
@Requirement
@@ -235,15 +236,16 @@
return pluginDescriptor;
}
- // TODO: Turn this into a component so it can be tested.
- //
- List<Artifact> getPluginArtifacts( Artifact pluginArtifact, Plugin pluginAsSpecifiedInPom, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories )
- throws ArtifactNotFoundException, ArtifactResolutionException
+ List<Artifact> getPluginArtifacts( Artifact pluginArtifact, Plugin pluginAsSpecifiedInPom, ArtifactRepository localRepository, List<ArtifactRepository> remoteRepositories, List<ArtifactFilter> artifactFilters )
+ throws ArtifactNotFoundException, ArtifactResolutionException
{
- AndArtifactFilter filter = new AndArtifactFilter();
- filter.add( coreArtifactFilterManager.getCoreArtifactFilter() );
- filter.add( new ScopeArtifactFilter( Artifact.SCOPE_RUNTIME_PLUS_SYSTEM ) );
+ AndArtifactFilter filter = new AndArtifactFilter();
+ if (artifactFilters != null) {
+ for (ArtifactFilter artifactFilter : artifactFilters) {
+ filter.add(artifactFilter);
+ }
+ }
Set<Artifact> dependenciesToResolveForPlugin = new LinkedHashSet<Artifact>();
// The case where we have a plugin that can host multiple versions of a particular tool. Say the
@@ -284,6 +286,23 @@
return new ArrayList<Artifact>( result.getArtifacts() );
}
+
+ // TODO: Turn this into a component so it can be tested.
+ //
+ List<Artifact> getPluginArtifacts(Artifact pluginArtifact,
+ Plugin pluginAsSpecifiedInPom, ArtifactRepository localRepository,
+ List<ArtifactRepository> remoteRepositories)
+ throws ArtifactNotFoundException, ArtifactResolutionException {
+ List<ArtifactFilter> artifactFilters = new ArrayList<ArtifactFilter>(2);
+
+ artifactFilters.add(coreArtifactFilterManager.getCoreArtifactFilter());
+ artifactFilters.add(new ScopeArtifactFilter(
+ Artifact.SCOPE_RUNTIME_PLUS_SYSTEM));
+
+ return getPluginArtifacts(pluginArtifact, pluginAsSpecifiedInPom,
+ localRepository, remoteRepositories, artifactFilters);
+
+ }
// ----------------------------------------------------------------------
// Mojo execution
@@ -361,11 +380,8 @@
}
}
- /**
- * TODO pluginDescriptor classRealm and artifacts are set as a side effect of this
- * call, which is not nice.
- */
- public synchronized ClassRealm getPluginRealm( MavenSession session, PluginDescriptor pluginDescriptor )
+ public synchronized ClassRealm getPluginRealm( MavenSession session, PluginDescriptor pluginDescriptor,
+ ClassRealm importedRealm, List<String> importedPackages )
throws PluginManagerException
{
ClassRealm pluginRealm = pluginDescriptor.getClassRealm();
@@ -388,7 +404,7 @@
return pluginRealm;
}
- pluginRealm = createPluginRealm( plugin );
+ pluginRealm = createPluginRealm( plugin, importedRealm, importedPackages );
Artifact pluginArtifact = pluginDescriptor.getPluginArtifact();
@@ -421,10 +437,10 @@
pluginDescriptor.setClassRealm( pluginRealm );
pluginDescriptor.setArtifacts( pluginArtifacts );
-
+
try
{
- for ( ComponentDescriptor componentDescriptor : pluginDescriptor.getComponents() )
+ for ( ComponentDescriptor<?> componentDescriptor : pluginDescriptor.getComponents() )
{
componentDescriptor.setRealm( pluginRealm );
container.addComponentDescriptor( componentDescriptor );
@@ -442,55 +458,122 @@
}
pluginCache.put( plugin, localRepository, remoteRepositories, pluginRealm, pluginArtifacts );
-
+
return pluginRealm;
}
- /**
- * Creates ClassRealm with unique id for the given plugin
- */
- private ClassRealm createPluginRealm( Plugin plugin )
- throws PluginManagerException
+ public synchronized ClassRealm getPluginRealm( MavenSession session, PluginDescriptor pluginDescriptor, List<ArtifactFilter> artifactFilters )
+ throws PluginManagerException
{
- ClassWorld world = ((MutablePlexusContainer) container).getClassWorld();
+ ClassRealm pluginRealm = pluginDescriptor.getClassRealm();
+ if ( pluginRealm != null )
+ {
+ return pluginRealm;
+ }
- String baseRealmId = constructPluginKey( plugin );
- String realmId = baseRealmId;
+ Plugin plugin = pluginDescriptor.getPlugin();
+ ArtifactRepository localRepository = session.getLocalRepository();
+ List<ArtifactRepository> remoteRepositories = session.getCurrentProject().getPluginArtifactRepositories();
- synchronized ( world )
+ PluginCache.CacheRecord cacheRecord = pluginCache.get( plugin, localRepository, remoteRepositories );
+
+ if ( cacheRecord != null )
{
- for ( int i = 0; i < 100; i++ )
+ pluginDescriptor.setClassRealm( cacheRecord.realm );
+ pluginDescriptor.setArtifacts( new ArrayList<Artifact>( cacheRecord.artifacts ) );
+
+ return pluginRealm;
+ }
+
+ pluginRealm = createPluginRealm( plugin );
+
+ Artifact pluginArtifact = pluginDescriptor.getPluginArtifact();
+
+ List<Artifact> pluginArtifacts;
+
+ try
+ {
+ if (artifactFilters == null)
{
- try
- {
- ClassRealm pluginRealm = world.newRealm( realmId );
- pluginRealm.setParentRealm( container.getContainerRealm() );
+ pluginArtifacts = getPluginArtifacts( pluginArtifact, plugin, localRepository, remoteRepositories );
+ }
+ else
+ {
+ pluginArtifacts = getPluginArtifacts( pluginArtifact, plugin, localRepository, remoteRepositories, artifactFilters);
+ }
+ }
+ catch ( ArtifactNotFoundException e )
+ {
+ throw new IllegalStateException( e ); // XXX
+ }
+ catch ( ArtifactResolutionException e )
+ {
+ throw new IllegalStateException( e ); // XXX
+ }
- String coreRealmId = container.getContainerRealm().getId();
- try
- {
- pluginRealm.importFrom( coreRealmId, "org.codehaus.plexus.util.xml.Xpp3Dom" );
- pluginRealm.importFrom( coreRealmId, "org.codehaus.plexus.util.xml.pull.XmlPullParser" );
- pluginRealm.importFrom( coreRealmId, "org.codehaus.plexus.util.xml.pull.XmlPullParserException" );
- pluginRealm.importFrom( coreRealmId, "org.codehaus.plexus.util.xml.pull.XmlSerializer" );
- }
- catch ( NoSuchRealmException e )
- {
- throw new IllegalStateException( e );
- }
+ for ( Artifact a : pluginArtifacts )
+ {
+ try
+ {
+ pluginRealm.addURL( a.getFile().toURI().toURL() );
+ }
+ catch ( MalformedURLException e )
+ {
+ // Not going to happen
+ }
+ }
- return pluginRealm;
- }
- catch ( DuplicateRealmException e )
- {
- realmId = baseRealmId + "-" + i;
- }
+ pluginDescriptor.setClassRealm( pluginRealm );
+ pluginDescriptor.setArtifacts( pluginArtifacts );
+
+ try
+ {
+ for ( ComponentDescriptor<?> componentDescriptor : pluginDescriptor.getComponents() )
+ {
+ componentDescriptor.setRealm( pluginRealm );
+ container.addComponentDescriptor( componentDescriptor );
}
+
+ container.discoverComponents( pluginRealm );
+ }
+ catch ( PlexusConfigurationException e )
+ {
+ throw new PluginManagerException( plugin, e.getMessage(), e );
+ }
+ catch ( CycleDetectedInComponentGraphException e )
+ {
+ throw new PluginManagerException( plugin, e.getMessage(), e );
}
- throw new PluginManagerException( plugin, "Could not create ClassRealm for plugin " + baseRealmId, (Throwable) null );
+ pluginCache.put( plugin, localRepository, remoteRepositories, pluginRealm, pluginArtifacts );
+
+ return pluginRealm;
+ }
+
+ /**
+ * TODO pluginDescriptor classRealm and artifacts are set as a side effect of this
+ * call, which is not nice.
+ */
+ public synchronized ClassRealm getPluginRealm( MavenSession session, PluginDescriptor pluginDescriptor )
+ throws PluginManagerException
+ {
+ return getPluginRealm(session, pluginDescriptor, null);
}
+ /**
+ * Creates ClassRealm with unique id for the given plugin
+ */
+ private ClassRealm createPluginRealm( Plugin plugin )
+ {
+ return classRealmManager.createPluginRealm( plugin );
+ }
+
+
+ private ClassRealm createPluginRealm( Plugin plugin, ClassRealm importedRealm, List<String> importedPackages )
+ {
+ return classRealmManager.createPluginRealm( plugin, importedRealm, importedPackages );
+ }
+
public Mojo getConfiguredMojo( MavenSession session, MavenProject project, MojoExecution mojoExecution, ClassRealm pluginRealm )
throws PluginConfigurationException, PluginManagerException
{
@@ -565,80 +648,84 @@
}
- public Object getConfiguredMojo(Class<?> clazz, MavenSession session, MavenProject project, MojoExecution mojoExecution, ClassRealm pluginRealm )
- throws PluginConfigurationException, PluginManagerException
-{
- MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();
-
- PluginDescriptor pluginDescriptor = mojoDescriptor.getPluginDescriptor();
+ public Object getConfiguredMojo( Class<?> clazz, MavenSession session, MavenProject project,
+ MojoExecution mojoExecution, ClassRealm pluginRealm )
+ throws PluginConfigurationException, PluginManagerException
+ {
+ MojoDescriptor mojoDescriptor = mojoExecution.getMojoDescriptor();
- // We are forcing the use of the plugin realm for all lookups that might occur during
- // the lifecycle that is part of the lookup. Here we are specifically trying to keep
- // lookups that occur in contextualize calls in line with the right realm.
- ClassRealm oldLookupRealm = container.setLookupRealm( pluginRealm );
+ PluginDescriptor pluginDescriptor = mojoDescriptor.getPluginDescriptor();
- ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
- Thread.currentThread().setContextClassLoader( pluginRealm );
- container.setLookupRealm( pluginRealm );
+ // We are forcing the use of the plugin realm for all lookups that might
+ // occur during
+ // the lifecycle that is part of the lookup. Here we are specifically
+ // trying to keep
+ // lookups that occur in contextualize calls in line with the right
+ // realm.
+ ClassRealm oldLookupRealm = container.setLookupRealm( pluginRealm );
- try
- {
- Object mojo;
+ ClassLoader oldClassLoader = Thread.currentThread().getContextClassLoader();
+ Thread.currentThread().setContextClassLoader( pluginRealm );
+ container.setLookupRealm( pluginRealm );
try
{
- mojo = container.lookup( clazz, mojoDescriptor.getRoleHint() );
- }
- catch ( ComponentLookupException e )
- {
- throw new PluginContainerException( mojoDescriptor, pluginRealm, "Unable to find the mojo '"
- + mojoDescriptor.getGoal() + "' in the plugin '" + pluginDescriptor.getId() + "'", e );
- }
+ Object mojo;
- if ( mojo instanceof ContextEnabled )
- {
- //TODO: find somewhere better to put the plugin context.
- Map<String, Object> pluginContext = session.getPluginContext( pluginDescriptor, project );
+ try
+ {
+ mojo = container.lookup( clazz, mojoDescriptor.getRoleHint() );
+ }
+ catch ( ComponentLookupException e )
+ {
+ throw new PluginContainerException( mojoDescriptor, pluginRealm, "Unable to find the mojo '"
+ + mojoDescriptor.getGoal() + "' in the plugin '" + pluginDescriptor.getId() + "'", e );
+ }
- if ( pluginContext != null )
+ if ( mojo instanceof ContextEnabled )
{
- pluginContext.put( "project", project );
+ // TODO: find somewhere better to put the plugin context.
+ Map<String, Object> pluginContext = session.getPluginContext( pluginDescriptor, project );
+
+ if ( pluginContext != null )
+ {
+ pluginContext.put( "project", project );
- pluginContext.put( "pluginDescriptor", pluginDescriptor );
+ pluginContext.put( "pluginDescriptor", pluginDescriptor );
- ( (ContextEnabled) mojo ).setPluginContext( pluginContext );
+ ( (ContextEnabled) mojo ).setPluginContext( pluginContext );
+ }
}
- }
- // FIXME
- //mojo.setLog( new DefaultLog( logger ) );
+ // FIXME
+ // mojo.setLog( new DefaultLog( logger ) );
- Xpp3Dom dom = mojoExecution.getConfiguration();
+ Xpp3Dom dom = mojoExecution.getConfiguration();
- PlexusConfiguration pomConfiguration;
+ PlexusConfiguration pomConfiguration;
- if ( dom == null )
- {
- pomConfiguration = new XmlPlexusConfiguration( "configuration" );
+ if ( dom == null )
+ {
+ pomConfiguration = new XmlPlexusConfiguration( "configuration" );
+ }
+ else
+ {
+ pomConfiguration = new XmlPlexusConfiguration( dom );
+ }
+
+ ExpressionEvaluator expressionEvaluator = new PluginParameterExpressionEvaluator( session, mojoExecution );
+
+ populatePluginFields( (Mojo) mojo, mojoDescriptor, pluginRealm, pomConfiguration, expressionEvaluator );
+
+ return mojo;
}
- else
+ finally
{
- pomConfiguration = new XmlPlexusConfiguration( dom );
+ Thread.currentThread().setContextClassLoader( oldClassLoader );
+ container.setLookupRealm( oldLookupRealm );
}
- ExpressionEvaluator expressionEvaluator = new PluginParameterExpressionEvaluator( session, mojoExecution );
-
- populatePluginFields( (Mojo) mojo, mojoDescriptor, pluginRealm, pomConfiguration, expressionEvaluator );
-
- return mojo;
}
- finally
- {
- Thread.currentThread().setContextClassLoader( oldClassLoader );
- container.setLookupRealm( oldLookupRealm );
- }
-
-}
// ----------------------------------------------------------------------
// Mojo Parameter Handling
Propchange: maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/plugin/PluginDescriptorParsingException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -5,3 +5,4 @@
/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/PluginConfigurationException.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/PluginConfigurationException.java:738757-738972
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginConfigurationException.java:751453-767358,767708-768832
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginDescriptorParsingException.java:799928-799938
Propchange: maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoaderException.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoaderException.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoaderException.java:738757-738972
-/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java:751453-767358,767708-768832
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginLoaderException.java:751453-767358,767708-768832,799928-799938
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/loader/PluginLoaderException.java:688587-696625,696644-699681
Modified: maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java
URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java?rev=800158&r1=800157&r2=800158&view=diff
==============================================================================
--- maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java (original)
+++ maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/plugin/PluginManager.java Sun Aug 2 23:28:55 2009
@@ -18,6 +18,7 @@
import java.util.List;
import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.resolver.filter.ArtifactFilter;
import org.apache.maven.execution.MavenSession;
import org.apache.maven.model.Plugin;
import org.apache.maven.plugin.descriptor.MojoDescriptor;
@@ -56,5 +57,9 @@
Object getConfiguredMojo( Class<?> clazz, MavenSession session, MavenProject project,
MojoExecution mojoExecution, ClassRealm pluginRealm )
- throws PluginConfigurationException, PluginManagerException;
+ throws PluginConfigurationException, PluginManagerException;
+
+ ClassRealm getPluginRealm(MavenSession session,
+ PluginDescriptor pluginDescriptor, List<ArtifactFilter> artifactFilter)
+ throws PluginManagerException;
}
\ No newline at end of file
Propchange: maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionNotFoundException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java:738757-738972
-/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionNotFoundException.java:751453-767358,767708-768832
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionNotFoundException.java:751453-767358,767708-768832,799928-799938
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionNotFoundException.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -4,5 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java:739385,741841,747468,748815,749612
/maven/components/branches/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java:738973-739966
/maven/components/sisbell-plugin-manager/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java:738757-738972
-/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java:751453-767358,767708-768832
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/PluginVersionResolutionException.java:751453-767358,767708-768832,799928-799938
/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/version/PluginVersionResolutionException.java:688587-696625,696644-699681
Propchange: maven/components/branches/MNG-4162/maven-core/src/main/java/org/apache/maven/project/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Aug 2 23:28:55 2009
@@ -4,4 +4,5 @@
/maven/components/branches/maven-2.1.x/maven-project/src/main/java/org/apache/maven/project:739385,741841,747468,747683,748815,749612,766523,768817
/maven/components/branches/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project:738973-739966
/maven/components/sisbell-plugin-manager/maven-project/src/main/java/org/apache/maven/project:738757-738972
+/maven/components/trunk/maven-core/src/main/java/org/apache/maven/project:799928-799938
/maven/components/trunk/maven-project/src/main/java/org/apache/maven/project:751453-767358,767708-768832