You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by br...@apache.org on 2005/10/24 06:16:49 UTC
svn commit: r327955 - in /maven/components/trunk/maven-plugins:
maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/
maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/
maven-war-plugin/src/main/java/org/apache/maven/plugin/war/
Author: brett
Date: Sun Oct 23 21:16:41 2005
New Revision: 327955
URL: http://svn.apache.org/viewcvs?rev=327955&view=rev
Log:
PR: MNG-1296
Submitted by: Edwin Punzalan
Reviewed by: Brett Porter
use scope filter and optional flag instead of hard coding
Modified:
maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
maven/components/trunk/maven-plugins/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
maven/components/trunk/maven-plugins/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
Modified: maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java?rev=327955&r1=327954&r2=327955&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-ear-plugin/src/main/java/org/apache/maven/plugin/ear/AbstractEarMojo.java Sun Oct 23 21:16:41 2005
@@ -27,6 +27,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
/**
* A base class for EAR-processing related tasks.
@@ -102,9 +103,9 @@
Artifact artifact = (Artifact) iter.next();
// Artifact is not yet registered and it has neither test, nor a
- // provided scope
- if ( !isArtifactRegistered( artifact, allModules ) && !Artifact.SCOPE_TEST.equals( artifact.getScope() ) &&
- !Artifact.SCOPE_PROVIDED.equals( artifact.getScope() ) )
+ // provided scope, not is it optional
+ ScopeArtifactFilter filter = new ScopeArtifactFilter( Artifact.SCOPE_RUNTIME );
+ if ( !isArtifactRegistered( artifact, allModules ) && !artifact.isOptional() && filter.include( artifact ) )
{
EarModule module = EarModuleFactory.newEarModule( artifact );
allModules.add( module );
Modified: maven/components/trunk/maven-plugins/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java?rev=327955&r1=327954&r2=327955&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-rar-plugin/src/main/java/org/apache/maven/plugin/rar/RarMojo.java Sun Oct 23 21:16:41 2005
@@ -29,6 +29,7 @@
import java.io.IOException;
import java.util.Iterator;
import java.util.Set;
+import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
/**
* Builds J2EE Resource Adapter Archive (RAR) files.
@@ -164,8 +165,9 @@
for ( Iterator iter = artifacts.iterator(); iter.hasNext(); )
{
Artifact artifact = (Artifact) iter.next();
- if ( !Artifact.SCOPE_TEST.equals( artifact.getScope() ) &&
- !Artifact.SCOPE_PROVIDED.equals( artifact.getScope() ) )
+
+ ScopeArtifactFilter filter = new ScopeArtifactFilter( Artifact.SCOPE_RUNTIME );
+ if ( !artifact.isOptional() && filter.include( artifact ) )
{
getLog().info("Copying artifact[" + artifact.getGroupId() + ", " + artifact.getId() + ", " +
artifact.getScope() + "]");
Modified: maven/components/trunk/maven-plugins/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java
URL: http://svn.apache.org/viewcvs/maven/components/trunk/maven-plugins/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java?rev=327955&r1=327954&r2=327955&view=diff
==============================================================================
--- maven/components/trunk/maven-plugins/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java (original)
+++ maven/components/trunk/maven-plugins/maven-war-plugin/src/main/java/org/apache/maven/plugin/war/AbstractWarMojo.java Sun Oct 23 21:16:41 2005
@@ -29,6 +29,7 @@
import java.util.Iterator;
import java.util.List;
import java.util.Set;
+import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
public abstract class AbstractWarMojo
extends AbstractMojo
@@ -274,10 +275,8 @@
Artifact artifact = (Artifact) iter.next();
// TODO: utilise appropriate methods from project builder
- // TODO: scope handler
- // Include runtime and compile time libraries
- if ( !Artifact.SCOPE_PROVIDED.equals( artifact.getScope() ) &&
- !Artifact.SCOPE_TEST.equals( artifact.getScope() ) )
+ ScopeArtifactFilter filter = new ScopeArtifactFilter( Artifact.SCOPE_RUNTIME );
+ if ( !artifact.isOptional() && filter.include( artifact ) )
{
String type = artifact.getType();
if ( "tld".equals( type ) )