Author: brianf
Date: Thu Dec 14 07:21:31 2006
New Revision: 487234
URL: http://svn.apache.org/viewvc?view=rev&rev=487234
Log:
updated to latest parent and fixed bug in striping version from file name.
Modified:
maven/plugins/trunk/maven-dependency-plugin/pom.xml
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/fromConfiguration/CopyMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestCopyMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestUnpackMojo.java
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestDependencyUtil.java
Modified: maven/plugins/trunk/maven-dependency-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/pom.xml?view=diff&rev=487234&r1=487233&r2=487234
==============================================================================
--- maven/plugins/trunk/maven-dependency-plugin/pom.xml (original)
+++ maven/plugins/trunk/maven-dependency-plugin/pom.xml Thu Dec 14 07:21:31 2006
@@ -24,7 +24,7 @@
<parent>
<artifactId>maven-plugins</artifactId>
<groupId>org.apache.maven.plugins</groupId>
- <version>4</version>
+ <version>5</version>
</parent>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
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=487234&r1=487233&r2=487234
==============================================================================
---
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
Thu Dec 14 07:21:31 2006
@@ -110,7 +110,7 @@
*
* @see ArtifactItem
*/
- protected ArrayList getArtifactItems( boolean removeVersion )
+ protected ArrayList getProcessedArtifactItems( boolean removeVersion )
throws MojoExecutionException
{
if ( artifactItems == null || artifactItems.size() < 1 )
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/CopyMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/CopyMojo.java?view=diff&rev=487234&r1=487233&r2=487234
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/CopyMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/CopyMojo.java
Thu Dec 14 07:21:31 2006
@@ -62,7 +62,7 @@
public void execute()
throws MojoExecutionException
{
- ArrayList theArtifactItems = getArtifactItems( this.stripVersion );
+ ArrayList theArtifactItems = getProcessedArtifactItems(
this.stripVersion );
Iterator iter = theArtifactItems.iterator();
while ( iter.hasNext() )
{
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java?view=diff&rev=487234&r1=487233&r2=487234
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/fromConfiguration/UnpackMojo.java
Thu Dec 14 07:21:31 2006
@@ -64,7 +64,7 @@
public void execute()
throws MojoExecutionException
{
- ArrayList processedItems = getArtifactItems( false );
+ ArrayList processedItems = getProcessedArtifactItems( false );
Iterator iter = processedItems.iterator();
while ( iter.hasNext() )
{
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java?view=diff&rev=487234&r1=487233&r2=487234
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/main/java/org/apache/maven/plugin/dependency/utils/DependencyUtil.java
Thu Dec 14 07:21:31 2006
@@ -46,6 +46,9 @@
*/
public static String getFormattedFileName( Artifact artifact, boolean
removeVersion )
{
+ //TODO: I used to sometimes pull the artifact directly from the
artifact but this
+ //causes problems with tests. Need to think about the implications of
always
+ //constructing the file name. Could the filename ever not match the
constructed one?
String destFileName = null;
String versionString = null;
if ( !removeVersion )
@@ -56,24 +59,14 @@
{
versionString = "";
}
-
- File file = artifact.getFile();
- if ( file != null )
+ if ( StringUtils.isNotEmpty( artifact.getClassifier() ) )
{
- destFileName = file.getName();
+ destFileName = artifact.getArtifactId() + "-" +
artifact.getClassifier() + versionString + "."
+ + artifact.getType();
}
- // so it can be used offline
else
{
- if ( StringUtils.isNotEmpty( artifact.getClassifier() ) )
- {
- destFileName = artifact.getArtifactId() + "-" +
artifact.getClassifier() + versionString + "."
- + artifact.getType();
- }
- else
- {
- destFileName = artifact.getArtifactId() + versionString + "."
+ artifact.getType();
- }
+ destFileName = artifact.getArtifactId() + versionString + "." +
artifact.getType();
}
return destFileName;
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=487234&r1=487233&r2=487234
==============================================================================
---
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
Thu Dec 14 07:21:31 2006
@@ -1,4 +1,5 @@
package org.apache.maven.plugin.dependency.fromConfiguration;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -32,6 +33,7 @@
import org.apache.maven.plugin.dependency.testUtils.DependencyTestUtils;
import
org.apache.maven.plugin.dependency.testUtils.stubs.StubArtifactRepository;
import org.apache.maven.plugin.dependency.testUtils.stubs.StubArtifactResolver;
+import org.apache.maven.plugin.dependency.utils.DependencyUtil;
import org.apache.maven.project.MavenProject;
public class TestCopyMojo
@@ -52,7 +54,7 @@
File testPom = new File( getBasedir(),
"target/test-classes/unit/copy-test/plugin-config.xml" );
mojo = (CopyMojo) lookupMojo( "copy", testPom );
- mojo.setOutputDirectory(new File( this.testDir, "outputDirectory" ));
+ mojo.setOutputDirectory( new File( this.testDir, "outputDirectory" ) );
// mojo.silent = true;
assertNotNull( mojo );
@@ -67,7 +69,7 @@
public ArtifactItem getSingleArtifactItem( boolean removeVersion )
throws MojoExecutionException
{
- ArrayList list = mojo.getArtifactItems( removeVersion );
+ ArrayList list = mojo.getProcessedArtifactItems( removeVersion );
return (ArtifactItem) list.get( 0 );
}
@@ -84,7 +86,7 @@
ArrayList list = new ArrayList( 1 );
list.add( item );
- mojo.setArtifactItems(list);
+ mojo.setArtifactItems( list );
ArtifactItem result = getSingleArtifactItem( false );
assertEquals( mojo.getOutputDirectory(), result.getOutputDirectory() );
@@ -122,7 +124,7 @@
{
ArrayList list = stubFactory.getArtifactItems(
stubFactory.getClassifiedArtifacts() );
- mojo.setArtifactItems(list);
+ mojo.setArtifactItems( list );
mojo.execute();
@@ -136,14 +138,14 @@
ArtifactItem item = (ArtifactItem) list.get( 0 );
item.setOutputDirectory( new File( mojo.getOutputDirectory(),
"testOverride" ) );
- mojo.setArtifactItems(list);
+ mojo.setArtifactItems( list );
mojo.execute();
assertFilesExist( list, true );
}
- public void testCopyStripVersion()
+ public void testCopyStripVersionSetInMojo()
throws IOException, MojoExecutionException
{
ArrayList list = stubFactory.getArtifactItems(
stubFactory.getClassifiedArtifacts() );
@@ -151,19 +153,21 @@
item.setOutputDirectory( new File( mojo.getOutputDirectory(),
"testOverride" ) );
mojo.setStripVersion( true );
- mojo.setArtifactItems(list);
+ mojo.setArtifactItems( list );
mojo.execute();
+ assertEquals( DependencyUtil.getFormattedFileName( item.getArtifact(),
true ), item.getDestFileName() );
assertFilesExist( list, true );
}
+
public void testNonClassifierStrip()
throws IOException, MojoExecutionException
{
ArrayList list = stubFactory.getArtifactItems(
stubFactory.getReleaseAndSnapshotArtifacts() );
mojo.setStripVersion( true );
- mojo.setArtifactItems(list);
+ mojo.setArtifactItems( list );
mojo.execute();
@@ -175,7 +179,7 @@
{
ArrayList list = stubFactory.getArtifactItems(
stubFactory.getReleaseAndSnapshotArtifacts() );
- mojo.setArtifactItems(list);
+ mojo.setArtifactItems( list );
mojo.execute();
@@ -194,7 +198,7 @@
ArrayList list = new ArrayList();
list.add( item );
- mojo.setArtifactItems(list);
+ mojo.setArtifactItems( list );
try
{
@@ -242,7 +246,7 @@
ArrayList list = new ArrayList();
list.add( item );
- mojo.setArtifactItems(list);
+ mojo.setArtifactItems( list );
MavenProject project = mojo.getProject();
project.setDependencies( getDependencyList( item ) );
@@ -264,7 +268,7 @@
ArrayList list = new ArrayList();
list.add( item );
- mojo.setArtifactItems(list);
+ mojo.setArtifactItems( list );
MavenProject project = mojo.getProject();
project.setDependencies( getDependencyList( item ) );
@@ -320,7 +324,7 @@
ArrayList list = new ArrayList();
list.add( item );
- mojo.setArtifactItems(list);
+ mojo.setArtifactItems( list );
project.getDependencyManagement().setDependencies(
getDependencyMgtList( item ) );
@@ -353,7 +357,7 @@
ArrayList list = new ArrayList();
list.add( item );
- mojo.setArtifactItems(list);
+ mojo.setArtifactItems( list );
project.getDependencyManagement().setDependencies(
getDependencyMgtList( item ) );
@@ -388,7 +392,7 @@
ArrayList list = new ArrayList();
list.add( item );
- mojo.setArtifactItems(list);
+ mojo.setArtifactItems( list );
// init classifier things
mojo.setFactory( DependencyTestUtils.getArtifactFactory() );
@@ -417,7 +421,7 @@
{
try
{
- mojo.getArtifactItems( false );
+ mojo.getProcessedArtifactItems( false );
fail( "Expected Exception" );
}
catch ( MojoExecutionException e )
@@ -438,9 +442,9 @@
ArrayList list = new ArrayList( 1 );
list.add( item );
- mojo.setArtifactItems(list);
+ mojo.setArtifactItems( list );
- mojo.setOverWriteIfNewer(false);
+ mojo.setOverWriteIfNewer( false );
mojo.execute();
@@ -469,9 +473,9 @@
ArrayList list = new ArrayList( 1 );
list.add( item );
- mojo.setArtifactItems(list);
+ mojo.setArtifactItems( list );
- mojo.setOverWriteIfNewer(false);
+ mojo.setOverWriteIfNewer( false );
mojo.execute();
@@ -500,10 +504,10 @@
ArrayList list = new ArrayList( 1 );
list.add( item );
- mojo.setArtifactItems(list);
+ mojo.setArtifactItems( list );
- mojo.setOverWriteIfNewer(false);
- mojo.setOverWriteReleases(true);
+ mojo.setOverWriteIfNewer( false );
+ mojo.setOverWriteReleases( true );
mojo.execute();
File copiedFile = new File( item.getOutputDirectory(),
item.getDestFileName() );
@@ -528,11 +532,11 @@
ArrayList list = new ArrayList( 1 );
list.add( item );
- mojo.setArtifactItems(list);
+ mojo.setArtifactItems( list );
- mojo.setOverWriteIfNewer(false);
- mojo.setOverWriteReleases(false);
- mojo.setOverWriteSnapshots(true);
+ mojo.setOverWriteIfNewer( false );
+ mojo.setOverWriteReleases( false );
+ mojo.setOverWriteSnapshots( true );
mojo.execute();
File copiedFile = new File( item.getOutputDirectory(),
item.getDestFileName() );
@@ -557,8 +561,8 @@
ArrayList list = new ArrayList( 1 );
list.add( item );
- mojo.setArtifactItems(list);
- mojo.setOverWriteIfNewer(true);
+ mojo.setArtifactItems( list );
+ mojo.setOverWriteIfNewer( true );
mojo.execute();
File copiedFile = new File( item.getOutputDirectory(),
item.getDestFileName() );
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestUnpackMojo.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestUnpackMojo.java?view=diff&rev=487234&r1=487233&r2=487234
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestUnpackMojo.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/fromConfiguration/TestUnpackMojo.java
Thu Dec 14 07:21:31 2006
@@ -78,7 +78,7 @@
public ArtifactItem getSingleArtifactItem( boolean removeVersion )
throws MojoExecutionException
{
- ArrayList list = mojo.getArtifactItems( removeVersion );
+ ArrayList list = mojo.getProcessedArtifactItems( removeVersion );
return (ArtifactItem) list.get( 0 );
}
@@ -388,7 +388,7 @@
{
try
{
- mojo.getArtifactItems( false );
+ mojo.getProcessedArtifactItems( false );
fail( "Expected Exception" );
}
catch ( MojoExecutionException e )
Modified:
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestDependencyUtil.java
URL:
http://svn.apache.org/viewvc/maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestDependencyUtil.java?view=diff&rev=487234&r1=487233&r2=487234
==============================================================================
---
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestDependencyUtil.java
(original)
+++
maven/plugins/trunk/maven-dependency-plugin/src/test/java/org/apache/maven/plugin/dependency/utils/TestDependencyUtil.java
Thu Dec 14 07:21:31 2006
@@ -1,4 +1,5 @@
package org.apache.maven.plugin.dependency.utils;
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -60,11 +61,11 @@
ArtifactHandler ah = new DefaultArtifactHandler();
VersionRange vr = VersionRange.createFromVersion( "1.1" );
- release = new DefaultArtifact( "test", "1", vr,
Artifact.SCOPE_COMPILE, "jar", null, ah, false );
+ release = new DefaultArtifact( "test", "one", vr,
Artifact.SCOPE_COMPILE, "jar", null, ah, false );
artifacts.add( release );
vr = VersionRange.createFromVersion( "1.1-SNAPSHOT" );
- snap = new DefaultArtifact( "test", "2", vr, Artifact.SCOPE_PROVIDED,
"war", "sources", ah, false );
+ snap = new DefaultArtifact( "test", "two", vr,
Artifact.SCOPE_PROVIDED, "war", "sources", ah, false );
artifacts.add( snap );
// pick random output location
@@ -92,12 +93,12 @@
assertTrue( expectedResult.equalsIgnoreCase( name.getAbsolutePath() )
);
name = DependencyUtil.getFormattedOutputDirectory( false, true,
folder, (Artifact) artifacts.get( 0 ) );
- expectedResult = folder.getAbsolutePath() + File.separatorChar +
"test-1-jar-1.1";
- assertTrue( expectedResult.equalsIgnoreCase( name.getAbsolutePath() )
);
+ expectedResult = folder.getAbsolutePath() + File.separatorChar +
"test-one-jar-1.1";
+ assertEquals( expectedResult, name.getAbsolutePath());
name = DependencyUtil.getFormattedOutputDirectory( true, true, folder,
(Artifact) artifacts.get( 0 ) );
- expectedResult = folder.getAbsolutePath() + File.separatorChar +
"jars" + File.separatorChar + "test-1-jar-1.1";
- assertTrue( expectedResult.equalsIgnoreCase( name.getAbsolutePath() )
);
+ expectedResult = folder.getAbsolutePath() + File.separatorChar +
"jars" + File.separatorChar + "test-one-jar-1.1";
+ assertEquals( expectedResult, name.getAbsolutePath() );
}
public void testDirectoryName2()
@@ -110,16 +111,16 @@
name = DependencyUtil.getFormattedOutputDirectory( true, false,
folder, (Artifact) artifacts.get( 1 ) );
String expectedResult = folder.getAbsolutePath() + File.separatorChar
+ "wars";
- assertTrue( expectedResult.equalsIgnoreCase( name.getAbsolutePath() )
);
+ assertEquals( expectedResult, name.getAbsolutePath() );
name = DependencyUtil.getFormattedOutputDirectory( false, true,
folder, (Artifact) artifacts.get( 1 ) );
- expectedResult = folder.getAbsolutePath() + File.separatorChar +
"test-2-war-sources-1.1-SNAPSHOT";
- assertTrue( expectedResult.equalsIgnoreCase( name.getAbsolutePath() )
);
+ expectedResult = folder.getAbsolutePath() + File.separatorChar +
"test-two-war-sources-1.1-SNAPSHOT";
+ assertEquals( expectedResult, name.getAbsolutePath() );
name = DependencyUtil.getFormattedOutputDirectory( true, true, folder,
(Artifact) artifacts.get( 1 ) );
expectedResult = folder.getAbsolutePath() + File.separatorChar +
"wars" + File.separatorChar
- + "test-2-war-sources-1.1-SNAPSHOT";
- assertTrue( expectedResult.equalsIgnoreCase( name.getAbsolutePath() )
);
+ + "test-two-war-sources-1.1-SNAPSHOT";
+ assertEquals( expectedResult, name.getAbsolutePath() );
}
public void testFileName()
@@ -128,12 +129,11 @@
Artifact artifact = (Artifact) artifacts.get( 0 );
String name = DependencyUtil.getFormattedFileName( artifact, false );
- String expectedResult = "1-1.1.jar";
- assertTrue( expectedResult.equalsIgnoreCase( name ) );
-
+ String expectedResult = "one-1.1.jar";
+ assertEquals( expectedResult, name );
name = DependencyUtil.getFormattedFileName( artifact, true );
- expectedResult = "1.jar";
- assertTrue( expectedResult.equalsIgnoreCase( name ) );
+ expectedResult = "one.jar";
+ assertEquals( expectedResult, name );
}
public void testFileNameClassifier()
