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 2007/05/01 03:55:05 UTC
svn commit: r533906 - in /maven/plugins/trunk/maven-dependency-plugin/src:
main/java/org/apache/maven/plugin/dependency/fromConfiguration/
test/java/org/apache/maven/plugin/dependency/
test/java/org/apache/maven/plugin/dependency/fromConfiguration/
Author: brianf
Date: Mon Apr 30 18:55:04 2007
New Revision: 533906
URL: http://svn.apache.org/viewvc?view=rev&rev=533906
Log:
MDEP-80 fixed copy if overWrite=false, added tests
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/AbstractFromConfigurationMojo.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/TestCopyDependenciesMojo2.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestCopyMojo.java
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?view=diff&rev=533906&r1=533905&r2=533906
==============================================================================
--- 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 Mon Apr 30 18:55:04 2007
@@ -165,10 +165,6 @@
{
result = true;
}
- else if ( StringUtils.equalsIgnoreCase( item.getOverWrite(), "false" ) )
- {
- result = false;
- }
else
{
ArtifactItemFilter filter = getMarkedArtifactFilter( item );
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?view=diff&rev=533906&r1=533905&r2=533906
==============================================================================
--- 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 Mon Apr 30 18:55:04 2007
@@ -346,104 +346,6 @@
}
}
- public void testSubPerArtifact()
- throws Exception
- {
- mojo.useSubDirectoryPerArtifact = true;
- mojo.execute();
-
- Iterator iter = mojo.project.getArtifacts().iterator();
- while ( iter.hasNext() )
- {
- Artifact artifact = (Artifact) iter.next();
- String fileName = DependencyUtil.getFormattedFileName( artifact, false );
- File folder = DependencyUtil.getFormattedOutputDirectory( false, true, false, false, mojo.outputDirectory,
- artifact );
- File file = new File( folder, fileName );
- assertTrue( file.exists() );
- }
- }
-
- public void testSubPerArtifactAndType()
- throws Exception
- {
- mojo.project.setArtifacts( stubFactory.getTypedArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
- mojo.useSubDirectoryPerArtifact = true;
- mojo.useSubDirectoryPerType = true;
- mojo.execute();
-
- Iterator iter = mojo.project.getArtifacts().iterator();
- while ( iter.hasNext() )
- {
- Artifact artifact = (Artifact) iter.next();
- String fileName = DependencyUtil.getFormattedFileName( artifact, false );
- File folder = DependencyUtil.getFormattedOutputDirectory( true, true, false, false, mojo.outputDirectory,
- artifact );
- File file = new File( folder, fileName );
- assertTrue( file.exists() );
- }
- }
-
- public void testRepositoryLayout()
- throws Exception
- {
- mojo.useRepositoryLayout = true;
- mojo.execute();
-
- Iterator iter = mojo.project.getArtifacts().iterator();
- while ( iter.hasNext() )
- {
- Artifact artifact = (Artifact) iter.next();
- String fileName = DependencyUtil.getFormattedFileName( artifact, false );
- File folder = DependencyUtil.getFormattedOutputDirectory( false, true, mojo.useRepositoryLayout, false,
- mojo.outputDirectory, artifact );
- File file = new File( folder, fileName );
- assertTrue( file.exists() );
- }
- }
-
- public void testSubPerArtifactRemoveVersion()
- throws Exception
- {
- mojo.useSubDirectoryPerArtifact = true;
- mojo.stripVersion = true;
- mojo.execute();
-
- Iterator iter = mojo.project.getArtifacts().iterator();
- while ( iter.hasNext() )
- {
- Artifact artifact = (Artifact) iter.next();
- String fileName = DependencyUtil.getFormattedFileName( artifact, true );
- File folder = DependencyUtil.getFormattedOutputDirectory( false, true, false, true, mojo.outputDirectory,
- artifact );
- File file = new File( folder, fileName );
- assertTrue( file.exists() );
- }
- }
-
- public void testSubPerArtifactAndTypeRemoveVersion()
- throws Exception
- {
- mojo.project.setArtifacts( stubFactory.getTypedArtifacts() );
- mojo.project.setDependencyArtifacts( new HashSet() );
- mojo.useSubDirectoryPerArtifact = true;
- mojo.useSubDirectoryPerType = true;
- mojo.stripVersion = true;
- mojo.execute();
-
- Iterator iter = mojo.project.getArtifacts().iterator();
- while ( iter.hasNext() )
- {
- Artifact artifact = (Artifact) iter.next();
- String fileName = DependencyUtil.getFormattedFileName( artifact, true );
- File folder = DependencyUtil.getFormattedOutputDirectory( true, true, false, true, mojo.outputDirectory,
- artifact );
- File file = new File( folder, fileName );
- assertTrue( file.exists() );
- }
- }
-
public void testCDMClassifier()
throws Exception
{
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestCopyDependenciesMojo2.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestCopyDependenciesMojo2.java?view=diff&rev=533906&r1=533905&r2=533906
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestCopyDependenciesMojo2.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/TestCopyDependenciesMojo2.java Mon Apr 30 18:55:04 2007
@@ -175,4 +175,102 @@
}
}
+ public void testSubPerArtifact()
+ throws Exception
+ {
+ mojo.useSubDirectoryPerArtifact = true;
+ mojo.execute();
+
+ Iterator iter = mojo.project.getArtifacts().iterator();
+ while ( iter.hasNext() )
+ {
+ Artifact artifact = (Artifact) iter.next();
+ String fileName = DependencyUtil.getFormattedFileName( artifact, false );
+ File folder = DependencyUtil.getFormattedOutputDirectory( false, true, false, false, mojo.outputDirectory,
+ artifact );
+ File file = new File( folder, fileName );
+ assertTrue( file.exists() );
+ }
+ }
+
+ public void testSubPerArtifactAndType()
+ throws Exception
+ {
+ mojo.project.setArtifacts( stubFactory.getTypedArtifacts() );
+ mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.useSubDirectoryPerArtifact = true;
+ mojo.useSubDirectoryPerType = true;
+ mojo.execute();
+
+ Iterator iter = mojo.project.getArtifacts().iterator();
+ while ( iter.hasNext() )
+ {
+ Artifact artifact = (Artifact) iter.next();
+ String fileName = DependencyUtil.getFormattedFileName( artifact, false );
+ File folder = DependencyUtil.getFormattedOutputDirectory( true, true, false, false, mojo.outputDirectory,
+ artifact );
+ File file = new File( folder, fileName );
+ assertTrue( file.exists() );
+ }
+ }
+
+ public void testRepositoryLayout()
+ throws Exception
+ {
+ mojo.useRepositoryLayout = true;
+ mojo.execute();
+
+ Iterator iter = mojo.project.getArtifacts().iterator();
+ while ( iter.hasNext() )
+ {
+ Artifact artifact = (Artifact) iter.next();
+ String fileName = DependencyUtil.getFormattedFileName( artifact, false );
+ File folder = DependencyUtil.getFormattedOutputDirectory( false, true, mojo.useRepositoryLayout, false,
+ mojo.outputDirectory, artifact );
+ File file = new File( folder, fileName );
+ assertTrue( file.exists() );
+ }
+ }
+
+ public void testSubPerArtifactRemoveVersion()
+ throws Exception
+ {
+ mojo.useSubDirectoryPerArtifact = true;
+ mojo.stripVersion = true;
+ mojo.execute();
+
+ Iterator iter = mojo.project.getArtifacts().iterator();
+ while ( iter.hasNext() )
+ {
+ Artifact artifact = (Artifact) iter.next();
+ String fileName = DependencyUtil.getFormattedFileName( artifact, true );
+ File folder = DependencyUtil.getFormattedOutputDirectory( false, true, false, true, mojo.outputDirectory,
+ artifact );
+ File file = new File( folder, fileName );
+ assertTrue( file.exists() );
+ }
+ }
+
+ public void testSubPerArtifactAndTypeRemoveVersion()
+ throws Exception
+ {
+ mojo.project.setArtifacts( stubFactory.getTypedArtifacts() );
+ mojo.project.setDependencyArtifacts( new HashSet() );
+ mojo.useSubDirectoryPerArtifact = true;
+ mojo.useSubDirectoryPerType = true;
+ mojo.stripVersion = true;
+ mojo.execute();
+
+ Iterator iter = mojo.project.getArtifacts().iterator();
+ while ( iter.hasNext() )
+ {
+ Artifact artifact = (Artifact) iter.next();
+ String fileName = DependencyUtil.getFormattedFileName( artifact, true );
+ File folder = DependencyUtil.getFormattedOutputDirectory( true, true, false, true, mojo.outputDirectory,
+ artifact );
+ File file = new File( folder, fileName );
+ assertTrue( file.exists() );
+ }
+ }
+
}
Modified: maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestCopyMojo.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestCopyMojo.java?view=diff&rev=533906&r1=533905&r2=533906
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestCopyMojo.java (original)
+++ maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestCopyMojo.java Mon Apr 30 18:55:04 2007
@@ -134,6 +134,28 @@
assertFilesExist( list, true );
}
+ public void testCopyFileNoOverwrite()
+ throws IOException, MojoExecutionException
+ {
+
+ ArrayList list = stubFactory.getArtifactItems( stubFactory.getClassifiedArtifacts() );
+
+ Iterator iter = list.iterator();
+ while ( iter.hasNext() )
+ {
+ ArtifactItem item = (ArtifactItem) iter.next();
+
+ // make sure that we copy even if false is set - MDEP-80
+ item.setOverWrite( "false" );
+ }
+
+ mojo.setArtifactItems( list );
+ mojo.silent = false;
+ mojo.execute();
+
+ assertFilesExist( list, true );
+ }
+
public void testCopyToLocation()
throws IOException, MojoExecutionException
{
@@ -235,7 +257,6 @@
return list;
}
-
public void testMissingVersionFromDependencies()
throws MojoExecutionException
@@ -260,31 +281,30 @@
}
public void testMissingVersionFromDependenciesLooseMatch()
- throws MojoExecutionException
-{
- ArtifactItem item = new ArtifactItem();
-
- item.setArtifactId( "artifactId" );
- item.setClassifier( "" );
- item.setGroupId( "groupId" );
- item.setType( "type" );
-
- MavenProject project = mojo.getProject();
- project.setDependencies( getDependencyList( item ) );
-
- item.setClassifier( "sources" );
- item.setType( "jar" );
-
- ArrayList list = new ArrayList();
- list.add( item );
- mojo.setArtifactItems( list );
-
- mojo.execute();
- this.assertFileExists( item, true );
- assertEquals( "2.1", item.getVersion() );
-}
+ throws MojoExecutionException
+ {
+ ArtifactItem item = new ArtifactItem();
+
+ item.setArtifactId( "artifactId" );
+ item.setClassifier( "" );
+ item.setGroupId( "groupId" );
+ item.setType( "type" );
+
+ MavenProject project = mojo.getProject();
+ project.setDependencies( getDependencyList( item ) );
+
+ item.setClassifier( "sources" );
+ item.setType( "jar" );
+
+ ArrayList list = new ArrayList();
+ list.add( item );
+ mojo.setArtifactItems( list );
+
+ mojo.execute();
+ this.assertFileExists( item, true );
+ assertEquals( "2.1", item.getVersion() );
+ }
-
public void testMissingVersionFromDependenciesWithClassifier()
throws MojoExecutionException
{
@@ -364,39 +384,39 @@
}
public void testMissingVersionFromDependencyMgtLooseMatch()
- throws MojoExecutionException
-{
- ArtifactItem item = new ArtifactItem();
+ throws MojoExecutionException
+ {
+ ArtifactItem item = new ArtifactItem();
- item.setArtifactId( "artifactId" );
- item.setClassifier( "" );
- item.setGroupId( "groupId" );
- item.setType( "type" );
+ item.setArtifactId( "artifactId" );
+ item.setClassifier( "" );
+ item.setGroupId( "groupId" );
+ item.setType( "type" );
- MavenProject project = mojo.getProject();
- project.setDependencies( getDependencyList( item ) );
+ MavenProject project = mojo.getProject();
+ project.setDependencies( getDependencyList( item ) );
- item = new ArtifactItem();
+ item = new ArtifactItem();
- item.setArtifactId( "artifactId-2" );
- item.setClassifier( "" );
- item.setGroupId( "groupId" );
- item.setType( "type" );
+ item.setArtifactId( "artifactId-2" );
+ item.setClassifier( "" );
+ item.setGroupId( "groupId" );
+ item.setType( "type" );
+
+ ArrayList list = new ArrayList();
+ list.add( item );
- ArrayList list = new ArrayList();
- list.add( item );
+ mojo.setArtifactItems( list );
- mojo.setArtifactItems( list );
+ project.getDependencyManagement().setDependencies( getDependencyMgtList( item ) );
- project.getDependencyManagement().setDependencies( getDependencyMgtList( item ) );
+ item.setType( "jar" );
+ mojo.execute();
- item.setType( "jar" );
- mojo.execute();
+ this.assertFileExists( item, true );
+ assertEquals( "3.1", item.getVersion() );
+ }
- this.assertFileExists( item, true );
- assertEquals( "3.1", item.getVersion() );
-}
-
public void testMissingVersionFromDependencyMgtWithClassifier()
throws MojoExecutionException
{
@@ -641,6 +661,5 @@
assertTrue( time < copiedFile.lastModified() );
}
-
}