summaryrefslogtreecommitdiff
path: root/src/main/java/org/apache/maven/plugin/nar/NarLayout20.java
diff options
context:
space:
mode:
authorMark Donszelmann <Mark.Donszelmann@gmail.com>2009-11-09 12:03:32 +0100
committerMark Donszelmann <Mark.Donszelmann@gmail.com>2009-11-09 12:03:32 +0100
commite8aea7ca9dc041ef30c3ad44bf4cc040b830f8f0 (patch)
treec550be5f4415b3bac366b469fcc9747f6e950e97 /src/main/java/org/apache/maven/plugin/nar/NarLayout20.java
parent774b54b45b3d7c5d6246150053d4b176c72f169c (diff)
downloadmaven-nar-plugin-e8aea7ca9dc041ef30c3ad44bf4cc040b830f8f0.tar.gz
maven-nar-plugin-e8aea7ca9dc041ef30c3ad44bf4cc040b830f8f0.tar.bz2
maven-nar-plugin-e8aea7ca9dc041ef30c3ad44bf4cc040b830f8f0.tar.xz
maven-nar-plugin-e8aea7ca9dc041ef30c3ad44bf4cc040b830f8f0.zip
Updated doc; Fixed problem with executable ending up in wrong dorectory, NAR-90
Diffstat (limited to 'src/main/java/org/apache/maven/plugin/nar/NarLayout20.java')
-rw-r--r--src/main/java/org/apache/maven/plugin/nar/NarLayout20.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/main/java/org/apache/maven/plugin/nar/NarLayout20.java b/src/main/java/org/apache/maven/plugin/nar/NarLayout20.java
index c49ac2c..79e3e20 100644
--- a/src/main/java/org/apache/maven/plugin/nar/NarLayout20.java
+++ b/src/main/java/org/apache/maven/plugin/nar/NarLayout20.java
@@ -102,6 +102,7 @@ public class NarLayout20
+ "/**" );
narInfo.setNar( null, Library.EXECUTABLE, project.getGroupId() + ":" + project.getArtifactId() + ":"
+ NarConstants.NAR_TYPE + ":" + "${aol}" + "-" + Library.EXECUTABLE );
+ narInfo.setBinding( new AOL(binAOL[i]), Library.EXECUTABLE );
}
File libDir = new File( baseDir, "lib" );
@@ -124,9 +125,10 @@ public class NarLayout20
}
}
- if ( narInfo.getBinding( null, null ) == null )
+ AOL aol = new AOL(libAOL[i]);
+ if ( narInfo.getBinding( aol, null ) == null )
{
- narInfo.setBinding( null, bindingType != null ? bindingType : Library.NONE );
+ narInfo.setBinding( aol, bindingType != null ? bindingType : Library.NONE );
}
}
}