From 0121e954df7ebaf38eeeba74e5748db2760fb75e Mon Sep 17 00:00:00 2001 From: Mark Donszelmann Date: Mon, 9 Nov 2009 15:43:58 +0100 Subject: Re-enable EXECUTABLE binding --- .../java/org/apache/maven/plugin/nar/NarLayout20.java | 4 ++-- .../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 { -- cgit v1.2.3