Author: jdcasey
Date: Wed Apr 23 14:50:49 2008
New Revision: 651081
URL: http://svn.apache.org/viewvc?rev=651081&view=rev
Log:
Cleaning up artifact ordering for extensions and plugins in teh realm manager
by switching to List for artifact collections, instead of allowing unordered
Collection instances.
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenRealmManagerTest.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManagerTest.java
maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/plan/DefaultBuildPlannerTest.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/realm/DefaultMavenRealmManager.java
maven/components/trunk/maven-project/src/main/java/org/apache/maven/realm/MavenRealmManager.java
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java?rev=651081&r1=651080&r2=651081&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/DefaultArtifactFilterManager.java
Wed Apr 23 14:50:49 2008
@@ -39,6 +39,7 @@
{
Set artifacts = new HashSet();
+ artifacts.add( "classworlds" );
artifacts.add( "plexus-classworlds" );
artifacts.add( "commons-cli" );
artifacts.add( "doxia-sink-api" );
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java?rev=651081&r1=651080&r2=651081&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/extension/DefaultExtensionManager.java
Wed Apr 23 14:50:49 2008
@@ -63,6 +63,7 @@
import org.codehaus.plexus.logging.AbstractLogEnabled;
import org.codehaus.plexus.personality.plexus.lifecycle.phase.Contextualizable;
+import java.util.ArrayList;
import java.util.Iterator;
import java.util.LinkedHashSet;
import java.util.List;
@@ -370,7 +371,7 @@
{
try
{
- realmManager.createExtensionRealm( extensionArtifact,
resultArtifacts );
+ realmManager.createExtensionRealm( extensionArtifact, new
ArrayList( resultArtifacts ) );
}
catch ( RealmManagementException e )
{
Modified:
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java?rev=651081&r1=651080&r2=651081&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
(original)
+++
maven/components/trunk/maven-core/src/main/java/org/apache/maven/plugin/DefaultPluginManager.java
Wed Apr 23 14:50:49 2008
@@ -274,7 +274,7 @@
projectPlugin.setVersion( plugin.getVersion() );
}
- Set artifacts = getPluginArtifacts( pluginArtifact, projectPlugin,
project,
+ List artifacts = getPluginArtifacts( pluginArtifact, projectPlugin,
project,
session.getLocalRepository() );
getLogger().debug( "Got plugin artifacts:\n\n" + artifacts );
@@ -354,7 +354,7 @@
}
}
- private Set getPluginArtifacts( Artifact pluginArtifact,
+ private List getPluginArtifacts( Artifact pluginArtifact,
Plugin plugin,
MavenProject project,
ArtifactRepository localRepository )
@@ -443,7 +443,7 @@
artifactMetadataSource,
filter );
- Set resolved = new HashSet( result.getArtifacts() );
+ List resolved = new ArrayList( result.getArtifacts() );
for ( Iterator it = resolved.iterator(); it.hasNext(); )
{
Modified:
maven/components/trunk/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenRealmManagerTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenRealmManagerTest.java?rev=651081&r1=651080&r2=651081&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenRealmManagerTest.java
(original)
+++
maven/components/trunk/maven-core/src/test/java/org/apache/maven/execution/DefaultMavenRealmManagerTest.java
Wed Apr 23 14:50:49 2008
@@ -46,7 +46,7 @@
assertFalse( mgr1.hasExtensionRealm( ext1 ) );
- mgr1.createExtensionRealm( ext1, Collections.EMPTY_SET );
+ mgr1.createExtensionRealm( ext1, Collections.EMPTY_LIST );
assertTrue( mgr1.hasExtensionRealm( ext1 ) );
Modified:
maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManagerTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManagerTest.java?rev=651081&r1=651080&r2=651081&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManagerTest.java
(original)
+++
maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/binding/DefaultLifecycleBindingManagerTest.java
Wed Apr 23 14:50:49 2008
@@ -256,7 +256,7 @@
mockManager.replayAll();
- realmManager.createExtensionRealm( extensionArtifact,
Collections.EMPTY_SET );
+ realmManager.createExtensionRealm( extensionArtifact,
Collections.EMPTY_LIST );
realmManager.importExtensionsIntoProjectRealm( "group", "project",
"1", extensionArtifact );
MavenExecutionRequest request = new
DefaultMavenExecutionRequest().setRealmManager( realmManager );
Modified:
maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/plan/DefaultBuildPlannerTest.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/plan/DefaultBuildPlannerTest.java?rev=651081&r1=651080&r2=651081&view=diff
==============================================================================
---
maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/plan/DefaultBuildPlannerTest.java
(original)
+++
maven/components/trunk/maven-core/src/test/java/org/apache/maven/lifecycle/plan/DefaultBuildPlannerTest.java
Wed Apr 23 14:50:49 2008
@@ -146,7 +146,7 @@
mockManager.replayAll();
- realmManager.createExtensionRealm( extensionArtifact,
Collections.EMPTY_SET );
+ realmManager.createExtensionRealm( extensionArtifact,
Collections.EMPTY_LIST );
realmManager.importExtensionsIntoProjectRealm( "group", "project",
"1", extensionArtifact );
MavenExecutionRequest request = new
DefaultMavenExecutionRequest().setRealmManager( realmManager );
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/realm/DefaultMavenRealmManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/realm/DefaultMavenRealmManager.java?rev=651081&r1=651080&r2=651081&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/realm/DefaultMavenRealmManager.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/realm/DefaultMavenRealmManager.java
Wed Apr 23 14:50:49 2008
@@ -115,7 +115,7 @@
}
public ClassRealm createExtensionRealm( Artifact extensionArtifact,
- Collection artifacts )
+ List artifacts )
throws RealmManagementException
{
String id = RealmUtils.createExtensionRealmId( extensionArtifact );
@@ -268,7 +268,7 @@
public ClassRealm createPluginRealm( Plugin plugin,
Artifact pluginArtifact,
- Collection artifacts,
+ List artifacts,
ArtifactFilter coreArtifactFilter )
throws RealmManagementException
{
@@ -299,7 +299,7 @@
private void populateRealm( String id,
ClassRealm realm,
Artifact mainArtifact,
- Collection artifacts,
+ List artifacts,
ArtifactFilter coreArtifactFilter )
throws RealmManagementException
{
@@ -362,7 +362,7 @@
}
public void setPluginArtifacts( Plugin plugin,
- Collection artifacts )
+ List artifacts )
{
String id = RealmUtils.createPluginRealmId( plugin );
Modified:
maven/components/trunk/maven-project/src/main/java/org/apache/maven/realm/MavenRealmManager.java
URL:
http://svn.apache.org/viewvc/maven/components/trunk/maven-project/src/main/java/org/apache/maven/realm/MavenRealmManager.java?rev=651081&r1=651080&r2=651081&view=diff
==============================================================================
---
maven/components/trunk/maven-project/src/main/java/org/apache/maven/realm/MavenRealmManager.java
(original)
+++
maven/components/trunk/maven-project/src/main/java/org/apache/maven/realm/MavenRealmManager.java
Wed Apr 23 14:50:49 2008
@@ -5,7 +5,6 @@
import org.apache.maven.model.Plugin;
import org.codehaus.plexus.classworlds.realm.ClassRealm;
-import java.util.Collection;
import java.util.List;
public interface MavenRealmManager
@@ -16,7 +15,7 @@
boolean hasExtensionRealm( Artifact extensionArtifact );
ClassRealm createExtensionRealm( Artifact extensionArtifact,
- Collection artifacts )
+ List artifacts )
throws RealmManagementException;
void importExtensionsIntoProjectRealm( String projectGroupId,
@@ -35,12 +34,12 @@
ClassRealm createPluginRealm( Plugin plugin,
Artifact pluginArtifact,
- Collection artifacts,
+ List artifacts,
ArtifactFilter coreArtifactFilter )
throws RealmManagementException;
void disposePluginRealm( Plugin plugin );
void setPluginArtifacts( Plugin plugin,
- Collection artifacts );
+ List artifacts );
}
