diff options
author | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-11-19 08:01:35 +0100 |
---|---|---|
committer | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-11-19 08:01:35 +0100 |
commit | bafa84b1d80b115105390264ae7f40aa600714fc (patch) | |
tree | 48eeda923393e8d12f1ec6baf748b34d0835e974 /src/main/java/org/apache/maven/plugin/nar/NarLayout21.java | |
parent | e791cdf4b2cbcfbdeb42fb7db88c123cd21f37c4 (diff) | |
download | maven-nar-plugin-bafa84b1d80b115105390264ae7f40aa600714fc.tar.gz maven-nar-plugin-bafa84b1d80b115105390264ae7f40aa600714fc.tar.bz2 maven-nar-plugin-bafa84b1d80b115105390264ae7f40aa600714fc.tar.xz maven-nar-plugin-bafa84b1d80b115105390264ae7f40aa600714fc.zip |
Fixed NAR-105
Diffstat (limited to 'src/main/java/org/apache/maven/plugin/nar/NarLayout21.java')
-rw-r--r-- | src/main/java/org/apache/maven/plugin/nar/NarLayout21.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarLayout21.java b/src/main/java/org/apache/maven/plugin/nar/NarLayout21.java index 9968caf..8301330 100644 --- a/src/main/java/org/apache/maven/plugin/nar/NarLayout21.java +++ b/src/main/java/org/apache/maven/plugin/nar/NarLayout21.java @@ -5,6 +5,7 @@ import java.io.File; import org.apache.maven.plugin.MojoExecutionException; import org.apache.maven.project.MavenProject; import org.apache.maven.project.MavenProjectHelper; +import org.codehaus.plexus.archiver.manager.ArchiverManager; /* * Licensed to the Apache Software Foundation (ASF) under one @@ -104,12 +105,12 @@ public class NarLayout21 * @see org.apache.maven.plugin.nar.NarLayout#attachNars(java.io.File, org.apache.maven.project.MavenProjectHelper, * org.apache.maven.project.MavenProject, org.apache.maven.plugin.nar.NarInfo) */ - public final void attachNars( File baseDir, MavenProjectHelper projectHelper, MavenProject project, NarInfo narInfo ) + public final void attachNars( File baseDir, ArchiverManager archiverManager, MavenProjectHelper projectHelper, MavenProject project, NarInfo narInfo ) throws MojoExecutionException { if ( getNoarchDirectory( baseDir ).exists() ) { - attachNar( projectHelper, project, NarConstants.NAR_NO_ARCH, getNoarchDirectory( baseDir ), "*/**" ); + attachNar( archiverManager, projectHelper, project, NarConstants.NAR_NO_ARCH, getNoarchDirectory( baseDir ), "*/**" ); narInfo.setNar( null, NarConstants.NAR_NO_ARCH, project.getGroupId() + ":" + project.getArtifactId() + ":" + NarConstants.NAR_TYPE + ":" + NarConstants.NAR_NO_ARCH ); } @@ -119,7 +120,7 @@ public class NarLayout21 for ( int i = 0; ( classifier != null ) && ( i < classifier.length ); i++ ) { File dir = new File( classifierDir, classifier[i] ); - attachNar( projectHelper, project, classifier[i], dir, "*/**" ); + attachNar( archiverManager, projectHelper, project, classifier[i], dir, "*/**" ); String type = null; AOL aol = null; |