Author: bentmann Date: Mon Mar 9 20:08:18 2009 New Revision: 751820 URL: http://svn.apache.org/viewvc?rev=751820&view=rev Log: o Made active artifact behave more like a wrapper
Modified: maven/components/branches/MNG-3043/maven-project/src/main/java/org/apache/maven/project/artifact/ActiveProjectOutputArtifact.java Modified: maven/components/branches/MNG-3043/maven-project/src/main/java/org/apache/maven/project/artifact/ActiveProjectOutputArtifact.java URL: http://svn.apache.org/viewvc/maven/components/branches/MNG-3043/maven-project/src/main/java/org/apache/maven/project/artifact/ActiveProjectOutputArtifact.java?rev=751820&r1=751819&r2=751820&view=diff ============================================================================== --- maven/components/branches/MNG-3043/maven-project/src/main/java/org/apache/maven/project/artifact/ActiveProjectOutputArtifact.java (original) +++ maven/components/branches/MNG-3043/maven-project/src/main/java/org/apache/maven/project/artifact/ActiveProjectOutputArtifact.java Mon Mar 9 20:08:18 2009 @@ -65,6 +65,10 @@ */ public static Artifact newInstance( MavenProject project, Artifact artifact ) { + if ( artifact instanceof ActiveProjectOutputArtifact ) + { + return artifact; + } if ( artifact.getArtifactHandler().isAddedToClasspath() ) { return new ActiveProjectOutputArtifact( project, artifact ); @@ -89,6 +93,12 @@ /** {...@inheritdoc} */ public File getFile() { + File file = artifact.getFile(); + if ( file != null && file.exists() ) + { + return file; + } + String path; if ( isTestArtifact( artifact ) ) { @@ -98,7 +108,7 @@ { path = project.getBuild().getOutputDirectory(); } - File file = new File( path ); + file = new File( path ); return file.isDirectory() ? file : null; } @@ -124,7 +134,7 @@ /** {...@inheritdoc} */ public void setFile( File destination ) { - throw new UnsupportedOperationException(); + artifact.setFile( destination ); } /** {...@inheritdoc} */