svn commit: r1161787 - in /incubator/npanday/trunk: components/dotnet-core/src/main/resources/META-INF/npanday/executable-plugins.xml plugins/maven-ilmerge-plugin/src/main/java/npanday/plugin/ilmerge/AssemblyMerger.java

[jfallows]

Author: jfallows
Date: Thu Aug 25 22:39:50 2011
New Revision: 1161787

URL: http://svn.apache.org/viewvc?rev=1161787&view=rev
Log:
Eliminate case-sensitivity confusion for ILRepack.exe on non-Windows 
(case-sensitive) filesystems

Modified:
    
incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/executable-plugins.xml
    
incubator/npanday/trunk/plugins/maven-ilmerge-plugin/src/main/java/npanday/plugin/ilmerge/AssemblyMerger.java

Modified: 
incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/executable-plugins.xml
URL: 
http://svn.apache.org/viewvc/incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/executable-plugins.xml?rev=1161787&r1=1161786&r2=1161787&view=diff
==============================================================================
--- 
incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/executable-plugins.xml
 (original)
+++ 
incubator/npanday/trunk/components/dotnet-core/src/main/resources/META-INF/npanday/executable-plugins.xml
 Thu Aug 25 22:39:50 2011
@@ -524,7 +524,7 @@ under the License.
     <identifier>MS:ILMERGE</identifier>
     <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
     <vendor>MICROSOFT</vendor>
-    <executable>ilmerge</executable>
+    <executable>ILMerge</executable>
     <profile>ILMERGE</profile>
     <frameworkVersions>
       <frameworkVersion>4.0</frameworkVersion>
@@ -541,7 +541,7 @@ under the License.
     <identifier>MS:ILREPACK</identifier>
     <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
     <vendor>MICROSOFT</vendor>
-    <executable>ilrepack</executable>
+    <executable>ILRepack</executable>
     <profile>ILREPACK</profile>
     <frameworkVersions>
       <frameworkVersion>4.0</frameworkVersion>
@@ -558,7 +558,7 @@ under the License.
     <identifier>MONO:ILREPACK</identifier>
     <pluginClass>npanday.executable.impl.DefaultNetExecutable</pluginClass>
     <vendor>MONO</vendor>
-    <executable>ilrepack</executable>
+    <executable>ILRepack</executable>
     <profile>ILREPACK</profile>
     <frameworkVersions>
       <frameworkVersion>4.0</frameworkVersion>

Modified: 
incubator/npanday/trunk/plugins/maven-ilmerge-plugin/src/main/java/npanday/plugin/ilmerge/AssemblyMerger.java
URL: 
http://svn.apache.org/viewvc/incubator/npanday/trunk/plugins/maven-ilmerge-plugin/src/main/java/npanday/plugin/ilmerge/AssemblyMerger.java?rev=1161787&r1=1161786&r2=1161787&view=diff
==============================================================================
--- 
incubator/npanday/trunk/plugins/maven-ilmerge-plugin/src/main/java/npanday/plugin/ilmerge/AssemblyMerger.java
 (original)
+++ 
incubator/npanday/trunk/plugins/maven-ilmerge-plugin/src/main/java/npanday/plugin/ilmerge/AssemblyMerger.java
 Thu Aug 25 22:39:50 2011
@@ -134,7 +134,9 @@ public class AssemblyMerger extends Abst
     private File netHome;
     
     /**
-     * @parameter expression = "${ilmergeCommand}"  default-value="ilmerge"
+     * The ILMerge command name.  Supports either ILMerge (default) or 
ILRepack.
+     *
+     * @parameter expression = "${ilmergeCommand}"  default-value="ILMerge"
      */
     private String executable;