Added test for layout change, it0016

1 files changed, 18 insertions, 13 deletions

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 fe1a5e4..a264ea2 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarLayout.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarLayout.java
@@ -2,6 +2,10 @@ package org.apache.maven.plugin.nar;
 
 import java.io.File;
 
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.MavenProjectHelper;
+
 /*
 
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,37 +27,38 @@ import java.io.File;
  */
 
 /**
- * Interface to define the layout of nar files (executables, libs, include dirs) in both the
- * repository (local, unpacked) as well as in target.
+ * Interface to define the layout of nar files (executables, libs, include dirs) in both the repository (local,
+ * unpacked) as well as in target.
  * 
  * @author Mark Donszelmann (Mark.Donszelmann@gmail.com)
  */
 public interface NarLayout
 {
     /**
-     * Specified wgere the noarch specific includes are unpacked
+     * Specifies where libraries are stored
      * 
      * @return
      */
-    public File getNoarchDirectory( File baseDir );
+    public File getLibDirectory( File baseDir, String aol, String type );
 
     /**
-     * Specifies where the aol specific libs are unpacked
-     *
+     * Specifies where includes are stored
+     * 
      * @return
      */
-    public File getAolDirectory( File baseDir );
-    
+    public File getIncludeDirectory( File targetDirectory );
+
     /**
-     * Specifies where libraries are stored
+     * Specifies where binaries are stored
      * 
      * @return
      */
-    public File getLibDirectory(File baseDir, String aol, String type);
+    public File getBinDirectory( File baseDir, String aol );
 
     /**
-     * Specifies where includes are stored
-     * @return
+     * Called to attach nars to main jar file. This method needs to produce all the attached nar files and set NarInfo
+     * accordingly.
      */
-    public File getIncludeDirectory( File targetDirectory );
+    public void attachNars( File baseDir, MavenProjectHelper projectHelper, MavenProject project, NarInfo narInfo )
+        throws MojoExecutionException;
 }