diff options
Diffstat (limited to 'src/main')
| -rw-r--r-- | src/main/java/org/apache/maven/plugin/nar/NarLayout20.java | 7 | ||||
| -rw-r--r-- | src/main/java/org/apache/maven/plugin/nar/NarLayout21.java | 17 |
2 files changed, 19 insertions, 5 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 79e3e20..3ed2a50 100644 --- a/src/main/java/org/apache/maven/plugin/nar/NarLayout20.java +++ b/src/main/java/org/apache/maven/plugin/nar/NarLayout20.java @@ -102,7 +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( new AOL(binAOL[i]), Library.EXECUTABLE ); +// narInfo.setBinding( null, Library.EXECUTABLE ); } File libDir = new File( baseDir, "lib" ); @@ -130,6 +131,10 @@ public class NarLayout20 { narInfo.setBinding( aol, bindingType != null ? bindingType : Library.NONE ); } + if ( narInfo.getBinding( null, null ) == null ) + { + narInfo.setBinding( null, bindingType != null ? bindingType : Library.NONE ); + } } } } 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 34bcd06..73b40b8 100644 --- a/src/main/java/org/apache/maven/plugin/nar/NarLayout21.java +++ b/src/main/java/org/apache/maven/plugin/nar/NarLayout21.java @@ -131,10 +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( aol, null ) == null ) +// { +// narInfo.setBinding( aol, Library.EXECUTABLE ); +// } +// if ( narInfo.getBinding( null, null ) == null ) +// { +// narInfo.setBinding( null, Library.EXECUTABLE ); +// } } else { @@ -159,6 +163,11 @@ public class NarLayout21 { narInfo.setBinding( aol, type ); } + // and not set or override if SHARED + if (( narInfo.getBinding( null, null ) == null ) || type.equals( Library.SHARED ) ) + { + narInfo.setBinding( null, type ); + } } assert(type != null); |