Apache
/
maven
mirror of https://github.com/apache/maven.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

need to use all test classpath artifacts, not just runtime 

git-svn-id: https://svn.apache.org/repos/asf/maven/components/trunk@330010 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Brett Leslie Porter 2005-11-01 09:39:39 +00:00
parent c456f94dfd
commit d22a487373
1 changed files with 5 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
maven-plugins/maven-idea-plugin/src/main/java/org/apache/maven/plugin/idea/IdeaMojo.java
View File

@ -17,6 +17,7 @@ package org.apache.maven.plugin.idea;
*/ */
import org.apache.maven.artifact.Artifact; import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.DependencyResolutionRequiredException;
import org.apache.maven.model.Resource; import org.apache.maven.model.Resource;
import org.apache.maven.plugin.AbstractMojo; import org.apache.maven.plugin.AbstractMojo;
import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.plugin.MojoExecutionException;
@ -39,6 +40,8 @@ import java.util.Collections;
import java.util.Iterator; import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.Arrays;
import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter; import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
/** /**
@ -322,7 +325,8 @@ public class IdeaMojo
removeOldDependencies( component ); removeOldDependencies( component );
for ( Iterator i = getRuntimeClasspathArtifacts().iterator(); i.hasNext(); ) List testClasspathElements = project.getTestArtifacts();
for ( Iterator i = testClasspathElements.iterator(); i.hasNext(); )
{ {
Artifact a = (Artifact) i.next(); Artifact a = (Artifact) i.next();
Xpp3Dom dep = createElement( component, "orderEntry" ); Xpp3Dom dep = createElement( component, "orderEntry" );
@ -368,34 +372,6 @@ public class IdeaMojo
} }
} }
/**
* Get the list of Classpath Artifacts
*
* @return List of artifacts that are Classpath Elements
*/
private List getRuntimeClasspathArtifacts()
{
Set artifacts = project.getArtifacts();
if ( artifacts == null || artifacts.isEmpty() ) return Collections.EMPTY_LIST;
ScopeArtifactFilter scopeFilter = new ScopeArtifactFilter( Artifact.SCOPE_RUNTIME );
List list = new ArrayList();
for ( Iterator i = artifacts.iterator(); i.hasNext(); )
{
Artifact artifact = (Artifact) i.next();
if ( artifact.getArtifactHandler().isAddedToClasspath() && scopeFilter.include( artifact ) )
{
list.add( artifact );
}
}
return list;
}
/** /**
* Adds the Web module to the (.iml) project file. * Adds the Web module to the (.iml) project file.
* *