diff options
| author | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-11-09 15:43:58 +0100 |
|---|---|---|
| committer | Mark Donszelmann <Mark.Donszelmann@gmail.com> | 2009-11-09 15:43:58 +0100 |
| commit | 0121e954df7ebaf38eeeba74e5748db2760fb75e (patch) | |
| tree | 2884256d2a011f7634a37aa4092595723df9abc8 | |
| parent | 7fc1230b2d14b43e1957a6c444c460206139264b (diff) | |
| download | maven-nar-plugin-0121e954df7ebaf38eeeba74e5748db2760fb75e.tar.gz maven-nar-plugin-0121e954df7ebaf38eeeba74e5748db2760fb75e.tar.bz2 maven-nar-plugin-0121e954df7ebaf38eeeba74e5748db2760fb75e.tar.xz maven-nar-plugin-0121e954df7ebaf38eeeba74e5748db2760fb75e.zip | |
Re-enable EXECUTABLE binding
| -rw-r--r-- | src/main/java/org/apache/maven/plugin/nar/NarLayout20.java | 4 | ||||
| -rw-r--r-- | src/main/java/org/apache/maven/plugin/nar/NarLayout21.java | 16 |
2 files changed, 10 insertions, 10 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 3ed2a50..d72e640 100644 --- a/src/main/java/org/apache/maven/plugin/nar/NarLayout20.java +++ b/src/main/java/org/apache/maven/plugin/nar/NarLayout20.java @@ -102,8 +102,8 @@ 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 ); -// narInfo.setBinding( null, Library.EXECUTABLE ); + narInfo.setBinding( new AOL(binAOL[i]), Library.EXECUTABLE ); + narInfo.setBinding( null, Library.EXECUTABLE ); } File libDir = new File( baseDir, "lib" ); 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 73b40b8..3761860 100644 --- a/src/main/java/org/apache/maven/plugin/nar/NarLayout21.java +++ b/src/main/java/org/apache/maven/plugin/nar/NarLayout21.java @@ -131,14 +131,14 @@ public class NarLayout21 type = Library.EXECUTABLE; aol = new AOL(aolDir[0]); -// if ( narInfo.getBinding( aol, null ) == null ) -// { -// narInfo.setBinding( aol, Library.EXECUTABLE ); -// } -// if ( narInfo.getBinding( null, null ) == null ) -// { -// narInfo.setBinding( null, Library.EXECUTABLE ); -// } + if ( narInfo.getBinding( aol, null ) == null ) + { + narInfo.setBinding( aol, Library.EXECUTABLE ); + } + if ( narInfo.getBinding( null, null ) == null ) + { + narInfo.setBinding( null, Library.EXECUTABLE ); + } } else { |