diff options
| author | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-12-15 22:53:33 +0100 |
|---|---|---|
| committer | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-12-15 22:53:33 +0100 |
| commit | 54c4c84888b840be561565f79654e59f80766ecc (patch) | |
| tree | bcf346d5dc996fa77e840e30f643ceb47dac3b00 /src/main/java/org/apache/maven/plugin/nar/AbstractResourcesMojo.java | |
| parent | 8c046e79b56e71bd0a9f3787712963bc2523d8f1 (diff) | |
| download | maven-nar-plugin-54c4c84888b840be561565f79654e59f80766ecc.tar.gz maven-nar-plugin-54c4c84888b840be561565f79654e59f80766ecc.tar.bz2 maven-nar-plugin-54c4c84888b840be561565f79654e59f80766ecc.tar.xz maven-nar-plugin-54c4c84888b840be561565f79654e59f80766ecc.zip | |
Fixed NAR-90 and NAR-118
Diffstat (limited to 'src/main/java/org/apache/maven/plugin/nar/AbstractResourcesMojo.java')
| -rw-r--r-- | src/main/java/org/apache/maven/plugin/nar/AbstractResourcesMojo.java | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/src/main/java/org/apache/maven/plugin/nar/AbstractResourcesMojo.java b/src/main/java/org/apache/maven/plugin/nar/AbstractResourcesMojo.java index 2b6b5bb..15f4119 100644 --- a/src/main/java/org/apache/maven/plugin/nar/AbstractResourcesMojo.java +++ b/src/main/java/org/apache/maven/plugin/nar/AbstractResourcesMojo.java @@ -81,7 +81,9 @@ public abstract class AbstractResourcesMojo File includeDir = new File( srcDir, resourceIncludeDir ); if ( includeDir.exists() ) { - File includeDstDir = getLayout().getIncludeDirectory( getTargetDirectory() ); + File includeDstDir = + getLayout().getIncludeDirectory( getTargetDirectory(), getMavenProject().getArtifactId(), + getMavenProject().getVersion() ); getLog().debug( "Copying includes from " + includeDir + " to " + includeDstDir ); copied += NarUtil.copyDirectoryStructure( includeDir, includeDstDir, null, NarUtil.DEFAULT_EXCLUDES ); } @@ -98,7 +100,9 @@ public abstract class AbstractResourcesMojo File binDir = new File( srcDir, resourceBinDir ); if ( binDir.exists() ) { - File binDstDir = getLayout().getBinDirectory( getTargetDirectory(), aol ); + File binDstDir = + getLayout().getBinDirectory( getTargetDirectory(), getMavenProject().getArtifactId(), + getMavenProject().getVersion(), aol ); getLog().debug( "Copying binaries from " + binDir + " to " + binDstDir ); copied += NarUtil.copyDirectoryStructure( binDir, binDstDir, null, NarUtil.DEFAULT_EXCLUDES ); } @@ -120,7 +124,9 @@ public abstract class AbstractResourcesMojo { Library library = (Library) i.next(); String type = library.getType(); - File libDstDir = getLayout().getLibDirectory( getTargetDirectory(), aol, type ); + File libDstDir = + getLayout().getLibDirectory( getTargetDirectory(), getMavenProject().getArtifactId(), + getMavenProject().getVersion(), aol, type ); getLog().debug( "Copying libraries from " + libDir + " to " + libDstDir ); // filter files for lib |