Author: brianf
Date: Tue Jan 1 19:27:01 2008
New Revision: 607992
URL: http://svn.apache.org/viewvc?rev=607992&view=rev
Log:
cleaned up the files moved in from maven-dependency-plugin
Added:
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/
- copied from r607985,
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection-filters/
maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection/
- copied from r607985,
maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection-filters/
Removed:
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection-filters/
maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection-filters/
Modified:
maven/shared/branches/maven-common-artifact-filters-brianf/pom.xml
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactFeatureFilter.java
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactsFilter.java
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactIdFilter.java
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactsFilter.java
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/ClassifierFilter.java
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/FilterArtifacts.java
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/GroupIdFilter.java
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/ScopeFilter.java
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/TransitivityFilter.java
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/TypeFilter.java
maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestArtifactFilter.java
maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestClassifierFilter.java
maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestFilterArtifacts.java
maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestGroupIdFilter.java
maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestScopeFilter.java
maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestTransitivityFilter.java
maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestTypeFilter.java
Modified: maven/shared/branches/maven-common-artifact-filters-brianf/pom.xml
URL:
http://svn.apache.org/viewvc/maven/shared/branches/maven-common-artifact-filters-brianf/pom.xml?rev=607992&r1=607991&r2=607992&view=diff
==============================================================================
--- maven/shared/branches/maven-common-artifact-filters-brianf/pom.xml
(original)
+++ maven/shared/branches/maven-common-artifact-filters-brianf/pom.xml Tue Jan
1 19:27:01 2008
@@ -1,49 +1,54 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0";
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-shared-components</artifactId>
- <version>7</version>
- </parent>
- <artifactId>maven-common-artifact-filters</artifactId>
- <version>1.0-alpha-2-SNAPSHOT</version>
- <name>Maven Common Artifact Filters</name>
- <prerequisites>
- <maven>2.0.2</maven>
- </prerequisites>
- <dependencies>
- <dependency>
- <groupId>org.apache.maven</groupId>
- <artifactId>maven-artifact</artifactId>
- <version>2.0.8-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.codehaus.plexus</groupId>
- <artifactId>plexus-container-default</artifactId>
- <version>1.0-alpha-9</version>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>3.8.1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.shared</groupId>
- <artifactId>maven-test-tools</artifactId>
- <version>1.0-alpha-1</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>easymock</groupId>
- <artifactId>easymock</artifactId>
- <version>1.2_Java1.3</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
- <scm>
-
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-common-artifact-filters</connection>
-
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-common-artifact-filters</developerConnection>
-
<url>http://svn.apache.org/viewcvs.cgi/maven/shared/trunk/maven-common-artifact-filters</url>
- </scm>
-</project>
+<?xml version="1.0" encoding="UTF-8"?><project>
+ <parent>
+ <artifactId>maven-shared-components</artifactId>
+ <groupId>org.apache.maven.shared</groupId>
+ <version>8</version>
+ </parent>
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>maven-common-artifact-filters</artifactId>
+ <name>Maven Common Artifact Filters</name>
+ <version>1.0-alpha-2-SNAPSHOT</version>
+ <prerequisites>
+ <maven>2.0.2</maven>
+ </prerequisites>
+ <scm>
+
<connection>scm:svn:http://svn.apache.org/repos/asf/maven/shared/trunk/maven-common-artifact-filters</connection>
+
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/maven/shared/trunk/maven-common-artifact-filters</developerConnection>
+
<url>http://svn.apache.org/viewcvs.cgi/maven/shared/trunk/maven-common-artifact-filters</url>
+ </scm>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-artifact</artifactId>
+ <version>2.0.8-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-container-default</artifactId>
+ <version>1.0-alpha-9</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>3.8.1</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-test-tools</artifactId>
+ <version>1.0-alpha-2</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>1.2_Java1.3</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven.shared</groupId>
+ <artifactId>maven-plugin-testing-harness</artifactId>
+ <version>1.1</version>
+ </dependency>
+ </dependencies>
+</project>
\ No newline at end of file
Modified:
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactFeatureFilter.java
URL:
http://svn.apache.org/viewvc/maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactFeatureFilter.java?rev=607992&r1=607985&r2=607992&view=diff
==============================================================================
---
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactFeatureFilter.java
(original)
+++
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactFeatureFilter.java
Tue Jan 1 19:27:01 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.dependency.utils.filters;
+package org.apache.maven.shared.artifact.filter.collection;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -26,17 +26,13 @@
import java.util.Set;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.plugin.logging.Log;
import org.codehaus.plexus.util.StringUtils;
/**
- * This is the common base class of ClassifierFilter and
- * TypeFilter
+ * This is the common base class of ClassifierFilter and TypeFilter
*
- * @author <a href="[EMAIL PROTECTED]">Richard van der
- * Hoff</a>
- * @version $Id: AbstractArtifactFeatureFilter.java 522374
- * 2007-03-25 22:58:03Z brianf $
+ * @author <a href="[EMAIL PROTECTED]">Richard van der Hoff</a>
+ * @version $Id$
*/
public abstract class AbstractArtifactFeatureFilter
extends AbstractArtifactsFilter
@@ -45,63 +41,33 @@
private List includes;
/**
- * The list of types or classifiers to exclude (ignored
- * if includes != null)
+ * The list of types or classifiers to exclude (ignored if includes !=
null)
*/
private List excludes;
- /**
- * The configuration string for the include list - comma
- * separated
- */
- private String includeString;
-
- /**
- * The configuration string for the exclude list - comma
- * separated
- */
- private String excludeString;
-
- /**
- * The name of the feature we are filtering on - for
- * logging - "Classifiers" or "Types"
- */
- private String featureName;
-
- public AbstractArtifactFeatureFilter( String include, String exclude,
String theFeatureName )
+ public AbstractArtifactFeatureFilter( String include, String exclude)
{
setExcludes( exclude );
setIncludes( include );
- featureName = theFeatureName;
}
/**
- * This function determines if filtering needs to be
- * performed. Includes are processed before Excludes.
- *
- * @param dependencies the set of dependencies to
- * filter.
+ * This function determines if filtering needs to be performed. Includes
are processed before Excludes.
*
+ * @param dependencies the set of dependencies to filter.
* @return a Set of filtered dependencies.
*/
- public Set filter( Set artifacts, Log log )
+ public Set filter( Set artifacts )
{
Set results = artifacts;
if ( this.includes != null && !this.includes.isEmpty() )
{
- int size = includes.size();
- log.debug( "Including only " + size + " " + featureName + ( ( size
> 1 ) ? "s" : "" ) + ": "
- + this.includeString );
-
results = filterIncludes( results, this.includes );
}
if ( this.excludes != null && !this.excludes.isEmpty() )
{
- int size = excludes.size();
- log.debug( "Excluding " + size + " " + featureName + ( ( size > 1
) ? "s" : "" ) + ": "
- + this.excludeString );
results = filterExcludes( results, this.excludes );
}
@@ -109,13 +75,10 @@
}
/**
- * Processes the dependencies list and includes the
- * dependencies that match a filter in the list.
+ * Processes the dependencies list and includes the dependencies that
match a filter in the list.
*
* @param depends List of dependencies.
- * @param includes List of types or classifiers to
- * include.
- *
+ * @param includes List of types or classifiers to include.
* @return a set of filtered artifacts.
*/
private Set filterIncludes( Set artifacts, List theIncludes )
@@ -145,13 +108,10 @@
}
/**
- * Processes the dependencies list and excludes the
- * dependencies that match a filter in the list.
+ * Processes the dependencies list and excludes the dependencies that
match a filter in the list.
*
* @param depends List of dependencies.
- * @param excludes List of types or classifiers to
- * exclude.
- *
+ * @param excludes List of types or classifiers to exclude.
* @return a set of filtered artifacts.
*/
private Set filterExcludes( Set artifacts, List theExcludes )
@@ -189,19 +149,15 @@
}
/**
- * Should return the type or classifier of the given
- * artifact, so that we can filter it
+ * Should return the type or classifier of the given artifact, so that we
can filter it
*
- * @param artifact artifact to return type or classifier
- * of
+ * @param artifact artifact to return type or classifier of
* @return type or classifier
*/
protected abstract String getArtifactFeature( Artifact artifact );
public void setExcludes( String excludeString )
{
- this.excludeString = excludeString;
-
if ( StringUtils.isNotEmpty( excludeString ) )
{
this.excludes = Arrays.asList( StringUtils.split( excludeString,
"," ) );
@@ -210,8 +166,6 @@
public void setIncludes( String includeString )
{
- this.includeString = includeString;
-
if ( StringUtils.isNotEmpty( includeString ) )
{
this.includes = Arrays.asList( StringUtils.split( includeString,
"," ) );
@@ -238,8 +192,7 @@
* Allows Feature comparison to be customized
*
* @param lhs String artifact's feature
- * @param rhs String feature from exclude or include
- * list
+ * @param rhs String feature from exclude or include list
* @return boolean true if features match
*/
protected boolean compareFeatures( String lhs, String rhs )
Modified:
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactsFilter.java
URL:
http://svn.apache.org/viewvc/maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactsFilter.java?rev=607992&r1=607985&r2=607992&view=diff
==============================================================================
---
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactsFilter.java
(original)
+++
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/AbstractArtifactsFilter.java
Tue Jan 1 19:27:01 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.dependency.utils.filters;
+package org.apache.maven.shared.artifact.filter.collection;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -23,8 +23,6 @@
import java.util.Set;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.logging.Log;
public abstract class AbstractArtifactsFilter
implements ArtifactsFilter
@@ -33,13 +31,13 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Brian Fox</a>
* @version $Id$
*/
- public boolean okToProcess( Artifact artifact, Log log )
- throws MojoExecutionException
+ public boolean okToProcess( Artifact artifact )
+ throws ArtifactFilterException
{
Set set = new HashSet();
set.add( artifact );
- set = filter( set, log );
+ set = filter( set );
return set.contains( artifact );
}
}
Modified:
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactIdFilter.java
URL:
http://svn.apache.org/viewvc/maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactIdFilter.java?rev=607992&r1=607985&r2=607992&view=diff
==============================================================================
---
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactIdFilter.java
(original)
+++
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactIdFilter.java
Tue Jan 1 19:27:01 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.dependency.utils.filters;
+package org.apache.maven.shared.artifact.filter.collection;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -40,7 +40,7 @@
*/
public ArtifactIdFilter( String include, String exclude )
{
- super( include, exclude, "ArtifactId" );
+ super( include, exclude);
}
/*
Modified:
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactsFilter.java
URL:
http://svn.apache.org/viewvc/maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactsFilter.java?rev=607992&r1=607985&r2=607992&view=diff
==============================================================================
---
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactsFilter.java
(original)
+++
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/ArtifactsFilter.java
Tue Jan 1 19:27:01 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.dependency.utils.filters;
+package org.apache.maven.shared.artifact.filter.collection;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -26,8 +26,6 @@
import java.util.Set;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.logging.Log;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Brian Fox</a>
@@ -35,9 +33,9 @@
*/
public interface ArtifactsFilter
{
- Set filter( Set artifacts, Log log )
- throws MojoExecutionException;
+ Set filter( Set artifacts )
+ throws ArtifactFilterException;
- boolean okToProcess( Artifact artifact, Log log )
- throws MojoExecutionException;
+ boolean okToProcess( Artifact artifact )
+ throws ArtifactFilterException;
}
Modified:
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/ClassifierFilter.java
URL:
http://svn.apache.org/viewvc/maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/ClassifierFilter.java?rev=607992&r1=607985&r2=607992&view=diff
==============================================================================
---
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/ClassifierFilter.java
(original)
+++
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/ClassifierFilter.java
Tue Jan 1 19:27:01 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.dependency.utils.filters;
+package org.apache.maven.shared.artifact.filter.collection;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -31,7 +31,7 @@
{
public ClassifierFilter( String include, String exclude )
{
- super( include, exclude, "Classifiers" );
+ super( include, exclude);
}
/*
Modified:
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/FilterArtifacts.java
URL:
http://svn.apache.org/viewvc/maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/FilterArtifacts.java?rev=607992&r1=607985&r2=607992&view=diff
==============================================================================
---
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/FilterArtifacts.java
(original)
+++
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/FilterArtifacts.java
Tue Jan 1 19:27:01 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.dependency.utils.filters;
+package org.apache.maven.shared.artifact.filter.collection;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -27,9 +27,6 @@
import java.util.Iterator;
import java.util.Set;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.logging.Log;
-
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Brian Fox</a>
* @version $Id$
@@ -44,8 +41,7 @@
}
/**
- * Removes all of the elements from this list. The list will be empty after
- * this call returns.
+ * Removes all of the elements from this list. The list will be empty
after this call returns.
*/
public void clearFilters()
{
@@ -55,8 +51,7 @@
/**
* Appends the specified element to the end of this list.
*
- * @param filter
- * element to be appended to this list.
+ * @param filter element to be appended to this list.
*/
public void addFilter( ArtifactsFilter filter )
{
@@ -67,17 +62,12 @@
}
/**
- * Inserts the specified element at the specified position in this list.
- * Shifts the element currently at that position (if any) and any
subsequent
- * elements to the right (adds one to their indices).
+ * Inserts the specified element at the specified position in this list.
Shifts the element currently at that
+ * position (if any) and any subsequent elements to the right (adds one to
their indices).
*
- * @param index
- * index at which the specified element is to be inserted.
- * @param element
- * element to be inserted.
- * @throws IndexOutOfBoundsException
- * if index is out of range
- * <tt>(index < 0 || index > size())</tt>.
+ * @param index index at which the specified element is to be inserted.
+ * @param element element to be inserted.
+ * @throws IndexOutOfBoundsException if index is out of range <tt>(index
< 0 || index > size())</tt>.
*/
public void addFilter( int index, ArtifactsFilter filter )
{
@@ -87,8 +77,8 @@
}
}
- public Set filter( Set artifacts, Log log )
- throws MojoExecutionException
+ public Set filter( Set artifacts )
+ throws ArtifactFilterException
{
// apply filters
Iterator filterIterator = filters.iterator();
@@ -98,7 +88,7 @@
ArtifactsFilter filter = (ArtifactsFilter) filterIterator.next();
try
{
- artifacts = filter.filter( artifacts, log );
+ artifacts = filter.filter( artifacts );
}
catch ( NullPointerException e )
{
@@ -119,8 +109,7 @@
}
/**
- * @param filters
- * The filters to set.
+ * @param filters The filters to set.
*/
public void setFilters( ArrayList filters )
{
Modified:
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/GroupIdFilter.java
URL:
http://svn.apache.org/viewvc/maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/GroupIdFilter.java?rev=607992&r1=607985&r2=607992&view=diff
==============================================================================
---
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/GroupIdFilter.java
(original)
+++
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/GroupIdFilter.java
Tue Jan 1 19:27:01 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.dependency.utils.filters;
+package org.apache.maven.shared.artifact.filter.collection;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -41,7 +41,7 @@
*/
public GroupIdFilter( String include, String exclude )
{
- super( include, exclude, "GroupId" );
+ super( include, exclude);
}
/*
Modified:
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/ScopeFilter.java
URL:
http://svn.apache.org/viewvc/maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/ScopeFilter.java?rev=607992&r1=607985&r2=607992&view=diff
==============================================================================
---
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/ScopeFilter.java
(original)
+++
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/ScopeFilter.java
Tue Jan 1 19:27:01 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.dependency.utils.filters;
+package org.apache.maven.shared.artifact.filter.collection;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -25,8 +25,6 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.logging.Log;
import org.codehaus.plexus.util.StringUtils;
/**
@@ -55,10 +53,10 @@
* the set of dependencies to filter.
*
* @return a Set of filtered dependencies.
- * @throws MojoExecutionException
+ * @throws ArtifactFilterException
*/
- public Set filter( Set artifacts, Log log )
- throws MojoExecutionException
+ public Set filter( Set artifacts)
+ throws ArtifactFilterException
{
Set results = artifacts;
@@ -68,7 +66,7 @@
&& !Artifact.SCOPE_PROVIDED.equals( includeScope ) &&
!Artifact.SCOPE_RUNTIME.equals( includeScope )
&& !Artifact.SCOPE_SYSTEM.equals( includeScope ) )
{
- throw new MojoExecutionException( "Invalid Scope in
includeScope: " + includeScope );
+ throw new ArtifactFilterException( "Invalid Scope in
includeScope: " + includeScope );
}
results = new HashSet();
@@ -98,7 +96,7 @@
&& !Artifact.SCOPE_PROVIDED.equals( excludeScope ) &&
!Artifact.SCOPE_RUNTIME.equals( excludeScope )
&& !Artifact.SCOPE_SYSTEM.equals( excludeScope ) )
{
- throw new MojoExecutionException( "Invalid Scope in
excludeScope: " + excludeScope );
+ throw new ArtifactFilterException( "Invalid Scope in
excludeScope: " + excludeScope );
}
results = new HashSet();
// plexus ScopeArtifactFilter doesn't handle the provided scope so
@@ -106,7 +104,7 @@
// need special handling for it.
if ( Artifact.SCOPE_TEST.equals( excludeScope ) )
{
- throw new MojoExecutionException( " Can't exclude Test scope,
this will exclude everything." );
+ throw new ArtifactFilterException( " Can't exclude Test scope,
this will exclude everything." );
}
else if ( !Artifact.SCOPE_PROVIDED.equals( excludeScope ) &&
!Artifact.SCOPE_SYSTEM.equals( excludeScope ) )
{
Modified:
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/TransitivityFilter.java
URL:
http://svn.apache.org/viewvc/maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/TransitivityFilter.java?rev=607992&r1=607985&r2=607992&view=diff
==============================================================================
---
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/TransitivityFilter.java
(original)
+++
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/TransitivityFilter.java
Tue Jan 1 19:27:01 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.dependency.utils.filters;
+package org.apache.maven.shared.artifact.filter.collection;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -24,7 +24,6 @@
import java.util.Set;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.plugin.logging.Log;
/**
* @author <a href="mailto:[EMAIL PROTECTED]">Brian Fox</a>
@@ -44,7 +43,7 @@
this.directDependencies = directDependencies;
}
- public Set filter( Set artifacts, Log log )
+ public Set filter( Set artifacts )
{
// why not just take the directDependencies here?
// because if this filter is run after some other process, the
@@ -53,7 +52,6 @@
if ( excludeTransitive )
{
- log.debug( "Excluding Transitive Dependencies." );
result = new HashSet();
Iterator iterator = artifacts.iterator();
while ( iterator.hasNext() )
@@ -62,25 +60,16 @@
if ( artifactIsADirectDependency( artifact ) )
{
result.add( artifact );
- log.debug( "Added: " + artifact );
}
}
- log.debug( "Added " + result.size() );
}
- else
- {
- log.debug( "Including Transitive Dependencies." );
- }
-
return result;
}
/**
- * Compares the artifact to the list of dependencies to see if it is
- * directly included by this project
+ * Compares the artifact to the list of dependencies to see if it is
directly included by this project
*
- * @param artifact
- * representing the item to compare.
+ * @param artifact representing the item to compare.
* @return true if artifact is a direct dependency
*/
public boolean artifactIsADirectDependency( Artifact artifact )
@@ -90,8 +79,8 @@
while ( iterator.hasNext() )
{
Artifact dependency = (Artifact) iterator.next();
- if ( dependency.getGroupId().equals( artifact.getGroupId() )
- && dependency.getArtifactId().equals( artifact.getArtifactId()
) )
+ if ( dependency.getGroupId().equals( artifact.getGroupId() ) &&
+ dependency.getArtifactId().equals( artifact.getArtifactId() ) )
{
result = true;
break;
@@ -109,8 +98,7 @@
}
/**
- * @param excludeTransitive
- * The excludeTransitive to set.
+ * @param excludeTransitive The excludeTransitive to set.
*/
public void setExcludeTransitive( boolean excludeTransitive )
{
Modified:
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/TypeFilter.java
URL:
http://svn.apache.org/viewvc/maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/TypeFilter.java?rev=607992&r1=607985&r2=607992&view=diff
==============================================================================
---
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/TypeFilter.java
(original)
+++
maven/shared/branches/maven-common-artifact-filters-brianf/src/main/java/org/apache/maven/shared/artifact/filter/collection/TypeFilter.java
Tue Jan 1 19:27:01 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.dependency.utils.filters;
+package org.apache.maven.shared.artifact.filter.collection;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -30,7 +30,7 @@
{
public TypeFilter( String include, String exclude )
{
- super( include, exclude, "Types" );
+ super( include, exclude);
}
/*
Modified:
maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestArtifactFilter.java
URL:
http://svn.apache.org/viewvc/maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestArtifactFilter.java?rev=607992&r1=607985&r2=607992&view=diff
==============================================================================
---
maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestArtifactFilter.java
(original)
+++
maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestArtifactFilter.java
Tue Jan 1 19:27:01 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.dependency.utils.filters;
+package org.apache.maven.shared.artifact.filter.collection;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -27,8 +27,7 @@
import java.util.Set;
import org.apache.maven.artifact.Artifact;
-import
org.apache.maven.plugin.dependency.testUtils.AbstractArtifactFeatureFilterTestCase;
-import
org.apache.maven.plugin.dependency.testUtils.DependencyArtifactStubFactory;
+import org.apache.maven.plugin.testing.ArtifactStubFactory;
/**
* @author clove TestCases for ArtifactFilter
@@ -43,7 +42,7 @@
{
super.setUp();
filterClass = ArtifactIdFilter.class;
- DependencyArtifactStubFactory factory = new
DependencyArtifactStubFactory( null, false );
+ ArtifactStubFactory factory = new ArtifactStubFactory( null, false );
artifacts = factory.getArtifactArtifacts();
}
@@ -61,7 +60,7 @@
while ( iter.hasNext() )
{
Artifact artifact = (Artifact) iter.next();
- assertTrue( artifact.getArtifactId().equals( "two" ));
+ assertTrue( artifact.getArtifactId().equals( "two" ) );
}
}
Modified:
maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestClassifierFilter.java
URL:
http://svn.apache.org/viewvc/maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestClassifierFilter.java?rev=607992&r1=607985&r2=607992&view=diff
==============================================================================
---
maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestClassifierFilter.java
(original)
+++
maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestClassifierFilter.java
Tue Jan 1 19:27:01 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.dependency.utils.filters;
+package org.apache.maven.shared.artifact.filter.collection;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -27,13 +27,11 @@
import java.util.Set;
import org.apache.maven.artifact.Artifact;
-import
org.apache.maven.plugin.dependency.testUtils.AbstractArtifactFeatureFilterTestCase;
-import
org.apache.maven.plugin.dependency.testUtils.DependencyArtifactStubFactory;
+import org.apache.maven.plugin.testing.ArtifactStubFactory;
/**
- * @author brianf Test case for ClassifierFilter
+ * @author <a href="mailto:[EMAIL PROTECTED]">Brian Fox</a> Test case for
ClassifierFilter
* @see
org.apache.maven.plugin.dependency.testUtils.AbstractArtifactFeatureFilterTestCase
- *
*/
public class TestClassifierFilter
extends AbstractArtifactFeatureFilterTestCase
@@ -44,7 +42,7 @@
{
super.setUp();
filterClass = ClassifierFilter.class;
- DependencyArtifactStubFactory factory = new
DependencyArtifactStubFactory( null, false );
+ ArtifactStubFactory factory = new ArtifactStubFactory( null, false );
artifacts = factory.getClassifiedArtifacts();
}
Modified:
maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestFilterArtifacts.java
URL:
http://svn.apache.org/viewvc/maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestFilterArtifacts.java?rev=607992&r1=607985&r2=607992&view=diff
==============================================================================
---
maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestFilterArtifacts.java
(original)
+++
maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestFilterArtifacts.java
Tue Jan 1 19:27:01 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.dependency.utils.filters;
+package org.apache.maven.shared.artifact.filter.collection;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -30,20 +30,15 @@
import junit.framework.TestCase;
-import org.apache.maven.plugin.MojoExecutionException;
-import
org.apache.maven.plugin.dependency.testUtils.DependencyArtifactStubFactory;
-import org.apache.maven.plugin.dependency.testUtils.DependencyTestUtils;
-import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.plugin.testing.SilentLog;
+import org.apache.maven.plugin.testing.ArtifactStubFactory;
+import org.codehaus.plexus.util.FileUtils;
/**
- * @author brianf
- *
+ * @author <a href="mailto:[EMAIL PROTECTED]">Brian Fox</a>
*/
public class TestFilterArtifacts
extends TestCase
{
- Log log = new SilentLog();
protected void setUp()
throws Exception
@@ -52,23 +47,25 @@
}
public void testNullFilters()
- throws IOException, MojoExecutionException
+ throws IOException, ArtifactFilterException
+
{
// TODO: convert these old tests to use the abstract test case for dep
// plugin
- File outputFolder = outputFolder = new File( "target/filters/" );
- DependencyTestUtils.removeDirectory( outputFolder );
+ File outputFolder = new File( "target/filters/" );
+
+ FileUtils.deleteDirectory( outputFolder );
- DependencyArtifactStubFactory fact = new
DependencyArtifactStubFactory( outputFolder, false );
+ ArtifactStubFactory fact = new ArtifactStubFactory( outputFolder,
false );
Set artifacts = fact.getReleaseAndSnapshotArtifacts();
FilterArtifacts fa = new FilterArtifacts();
- fa.filter( artifacts, log );
+ fa.filter( artifacts );
// make sure null filters don't hurt anything.
fa.addFilter( null );
- fa.filter( artifacts, log );
+ fa.filter( artifacts );
assertEquals( 0, fa.getFilters().size() );
ArrayList filters = new ArrayList();
@@ -78,7 +75,7 @@
assertEquals( 2, fa.getFilters().size() );
- fa.filter( artifacts, log );
+ fa.filter( artifacts );
}
public void testArtifactFilter()
Modified:
maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestGroupIdFilter.java
URL:
http://svn.apache.org/viewvc/maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestGroupIdFilter.java?rev=607992&r1=607985&r2=607992&view=diff
==============================================================================
---
maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestGroupIdFilter.java
(original)
+++
maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestGroupIdFilter.java
Tue Jan 1 19:27:01 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.dependency.utils.filters;
+package org.apache.maven.shared.artifact.filter.collection;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -28,15 +28,11 @@
import java.util.Set;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.plugin.MojoExecutionException;
-import
org.apache.maven.plugin.dependency.testUtils.AbstractArtifactFeatureFilterTestCase;
-import
org.apache.maven.plugin.dependency.testUtils.DependencyArtifactStubFactory;
-import org.apache.maven.plugin.testing.SilentLog;
+import org.apache.maven.plugin.testing.ArtifactStubFactory;
/**
* @author clove TestCases for GroupIdFilter
* @see
org.apache.maven.plugin.dependency.testUtils.AbstractArtifactFeatureFilterTestCase
- *
*/
public class TestGroupIdFilter
extends AbstractArtifactFeatureFilterTestCase
@@ -47,7 +43,7 @@
{
super.setUp();
filterClass = GroupIdFilter.class;
- DependencyArtifactStubFactory factory = new
DependencyArtifactStubFactory( null, false );
+ ArtifactStubFactory factory = new ArtifactStubFactory( null, false );
artifacts = factory.getGroupIdArtifacts();
}
@@ -91,12 +87,11 @@
public void testFiltering4()
throws Exception
{
- SilentLog log = new SilentLog();
// include o* from groupIds one,two should leave one
Set result = filtering();
- assertEquals( 1, result.size());
+ assertEquals( 1, result.size() );
GroupIdFilter filter = new GroupIdFilter( "o", null );
- result = filter.filter( result, log );
+ result = filter.filter( result );
Iterator iter = result.iterator();
while ( iter.hasNext() )
{
@@ -107,9 +102,9 @@
// exclude on* from groupIds one,two should leave two
result = filtering();
- assertEquals(1, result.size());
+ assertEquals( 1, result.size() );
filter = new GroupIdFilter( null, "on" );
- result = filter.filter( result, log );
+ result = filter.filter( result );
iter = result.iterator();
while ( iter.hasNext() )
{
@@ -118,26 +113,30 @@
}
}
-
- public void testMultipleInclude() throws SecurityException,
IllegalArgumentException, NoSuchMethodException, InstantiationException,
IllegalAccessException, InvocationTargetException, MojoExecutionException
+
+ public void testMultipleInclude()
+ throws SecurityException, IllegalArgumentException,
NoSuchMethodException, InstantiationException,
+ IllegalAccessException, InvocationTargetException,
ArtifactFilterException
{
- ArtifactsFilter filter = new GroupIdFilter("one,two",null);
-
- assertEquals( 4, artifacts.size() );
-
- Set result = filter.filter( artifacts, new SilentLog() );
-
- assertEquals( 2, result.size() );
- }
-
- public void testMultipleExclude() throws SecurityException,
IllegalArgumentException, NoSuchMethodException, InstantiationException,
IllegalAccessException, InvocationTargetException, MojoExecutionException
- {
- ArtifactsFilter filter = new GroupIdFilter(null,"one,two");
-
- assertEquals( 4, artifacts.size() );
-
- Set result = filter.filter( artifacts, new SilentLog() );
-
- assertEquals( 2, result.size() );
+ ArtifactsFilter filter = new GroupIdFilter( "one,two", null );
+
+ assertEquals( 4, artifacts.size() );
+
+ Set result = filter.filter( artifacts );
+
+ assertEquals( 2, result.size() );
+ }
+
+ public void testMultipleExclude()
+ throws SecurityException, IllegalArgumentException,
NoSuchMethodException, InstantiationException,
+ IllegalAccessException, InvocationTargetException,
ArtifactFilterException
+ {
+ ArtifactsFilter filter = new GroupIdFilter( null, "one,two" );
+
+ assertEquals( 4, artifacts.size() );
+
+ Set result = filter.filter( artifacts );
+
+ assertEquals( 2, result.size() );
}
}
Modified:
maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestScopeFilter.java
URL:
http://svn.apache.org/viewvc/maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestScopeFilter.java?rev=607992&r1=607985&r2=607992&view=diff
==============================================================================
---
maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestScopeFilter.java
(original)
+++
maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestScopeFilter.java
Tue Jan 1 19:27:01 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.dependency.utils.filters;
+package org.apache.maven.shared.artifact.filter.collection;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -29,14 +29,12 @@
import junit.framework.TestCase;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.plugin.MojoExecutionException;
-import
org.apache.maven.plugin.dependency.testUtils.DependencyArtifactStubFactory;
import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.plugin.testing.ArtifactStubFactory;
import org.apache.maven.plugin.testing.SilentLog;
/**
- * @author brianf
- *
+ * @author <a href="mailto:[EMAIL PROTECTED]">Brian Fox</a>
*/
public class TestScopeFilter
extends TestCase
@@ -50,45 +48,45 @@
{
super.setUp();
- DependencyArtifactStubFactory factory = new
DependencyArtifactStubFactory( null, false );
+ ArtifactStubFactory factory = new ArtifactStubFactory( null, false );
artifacts = factory.getScopedArtifacts();
}
public void testScopeCompile()
- throws MojoExecutionException
+ throws ArtifactFilterException
{
ScopeFilter filter = new ScopeFilter( Artifact.SCOPE_COMPILE, null );
Set result;
- result = filter.filter( artifacts, log );
+ result = filter.filter( artifacts );
assertEquals( 3, result.size() );
}
public void testScopeRuntime()
- throws MojoExecutionException
+ throws ArtifactFilterException
{
ScopeFilter filter = new ScopeFilter( Artifact.SCOPE_RUNTIME, null );
Set result;
- result = filter.filter( artifacts, log );
+ result = filter.filter( artifacts );
assertEquals( 2, result.size() );
}
public void testScopeTest()
- throws MojoExecutionException
+ throws ArtifactFilterException
{
ScopeFilter filter = new ScopeFilter( Artifact.SCOPE_TEST, null );
- Set result = filter.filter( artifacts, log );
+ Set result = filter.filter( artifacts );
assertEquals( 5, result.size() );
}
public void testScopeProvided()
- throws MojoExecutionException
+ throws ArtifactFilterException
{
ScopeFilter filter = new ScopeFilter( Artifact.SCOPE_PROVIDED, null );
- Set result = filter.filter( artifacts, log );
+ Set result = filter.filter( artifacts );
Iterator iter = result.iterator();
assertTrue( result.size() > 0 );
while ( iter.hasNext() )
@@ -99,11 +97,11 @@
}
public void testScopeSystem()
- throws MojoExecutionException
+ throws ArtifactFilterException
{
ScopeFilter filter = new ScopeFilter( Artifact.SCOPE_SYSTEM, null );
- Set result = filter.filter( artifacts, log );
+ Set result = filter.filter( artifacts );
Iterator iter = result.iterator();
assertTrue( result.size() > 0 );
while ( iter.hasNext() )
@@ -114,26 +112,26 @@
}
public void testScopeFilterNull()
- throws MojoExecutionException
+ throws ArtifactFilterException
{
ScopeFilter filter = new ScopeFilter( null, null );
- Set result = filter.filter( artifacts, log );
+ Set result = filter.filter( artifacts );
assertEquals( 5, result.size() );
}
public void testScopeFilterEmpty()
- throws MojoExecutionException
+ throws ArtifactFilterException
{
ScopeFilter filter = new ScopeFilter( "", "" );
- Set result = filter.filter( artifacts, log );
+ Set result = filter.filter( artifacts );
assertEquals( 5, result.size() );
}
public void testExcludeProvided()
- throws MojoExecutionException
+ throws ArtifactFilterException
{
ScopeFilter filter = new ScopeFilter( "", Artifact.SCOPE_PROVIDED );
- Set result = filter.filter( artifacts, log );
+ Set result = filter.filter( artifacts );
assertNotNull( result );
assertTrue( result.size() > 0 );
Iterator iter = result.iterator();
@@ -147,10 +145,10 @@
}
public void testExcludeSystem()
- throws MojoExecutionException
+ throws ArtifactFilterException
{
ScopeFilter filter = new ScopeFilter( "", Artifact.SCOPE_SYSTEM );
- Set result = filter.filter( artifacts, log );
+ Set result = filter.filter( artifacts );
Iterator iter = result.iterator();
assertNotNull( result );
assertTrue( result.size() > 0 );
@@ -162,10 +160,10 @@
}
public void testExcludeCompile()
- throws MojoExecutionException
+ throws ArtifactFilterException
{
ScopeFilter filter = new ScopeFilter( "", Artifact.SCOPE_COMPILE );
- Set result = filter.filter( artifacts, log );
+ Set result = filter.filter( artifacts );
assertEquals( 2, result.size() );
}
@@ -174,10 +172,10 @@
try
{
ScopeFilter filter = new ScopeFilter( "", Artifact.SCOPE_TEST );
- filter.filter( artifacts, log );
+ filter.filter( artifacts );
fail( "Expected an Exception" );
}
- catch ( MojoExecutionException e )
+ catch ( ArtifactFilterException e )
{
}
@@ -188,20 +186,20 @@
ScopeFilter filter = new ScopeFilter( "cOmpile", "" );
try
{
- filter.filter( artifacts, log );
+ filter.filter( artifacts );
fail( "Expected an Exception" );
}
- catch ( MojoExecutionException e )
+ catch ( ArtifactFilterException e )
{
}
try
{
filter = new ScopeFilter( "", "coMpile" );
- filter.filter( artifacts, log );
+ filter.filter( artifacts );
fail( "Expected an Exception" );
}
- catch ( MojoExecutionException e )
+ catch ( ArtifactFilterException e )
{
}
Modified:
maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestTransitivityFilter.java
URL:
http://svn.apache.org/viewvc/maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestTransitivityFilter.java?rev=607992&r1=607985&r2=607992&view=diff
==============================================================================
---
maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestTransitivityFilter.java
(original)
+++
maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestTransitivityFilter.java
Tue Jan 1 19:27:01 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.dependency.utils.filters;
+package org.apache.maven.shared.artifact.filter.collection;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -29,13 +29,10 @@
import junit.framework.TestCase;
import org.apache.maven.artifact.Artifact;
-import
org.apache.maven.plugin.dependency.testUtils.DependencyArtifactStubFactory;
-import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.plugin.testing.SilentLog;
+import org.apache.maven.plugin.testing.ArtifactStubFactory;
/**
- * @author brianf
- *
+ * @author <a href="mailto:[EMAIL PROTECTED]">Brian Fox</a>
*/
public class TestTransitivityFilter
extends TestCase
@@ -44,14 +41,12 @@
Set directArtifacts = new HashSet();
- Log log = new SilentLog();
-
protected void setUp()
throws Exception
{
super.setUp();
- DependencyArtifactStubFactory fact = new
DependencyArtifactStubFactory( null, false );
+ ArtifactStubFactory fact = new ArtifactStubFactory( null, false );
artifacts = fact.getScopedArtifacts();
directArtifacts = fact.getReleaseAndSnapshotArtifacts();
@@ -63,7 +58,7 @@
{
TransitivityFilter filter = new TransitivityFilter( directArtifacts,
false );
- Set result = filter.filter( artifacts, log );
+ Set result = filter.filter( artifacts );
assertEquals( 7, result.size() );
}
@@ -74,7 +69,7 @@
assertFalse( filter.isExcludeTransitive() );
filter.setExcludeTransitive( true );
assertTrue( filter.isExcludeTransitive() );
- Set result = filter.filter( artifacts, log );
+ Set result = filter.filter( artifacts );
assertEquals( 2, result.size() );
Modified:
maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestTypeFilter.java
URL:
http://svn.apache.org/viewvc/maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestTypeFilter.java?rev=607992&r1=607985&r2=607992&view=diff
==============================================================================
---
maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestTypeFilter.java
(original)
+++
maven/shared/branches/maven-common-artifact-filters-brianf/src/test/java/org/apache/maven/shared/artifact/filter/collection/TestTypeFilter.java
Tue Jan 1 19:27:01 2008
@@ -1,4 +1,4 @@
-package org.apache.maven.plugin.dependency.utils.filters;
+package org.apache.maven.shared.artifact.filter.collection;
/*
* Licensed to the Apache Software Foundation (ASF) under one
@@ -30,27 +30,22 @@
import junit.framework.TestCase;
import org.apache.maven.artifact.Artifact;
-import
org.apache.maven.plugin.dependency.testUtils.DependencyArtifactStubFactory;
-import org.apache.maven.plugin.logging.Log;
-import org.apache.maven.plugin.testing.SilentLog;
+import org.apache.maven.plugin.testing.ArtifactStubFactory;
/**
- * @author brianf
- *
+ * @author <a href="mailto:[EMAIL PROTECTED]">Brian Fox</a>
*/
public class TestTypeFilter
extends TestCase
{
Set artifacts = new HashSet();
- Log log = new SilentLog();
-
protected void setUp()
throws Exception
{
super.setUp();
- DependencyArtifactStubFactory factory = new
DependencyArtifactStubFactory( null, false );
+ ArtifactStubFactory factory = new ArtifactStubFactory( null, false );
artifacts = factory.getTypedArtifacts();
}
@@ -71,7 +66,7 @@
public void testFiltering()
{
TypeFilter filter = new TypeFilter( "war,jar", "war,zip," );
- Set result = filter.filter( artifacts, log );
+ Set result = filter.filter( artifacts );
assertEquals( 1, result.size() );
Iterator iter = result.iterator();
@@ -85,7 +80,7 @@
public void testFiltering2()
{
TypeFilter filter = new TypeFilter( null, "war,jar," );
- Set result = filter.filter( artifacts, log );
+ Set result = filter.filter( artifacts );
assertEquals( 3, result.size() );
Iterator iter = result.iterator();
@@ -99,7 +94,7 @@
public void testFiltering3()
{
TypeFilter filter = new TypeFilter( null, null );
- Set result = filter.filter( artifacts, log );
+ Set result = filter.filter( artifacts );
assertEquals( 5, result.size() );
}
}
