From 54c4c84888b840be561565f79654e59f80766ecc Mon Sep 17 00:00:00 2001 From: Mark Donszelmann Date: Tue, 15 Dec 2009 22:53:33 +0100 Subject: Fixed NAR-90 and NAR-118 --- .../java/org/apache/maven/plugin/nar/NarLayout.java | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'src/main/java/org/apache/maven/plugin/nar/NarLayout.java') diff --git a/src/main/java/org/apache/maven/plugin/nar/NarLayout.java b/src/main/java/org/apache/maven/plugin/nar/NarLayout.java index cdb4ba7..64455aa 100644 --- a/src/main/java/org/apache/maven/plugin/nar/NarLayout.java +++ b/src/main/java/org/apache/maven/plugin/nar/NarLayout.java @@ -39,16 +39,16 @@ public interface NarLayout /** * Specifies where all the "no architecture" specific files are stored */ - File getNoArchDirectory( File baseDir ) + File getNoArchDirectory( File baseDir, String artifactId, String version ) throws MojoExecutionException, MojoFailureException; - + /** * Specifies where libraries are stored * * @return * @throws MojoExecutionException, MojoFailureException */ - File getLibDirectory( File baseDir, String aol, String type ) + File getLibDirectory( File baseDir, String artifactId, String version, String aol, String type ) throws MojoExecutionException, MojoFailureException; /** @@ -56,7 +56,7 @@ public interface NarLayout * * @return */ - File getIncludeDirectory( File baseDir ) + File getIncludeDirectory( File baseDir, String artifactId, String version ) throws MojoExecutionException, MojoFailureException; /** @@ -64,7 +64,7 @@ public interface NarLayout * * @return */ - File getBinDirectory( File baseDir, String aol ) + File getBinDirectory( File baseDir, String artifactId, String version, String aol ) throws MojoExecutionException, MojoFailureException; /** @@ -74,4 +74,12 @@ public interface NarLayout void attachNars( File baseDir, ArchiverManager archiverManager, MavenProjectHelper projectHelper, MavenProject project, NarInfo narInfo ) throws MojoExecutionException, MojoFailureException; + + /** + * Called to unpack a nar file + * @param defaultAOL + * @param linkerName + */ + void unpackNar( ArchiverManager archiverManager, File file, String os, String linkerName, AOL defaultAOL ) + throws MojoExecutionException, MojoFailureException; } -- cgit v1.2.3