Author: brianf
Date: Wed Feb 7 16:18:28 2007
New Revision: 504752
URL: http://svn.apache.org/viewvc?view=rev&rev=504752
Log:
applied patch from Steve Neuhauser to make groupId match use startsWith()
instead of equals()
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/AbstractArtifactFeatureFilter.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/GroupIdFilter.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestGroupIdFilter.java
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/AbstractArtifactFeatureFilter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/AbstractArtifactFeatureFilter.java?view=diff&rev=504752&r1=504751&r2=504752
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/AbstractArtifactFeatureFilter.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/AbstractArtifactFeatureFilter.java
Wed Feb 7 16:18:28 2007
@@ -118,7 +118,7 @@
// if the classifier or type of the artifact matches the
feature
// to include, add to the
// results
- if ( getArtifactFeature( artifact ).equals( include ) )
+ if ( compareFeatures( getArtifactFeature( artifact ), include
) )
{
result.add( artifact );
}
@@ -155,7 +155,7 @@
while ( excludeIter.hasNext() )
{
String excludeFeature = (String) excludeIter.next();
- if ( artifactFeature.equals( excludeFeature ) )
+ if (compareFeatures(artifactFeature, excludeFeature ) )
{
exclude = true;
break;
@@ -215,5 +215,15 @@
public List getIncludes()
{
return this.includes;
+ }
+
+ /**
+ * Allows Feature comparison to be customized
+ * @param lhs String artifact's feature
+ * @param rhs String feature from exclude or include list
+ * @return boolean true if features match
+ */
+ protected boolean compareFeatures(String lhs, String rhs){
+ return(lhs.equals(rhs));
}
}
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/GroupIdFilter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/GroupIdFilter.java?view=diff&rev=504752&r1=504751&r2=504752
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/GroupIdFilter.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/filters/GroupIdFilter.java
Wed Feb 7 16:18:28 2007
@@ -75,4 +75,15 @@
{
return artifact.getGroupId();
}
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see
org.apache.maven.plugin.dependency.utils.filters.AbstractArtifactFeatureFilter#compareFeatures(String,String)
+ */
+
+ protected boolean compareFeatures(String lhs, String rhs){
+ return lhs.startsWith(rhs);
+ }
+
}
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestGroupIdFilter.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestGroupIdFilter.java?view=diff&rev=504752&r1=504751&r2=504752
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestGroupIdFilter.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/filters/TestGroupIdFilter.java
Wed Feb 7 16:18:28 2007
@@ -29,6 +29,7 @@
import org.apache.maven.artifact.Artifact;
import
org.apache.maven.plugin.dependency.testUtils.AbstractArtifactFeatureFilterTestCase;
import org.apache.maven.plugin.dependency.testUtils.ArtifactStubFactory;
+import org.apache.maven.plugin.dependency.utils.SilentLog;
/**
* @author clove TestCases for GroupIdFilter
@@ -83,5 +84,36 @@
throws Exception
{
filtering3();
+ }
+
+ public void testFiltering4()
+ throws Exception
+ {
+ SilentLog log = new SilentLog();
+ // include o* from groupIds one,two should leave one
+ Set result = filtering();
+ assertTrue(result.size()==2);
+ GroupIdFilter filter = new GroupIdFilter("o",null);
+ result = filter.filter(result, log);
+ Iterator iter = result.iterator();
+ while( iter.hasNext() )
+ {
+ Artifact artifact = (Artifact) iter.next();
+ assertTrue(artifact.getGroupId().equals("one"));
+
+ }
+
+ // exclude on* from groupIds one,two should leave two
+ result = filtering();
+ assertTrue(result.size()==2);
+ filter = new GroupIdFilter(null,"on");
+ result = filter.filter(result, log);
+ iter = result.iterator();
+ while( iter.hasNext() )
+ {
+ Artifact artifact = (Artifact) iter.next();
+ assertTrue(artifact.getGroupId().equals("two"));
+
+ }
}
}