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 2008/01/02 05:03:59 UTC
svn commit: r607998 - in /maven/plugins/trunk/maven-dependency-plugin/src:
main/java/org/apache/maven/plugin/dependency/
main/java/org/apache/maven/plugin/dependency/fromConfiguration/
main/java/org/apache/maven/plugin/dependency/resolvers/ main/java/o...
Author: brianf
Date: Tue Jan 1 20:03:57 2008
New Revision: 607998
URL: http://svn.apache.org/viewvc?rev=607998&view=rev
Log:
Updated to use the filters that where moved to maven-common-artifact-filters
Removed:
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/testUtils/AbstractArtifactFeatureFilterTestCase.java
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDepMgt.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/BuildClasspathMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/CopyDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/GoOfflineMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependencySourcesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/ArtifactItemFilter.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/DestFileFilter.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/MarkerFileFilter.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/ResolveFileFilter.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestCopyDependenciesMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestIncludeExcludeUnpackMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/its/AbstractDependencyPluginITCase.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestDestFileFilter.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestMarkerFileFilter.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestResolveMarkerFileFilter.java
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java?rev=607998&r1=607997&r2=607998&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AbstractDependencyFilterMojo.java Tue Jan 1 20:03:57 2008
@@ -25,18 +25,19 @@
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.dependency.utils.DependencyStatusSets;
-import org.apache.maven.plugin.dependency.utils.filters.ArtifactIdFilter;
-import org.apache.maven.plugin.dependency.utils.filters.ArtifactsFilter;
-import org.apache.maven.plugin.dependency.utils.filters.ClassifierFilter;
-import org.apache.maven.plugin.dependency.utils.filters.FilterArtifacts;
-import org.apache.maven.plugin.dependency.utils.filters.GroupIdFilter;
-import org.apache.maven.plugin.dependency.utils.filters.ScopeFilter;
-import org.apache.maven.plugin.dependency.utils.filters.TransitivityFilter;
-import org.apache.maven.plugin.dependency.utils.filters.TypeFilter;
import org.apache.maven.plugin.dependency.utils.resolvers.ArtifactsResolver;
import org.apache.maven.plugin.dependency.utils.resolvers.DefaultArtifactsResolver;
import org.apache.maven.plugin.dependency.utils.translators.ArtifactTranslator;
import org.apache.maven.plugin.dependency.utils.translators.ClassifierTypeTranslator;
+import org.apache.maven.shared.artifact.filter.collection.ArtifactFilterException;
+import org.apache.maven.shared.artifact.filter.collection.ArtifactIdFilter;
+import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter;
+import org.apache.maven.shared.artifact.filter.collection.ClassifierFilter;
+import org.apache.maven.shared.artifact.filter.collection.FilterArtifacts;
+import org.apache.maven.shared.artifact.filter.collection.GroupIdFilter;
+import org.apache.maven.shared.artifact.filter.collection.ScopeFilter;
+import org.apache.maven.shared.artifact.filter.collection.TransitivityFilter;
+import org.apache.maven.shared.artifact.filter.collection.TypeFilter;
import org.codehaus.plexus.util.StringUtils;
/**
@@ -215,11 +216,10 @@
* Retrieves dependencies, either direct only or all including transitive.
*
* @return A HashSet of artifacts
- * @throws MojoExecutionException
- * if an error occured.
+ * @throws MojoExecutionException
*/
- protected Set getResolvedDependencies( boolean stopOnFailure )
- throws MojoExecutionException
+ protected Set getResolvedDependencies( boolean stopOnFailure )throws MojoExecutionException
+
{
DependencyStatusSets status = getDependencySets( stopOnFailure );
@@ -235,7 +235,7 @@
* @param stopOnFailure
* @return DependencyStatusSets - Bean of TreeSets that contains information
* on the projects dependencies
- * @throws MojoExecutionException
+ * @throws MojoExecutionException
*/
protected DependencyStatusSets getDependencySets( boolean stopOnFailure )
throws MojoExecutionException
@@ -254,7 +254,14 @@
Set artifacts = project.getArtifacts();
// perform filtering
- artifacts = filter.filter( artifacts, getLog() );
+ try
+ {
+ artifacts = filter.filter( artifacts );
+ }
+ catch ( ArtifactFilterException e )
+ {
+ throw new MojoExecutionException(e.getMessage(),e);
+ }
// transform artifacts if classifier is set
DependencyStatusSets status = null;
@@ -332,7 +339,15 @@
filter.clearFilters();
filter.addFilter( getMarkedArtifactFilter() );
- Set unMarkedArtifacts = filter.filter( artifacts, getLog() );
+ Set unMarkedArtifacts;
+ try
+ {
+ unMarkedArtifacts = filter.filter( artifacts );
+ }
+ catch ( ArtifactFilterException e )
+ {
+ throw new MojoExecutionException(e.getMessage(),e);
+ }
// calculate the skipped artifacts
Set skippedArtifacts = new HashSet();
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDepMgt.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDepMgt.java?rev=607998&r1=607997&r2=607998&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDepMgt.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/AnalyzeDepMgt.java Tue Jan 1 20:03:57 2008
@@ -28,8 +28,6 @@
import java.util.Set;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.versioning.ArtifactVersion;
-import org.apache.maven.artifact.versioning.DefaultArtifactVersion;
import org.apache.maven.model.Dependency;
import org.apache.maven.model.DependencyManagement;
import org.apache.maven.model.Exclusion;
@@ -274,8 +272,7 @@
Dependency depFromDepMgt = (Dependency) depMgtMap.get( getArtifactManagementKey( dependencyArtifact ) );
if ( depFromDepMgt != null )
{
- ArtifactVersion artifactVersion = new DefaultArtifactVersion( dependencyArtifact.getVersion() );
-
+
//workaround for MNG-2961
dependencyArtifact.isSnapshot();
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/BuildClasspathMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/BuildClasspathMojo.java?rev=607998&r1=607997&r2=607998&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/BuildClasspathMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/BuildClasspathMojo.java Tue Jan 1 20:03:57 2008
@@ -35,7 +35,7 @@
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.dependency.utils.DependencyUtil;
-import org.apache.maven.plugin.dependency.utils.filters.ArtifactsFilter;
+import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter;
import org.codehaus.plexus.util.StringUtils;
/**
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/CopyDependenciesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/CopyDependenciesMojo.java?rev=607998&r1=607997&r2=607998&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/CopyDependenciesMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/CopyDependenciesMojo.java Tue Jan 1 20:03:57 2008
@@ -19,17 +19,17 @@
* under the License.
*/
+import java.io.File;
+import java.util.Iterator;
+import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.dependency.utils.DependencyStatusSets;
import org.apache.maven.plugin.dependency.utils.DependencyUtil;
-import org.apache.maven.plugin.dependency.utils.filters.ArtifactsFilter;
import org.apache.maven.plugin.dependency.utils.filters.DestFileFilter;
import org.apache.maven.plugin.logging.Log;
-
-import java.io.File;
-import java.util.Iterator;
-import java.util.Set;
+import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter;
/**
* Goal that copies the project dependencies from the repository to a defined
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java?rev=607998&r1=607997&r2=607998&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/UnpackDependenciesMojo.java Tue Jan 1 20:03:57 2008
@@ -27,9 +27,11 @@
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.dependency.utils.DependencyStatusSets;
import org.apache.maven.plugin.dependency.utils.DependencyUtil;
-import org.apache.maven.plugin.dependency.utils.filters.ArtifactsFilter;
import org.apache.maven.plugin.dependency.utils.filters.MarkerFileFilter;
import org.apache.maven.plugin.dependency.utils.markers.DefaultFileMarkerHandler;
+import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter;
+import org.codehaus.plexus.archiver.manager.ArchiverManager;
/**
* Goal that unpacks the project dependencies from the repository to a defined
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java?rev=607998&r1=607997&r2=607998&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.java Tue Jan 1 20:03:57 2008
@@ -21,24 +21,20 @@
import java.io.File;
import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
import java.util.Iterator;
import java.util.List;
-import java.util.Map;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.artifact.factory.ArtifactFactory;
import org.apache.maven.artifact.resolver.ArtifactNotFoundException;
import org.apache.maven.artifact.resolver.ArtifactResolutionException;
import org.apache.maven.artifact.versioning.InvalidVersionSpecificationException;
import org.apache.maven.artifact.versioning.VersionRange;
import org.apache.maven.model.Dependency;
-import org.apache.maven.model.DependencyManagement;
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.dependency.AbstractDependencyMojo;
import org.apache.maven.plugin.dependency.utils.DependencyUtil;
import org.apache.maven.plugin.dependency.utils.filters.ArtifactItemFilter;
+import org.apache.maven.shared.artifact.filter.collection.ArtifactFilterException;
import org.codehaus.plexus.util.StringUtils;
/**
@@ -152,13 +148,20 @@
removeVersion ) );
}
- artifactItem.setNeedsProcessing( checkIfProcessingNeeded( artifactItem ) );
+ try
+ {
+ artifactItem.setNeedsProcessing( checkIfProcessingNeeded( artifactItem ) );
+ }
+ catch ( ArtifactFilterException e )
+ {
+ throw new MojoExecutionException (e.getMessage(),e);
+ }
}
return artifactItems;
}
private boolean checkIfProcessingNeeded( ArtifactItem item )
- throws MojoExecutionException
+ throws MojoExecutionException, ArtifactFilterException
{
boolean result = false;
if ( StringUtils.equalsIgnoreCase( item.getOverWrite(), "true" ) )
@@ -168,7 +171,7 @@
else
{
ArtifactItemFilter filter = getMarkedArtifactFilter( item );
- result = filter.okToProcess( item );
+ result = filter.isArtifactIncluded( item );
}
return result;
}
@@ -310,7 +313,7 @@
return result;
}
- private Map createManagedVersionMap( ArtifactFactory artifactFactory, String projectId,
+ /* private Map createManagedVersionMap( ArtifactFactory artifactFactory, String projectId,
DependencyManagement dependencyManagement )
throws MojoExecutionException
{
@@ -342,7 +345,7 @@
map = Collections.EMPTY_MAP;
}
return map;
- }
+ }*/
/**
* @return Returns the artifactItems.
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/GoOfflineMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/GoOfflineMojo.java?rev=607998&r1=607997&r2=607998&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/GoOfflineMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/GoOfflineMojo.java Tue Jan 1 20:03:57 2008
@@ -26,7 +26,7 @@
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.dependency.AbstractResolveMojo;
import org.apache.maven.plugin.dependency.utils.DependencyUtil;
-import org.apache.maven.plugin.dependency.utils.filters.ArtifactsFilter;
+import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter;
/**
* Goal that resolves all project dependencies, including plugins and reports
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java?rev=607998&r1=607997&r2=607998&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependenciesMojo.java Tue Jan 1 20:03:57 2008
@@ -22,9 +22,9 @@
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.dependency.AbstractResolveMojo;
import org.apache.maven.plugin.dependency.utils.DependencyStatusSets;
-import org.apache.maven.plugin.dependency.utils.filters.ArtifactsFilter;
import org.apache.maven.plugin.dependency.utils.filters.ResolveFileFilter;
import org.apache.maven.plugin.dependency.utils.markers.SourcesFileMarkerHandler;
+import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter;
/**
* Goal that resolves the project dependencies from the repository.
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependencySourcesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependencySourcesMojo.java?rev=607998&r1=607997&r2=607998&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependencySourcesMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolveDependencySourcesMojo.java Tue Jan 1 20:03:57 2008
@@ -25,9 +25,9 @@
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.dependency.AbstractResolveMojo;
import org.apache.maven.plugin.dependency.utils.DependencyStatusSets;
-import org.apache.maven.plugin.dependency.utils.filters.ArtifactsFilter;
import org.apache.maven.plugin.dependency.utils.filters.ResolveFileFilter;
import org.apache.maven.plugin.dependency.utils.markers.SourcesFileMarkerHandler;
+import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter;
/**
* Goal that resolves the project source dependencies from the repository.
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java?rev=607998&r1=607997&r2=607998&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/resolvers/ResolvePluginsMojo.java Tue Jan 1 20:03:57 2008
@@ -30,9 +30,9 @@
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.dependency.AbstractResolveMojo;
import org.apache.maven.plugin.dependency.utils.DependencyUtil;
-import org.apache.maven.plugin.dependency.utils.filters.ArtifactsFilter;
import org.apache.maven.project.ProjectBuildingException;
import org.apache.maven.project.artifact.InvalidDependencyVersionException;
+import org.apache.maven.shared.artifact.filter.collection.ArtifactsFilter;
/**
* Goal that resolves all project plugins and reports and their dependencies.
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/ArtifactItemFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/ArtifactItemFilter.java?rev=607998&r1=607997&r2=607998&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/ArtifactItemFilter.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/ArtifactItemFilter.java Tue Jan 1 20:03:57 2008
@@ -23,8 +23,8 @@
*
*/
-import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.dependency.fromConfiguration.ArtifactItem;
+import org.apache.maven.shared.artifact.filter.collection.ArtifactFilterException;
/**
* @author <a href="mailto:brianf@apache.org">Brian Fox</a>
@@ -33,6 +33,6 @@
public interface ArtifactItemFilter
{
- boolean okToProcess( ArtifactItem item )
- throws MojoExecutionException;
+ boolean isArtifactIncluded( ArtifactItem item )
+ throws ArtifactFilterException;
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/DestFileFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/DestFileFilter.java?rev=607998&r1=607997&r2=607998&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/DestFileFilter.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/DestFileFilter.java Tue Jan 1 20:03:57 2008
@@ -29,10 +29,10 @@
import java.util.Set;
import org.apache.maven.artifact.Artifact;
-import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.dependency.fromConfiguration.ArtifactItem;
import org.apache.maven.plugin.dependency.utils.DependencyUtil;
-import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.shared.artifact.filter.collection.AbstractArtifactsFilter;
+import org.apache.maven.shared.artifact.filter.collection.ArtifactFilterException;
import org.codehaus.plexus.util.StringUtils;
/**
@@ -91,17 +91,17 @@
* @see org.apache.mojo.dependency.utils.filters.ArtifactsFilter#filter(java.util.Set,
* org.apache.maven.plugin.logging.Log)
*/
- public Set filter( Set artifacts, Log log )
- throws MojoExecutionException
+ public Set filter( Set artifacts )
+ throws ArtifactFilterException
{
Set result = new HashSet();
Iterator iter = artifacts.iterator();
- // log.debug("Artifacts:"+ artifacts.size());
+
while ( iter.hasNext() )
{
Artifact artifact = (Artifact) iter.next();
- if ( okToProcess( new ArtifactItem( artifact ) ) )
+ if ( isArtifactIncluded( new ArtifactItem( artifact ) ) )
{
result.add( artifact );
}
@@ -247,8 +247,7 @@
this.useRepositoryLayout = useRepositoryLayout;
}
- public boolean okToProcess( ArtifactItem item )
- throws MojoExecutionException
+ public boolean isArtifactIncluded( ArtifactItem item )
{
boolean overWrite = false;
boolean result = false;
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/MarkerFileFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/MarkerFileFilter.java?rev=607998&r1=607997&r2=607998&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/MarkerFileFilter.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/MarkerFileFilter.java Tue Jan 1 20:03:57 2008
@@ -31,7 +31,8 @@
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.dependency.fromConfiguration.ArtifactItem;
import org.apache.maven.plugin.dependency.utils.markers.MarkerHandler;
-import org.apache.maven.plugin.logging.Log;
+import org.apache.maven.shared.artifact.filter.collection.AbstractArtifactsFilter;
+import org.apache.maven.shared.artifact.filter.collection.ArtifactFilterException;
/**
* @author <a href="mailto:brianf@apache.org">Brian Fox</a>
@@ -65,17 +66,17 @@
* @see org.apache.mojo.dependency.utils.filters.ArtifactsFilter#filter(java.util.Set,
* org.apache.maven.plugin.logging.Log)
*/
- public Set filter( Set artifacts, Log log )
- throws MojoExecutionException
+ public Set filter( Set artifacts )
+ throws ArtifactFilterException
{
Set result = new HashSet();
Iterator iter = artifacts.iterator();
- // log.debug("Artifacts:"+ artifacts.size());
+
while ( iter.hasNext() )
{
Artifact artifact = (Artifact) iter.next();
- if ( okToProcess( new ArtifactItem( artifact ) ) )
+ if ( isArtifactIncluded( new ArtifactItem( artifact ) ) )
{
result.add( artifact );
}
@@ -83,8 +84,8 @@
return result;
}
- public boolean okToProcess( ArtifactItem item )
- throws MojoExecutionException
+ public boolean isArtifactIncluded( ArtifactItem item )
+ throws ArtifactFilterException
{
Artifact artifact = item.getArtifact();
boolean overWrite = false;
@@ -97,9 +98,16 @@
handler.setArtifact( artifact );
- if ( overWrite || ( !handler.isMarkerSet() || ( overWriteIfNewer && handler.isMarkerOlder( artifact ) ) ) )
+ try
{
- result = true;
+ if ( overWrite || ( !handler.isMarkerSet() || ( overWriteIfNewer && handler.isMarkerOlder( artifact ) ) ) )
+ {
+ result = true;
+ }
+ }
+ catch ( MojoExecutionException e )
+ {
+ throw new ArtifactFilterException (e.getMessage(),e);
}
return result;
Modified: maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/ResolveFileFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/ResolveFileFilter.java?rev=607998&r1=607997&r2=607998&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/ResolveFileFilter.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/ResolveFileFilter.java Tue Jan 1 20:03:57 2008
@@ -26,6 +26,7 @@
import org.apache.maven.plugin.MojoExecutionException;
import org.apache.maven.plugin.dependency.fromConfiguration.ArtifactItem;
import org.apache.maven.plugin.dependency.utils.markers.MarkerHandler;
+import org.apache.maven.shared.artifact.filter.collection.ArtifactFilterException;
/**
* @author <a href="mailto:brianf@apache.org">Brian Fox</a>
@@ -40,10 +41,16 @@
super( true, true, true, handler );
}
- public boolean okToProcess( ArtifactItem item )
- throws MojoExecutionException
+ public boolean isArtifactIncluded( ArtifactItem item ) throws ArtifactFilterException
{
handler.setArtifact( item.getArtifact() );
- return ( !handler.isMarkerSet() );
+ try
+ {
+ return ( !handler.isMarkerSet() );
+ }
+ catch ( MojoExecutionException e )
+ {
+ throw new ArtifactFilterException( e.getMessage(),e);
+ }
}
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestCopyDependenciesMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestCopyDependenciesMojo.java?rev=607998&r1=607997&r2=607998&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestCopyDependenciesMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestCopyDependenciesMojo.java Tue Jan 1 20:03:57 2008
@@ -19,6 +19,12 @@
* under the License.
*/
+import java.io.File;
+import java.io.IOException;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.Set;
+
import org.apache.maven.artifact.Artifact;
import org.apache.maven.artifact.resolver.filter.ScopeArtifactFilter;
import org.apache.maven.plugin.MojoExecutionException;
@@ -29,14 +35,6 @@
import org.apache.maven.plugin.testing.stubs.StubArtifactResolver;
import org.apache.maven.project.MavenProject;
import org.codehaus.plexus.util.StringUtils;
-
-import sun.security.action.GetLongAction;
-
-import java.io.File;
-import java.io.IOException;
-import java.util.HashSet;
-import java.util.Iterator;
-import java.util.Set;
public class TestCopyDependenciesMojo
extends AbstractDependencyMojoTestCase
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestIncludeExcludeUnpackMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestIncludeExcludeUnpackMojo.java?rev=607998&r1=607997&r2=607998&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestIncludeExcludeUnpackMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestIncludeExcludeUnpackMojo.java Tue Jan 1 20:03:57 2008
@@ -13,7 +13,6 @@
import org.apache.maven.plugin.dependency.utils.markers.UnpackFileMarkerHandler;
import org.apache.maven.plugin.testing.stubs.StubArtifactCollector;
import org.apache.maven.plugin.testing.stubs.StubArtifactResolver;
-import org.apache.maven.project.MavenProject;
public class TestIncludeExcludeUnpackMojo
extends AbstractDependencyMojoTestCase
@@ -49,8 +48,7 @@
list.add( item );
assertNotNull( mojo );
assertNotNull( mojo.getProject() );
- MavenProject project = mojo.getProject();
-
+
mojo.setFactory( DependencyTestUtils.getArtifactFactory() );
mojo.setResolver( new StubArtifactResolver( stubFactory, false, false ) );
mojo.setMarkersDirectory( new File( this.testDir, "markers" ) );
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/its/AbstractDependencyPluginITCase.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/its/AbstractDependencyPluginITCase.java?rev=607998&r1=607997&r2=607998&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/its/AbstractDependencyPluginITCase.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/its/AbstractDependencyPluginITCase.java Tue Jan 1 20:03:57 2008
@@ -294,7 +294,8 @@
try
{
- buildLogUrl = buildLog.toURL().toExternalForm();
+
+ buildLogUrl = buildLog.toURI().toURL().toExternalForm();
}
catch ( MalformedURLException e )
{
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestDestFileFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestDestFileFilter.java?rev=607998&r1=607997&r2=607998&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestDestFileFilter.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestDestFileFilter.java Tue Jan 1 20:03:57 2008
@@ -36,6 +36,7 @@
import org.apache.maven.plugin.dependency.utils.DependencyUtil;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.plugin.testing.SilentLog;
+import org.apache.maven.shared.artifact.filter.collection.ArtifactFilterException;
/**
* @author brianf
@@ -92,80 +93,80 @@
}
public void testDestFileRelease()
- throws MojoExecutionException, IOException
+ throws IOException, ArtifactFilterException
{
DestFileFilter filter = new DestFileFilter( outputFolder );
Artifact artifact = fact.getReleaseArtifact();
- assertTrue( filter.okToProcess( artifact, log ) );
+ assertTrue( filter.isArtifactIncluded( artifact ) );
createFile( artifact );
- assertFalse( filter.okToProcess( artifact, log ) );
+ assertFalse( filter.isArtifactIncluded( artifact) );
filter.overWriteReleases = true;
- assertTrue( filter.okToProcess( artifact, log ) );
+ assertTrue( filter.isArtifactIncluded( artifact ) );
}
public void testDestFileSnapshot()
- throws MojoExecutionException, IOException
+ throws IOException, ArtifactFilterException
{
DestFileFilter filter = new DestFileFilter( outputFolder );
Artifact artifact = fact.getSnapshotArtifact();
- assertTrue( filter.okToProcess( artifact, log ) );
+ assertTrue( filter.isArtifactIncluded( artifact ) );
createFile( artifact );
- assertFalse( filter.okToProcess( artifact, log ) );
+ assertFalse( filter.isArtifactIncluded( artifact ) );
filter.overWriteSnapshots = true;
- assertTrue( filter.okToProcess( artifact, log ) );
+ assertTrue( filter.isArtifactIncluded( artifact ) );
}
public void testDestFileStripVersion()
- throws MojoExecutionException, IOException
+ throws IOException, ArtifactFilterException
{
DestFileFilter filter = new DestFileFilter( outputFolder );
Artifact artifact = fact.getSnapshotArtifact();
filter.removeVersion = true;
- assertTrue( filter.okToProcess( artifact, log ) );
+ assertTrue( filter.isArtifactIncluded( artifact) );
createFile( artifact, false, false, true );
- assertFalse( filter.okToProcess( artifact, log ) );
+ assertFalse( filter.isArtifactIncluded( artifact ) );
filter.overWriteSnapshots = true;
- assertTrue( filter.okToProcess( artifact, log ) );
+ assertTrue( filter.isArtifactIncluded( artifact ) );
}
public void testDestFileSubPerArtifact()
- throws MojoExecutionException, IOException
+ throws IOException, ArtifactFilterException
{
DestFileFilter filter = new DestFileFilter( outputFolder );
Artifact artifact = fact.getSnapshotArtifact();
filter.useSubDirectoryPerArtifact = true;
- assertTrue( filter.okToProcess( artifact, log ) );
+ assertTrue( filter.isArtifactIncluded( artifact ) );
createFile( artifact, true, false, false );
- assertFalse( filter.okToProcess( artifact, log ) );
+ assertFalse( filter.isArtifactIncluded( artifact ) );
filter.overWriteSnapshots = true;
- assertTrue( filter.okToProcess( artifact, log ) );
+ assertTrue( filter.isArtifactIncluded( artifact ) );
}
public void testDestFileSubPerType()
- throws MojoExecutionException, IOException
+ throws MojoExecutionException, IOException, ArtifactFilterException
{
DestFileFilter filter = new DestFileFilter( outputFolder );
Artifact artifact = fact.getSnapshotArtifact();
filter.useSubDirectoryPerType = true;
- assertTrue( filter.okToProcess( artifact, log ) );
+ assertTrue( filter.isArtifactIncluded( artifact) );
createFile( artifact, false, true, false );
- assertFalse( filter.okToProcess( artifact, log ) );
+ assertFalse( filter.isArtifactIncluded( artifact ) );
filter.overWriteSnapshots = true;
- assertTrue( filter.okToProcess( artifact, log ) );
+ assertTrue( filter.isArtifactIncluded( artifact ) );
}
public void testDestFileOverwriteIfNewer()
- throws MojoExecutionException, IOException
+ throws MojoExecutionException, IOException, ArtifactFilterException
{
DestFileFilter filter = new DestFileFilter( outputFolder );
@@ -176,19 +177,19 @@
filter.overWriteIfNewer = true;
// should pass because the file doesn't exist yet.
- assertTrue( filter.okToProcess( artifact, log ) );
+ assertTrue( filter.isArtifactIncluded( artifact) );
// create the file in the destination
File destFile = createFile( artifact, false, false, false );
// set the last modified timestamp to be older than the source
destFile.setLastModified( artifactFile.lastModified() - 1000 );
- assertTrue( filter.okToProcess( artifact, log ) );
+ assertTrue( filter.isArtifactIncluded( artifact ) );
// now set the last modified timestamp to be newer than the source
destFile.setLastModified( artifactFile.lastModified() + 1000 );
- assertFalse( filter.okToProcess( artifact, log ) );
+ assertFalse( filter.isArtifactIncluded( artifact ) );
}
public void testGettersSetters()
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestMarkerFileFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestMarkerFileFilter.java?rev=607998&r1=607997&r2=607998&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestMarkerFileFilter.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestMarkerFileFilter.java Tue Jan 1 20:03:57 2008
@@ -36,6 +36,7 @@
import org.apache.maven.plugin.dependency.utils.markers.DefaultFileMarkerHandler;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.plugin.testing.SilentLog;
+import org.apache.maven.shared.artifact.filter.collection.ArtifactFilterException;
/**
* @author brianf
@@ -71,31 +72,31 @@
DependencyTestUtils.removeDirectory( outputFolder );
}
- public void testMarkerFile()
- throws MojoExecutionException
+ public void testMarkerFile() throws ArtifactFilterException
+
{
MarkerFileFilter filter = new MarkerFileFilter( true, true, false, new DefaultFileMarkerHandler( outputFolder ) );
- Set result = filter.filter( artifacts, log );
+ Set result = filter.filter( artifacts );
assertEquals( 2, result.size() );
filter.setOverWriteReleases( false );
filter.setOverWriteSnapshots( false );
- result = filter.filter( artifacts, log );
+ result = filter.filter( artifacts );
assertEquals( 2, result.size() );
}
- public void testMarkerSnapshots()
- throws MojoExecutionException, IOException
+ public void testMarkerSnapshots() throws ArtifactFilterException, MojoExecutionException, IOException
+
{
DefaultFileMarkerHandler handler = new DefaultFileMarkerHandler( fact.getSnapshotArtifact(), outputFolder );
handler.setMarker();
MarkerFileFilter filter = new MarkerFileFilter( true, false, false, new DefaultFileMarkerHandler( outputFolder ) );
- Set result = filter.filter( artifacts, log );
+ Set result = filter.filter( artifacts );
assertEquals( 1, result.size() );
filter.setOverWriteSnapshots( true );
- result = filter.filter( artifacts, log );
+ result = filter.filter( artifacts );
assertEquals( 2, result.size() );
assertTrue( handler.clearMarker() );
DependencyTestUtils.removeDirectory( outputFolder );
@@ -103,18 +104,18 @@
}
public void testMarkerRelease()
- throws MojoExecutionException, IOException
+ throws IOException, ArtifactFilterException, MojoExecutionException
{
DefaultFileMarkerHandler handler = new DefaultFileMarkerHandler( fact.getReleaseArtifact(), outputFolder );
handler.setMarker();
MarkerFileFilter filter = new MarkerFileFilter( false, false, false,
new DefaultFileMarkerHandler( outputFolder ) );
- Set result = filter.filter( artifacts, log );
+ Set result = filter.filter( artifacts);
assertEquals( 1, result.size() );
filter.setOverWriteReleases( true );
- result = filter.filter( artifacts, log );
+ result = filter.filter( artifacts);
assertEquals( 2, result.size() );
assertTrue( handler.clearMarker() );
@@ -123,7 +124,7 @@
}
public void testMarkerTimestamp()
- throws MojoExecutionException, IOException
+ throws IOException, MojoExecutionException, ArtifactFilterException
{
DependencyArtifactStubFactory fileFact = new DependencyArtifactStubFactory( outputFolder, true );
Artifact snap = fileFact.getSnapshotArtifact();
@@ -135,12 +136,12 @@
DefaultFileMarkerHandler handler = new DefaultFileMarkerHandler( snap, outputFolder );
handler.setMarker();
MarkerFileFilter filter = new MarkerFileFilter( false, false, true, new DefaultFileMarkerHandler( outputFolder ) );
- Set result = filter.filter( tempArtifacts, log );
+ Set result = filter.filter( tempArtifacts);
assertEquals( 2, result.size() );
snap.getFile().setLastModified( snap.getFile().lastModified() - 10000 );
- result = filter.filter( tempArtifacts, log );
+ result = filter.filter( tempArtifacts );
assertEquals( 1, result.size() );
assertTrue( handler.clearMarker() );
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestResolveMarkerFileFilter.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestResolveMarkerFileFilter.java?rev=607998&r1=607997&r2=607998&view=diff
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestResolveMarkerFileFilter.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestResolveMarkerFileFilter.java Tue Jan 1 20:03:57 2008
@@ -36,6 +36,7 @@
import org.apache.maven.plugin.dependency.utils.markers.SourcesFileMarkerHandler;
import org.apache.maven.plugin.logging.Log;
import org.apache.maven.plugin.testing.SilentLog;
+import org.apache.maven.shared.artifact.filter.collection.ArtifactFilterException;
/**
* @author brianf
@@ -72,7 +73,7 @@
}
public void testResolveFile()
- throws MojoExecutionException, IOException
+ throws IOException, ArtifactFilterException, MojoExecutionException
{
SourcesFileMarkerHandler handler = new SourcesFileMarkerHandler( outputFolder );
@@ -81,9 +82,9 @@
ResolveFileFilter filter = new ResolveFileFilter( handler );
- assertTrue( filter.okToProcess( artifact, log ) );
+ assertTrue( filter.isArtifactIncluded( artifact) );
handler.setMarker();
- assertFalse( filter.okToProcess( artifact, log ) );
+ assertFalse( filter.isArtifactIncluded( artifact) );
}
}