MPCRUISECONTROL-15 Lost script extension

when use "maven cruisecontrol:configure" command


git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@116243 13f79535-47bb-0310-9956-ffa450edef68

cruisecontrol/plugin.jelly

@@ -55,6 +55,15 @@
   <goal name="cruisecontrol:configure"
     description="Update a Cruise Control configuration file with this project"
     prereqs="cruisecontrol:validate">
+    
+    <j:choose>
+      <j:when test="${systemScope['os.name'].startsWith('Windows')}">
+        <j:set var="mavenScriptExtension" value=".bat"/>
+      </j:when>
+      <j:otherwise>
+        <j:set var="mavenScriptExtension" value=".sh"/>
+      </j:otherwise>
+    </j:choose>    
     <x:parse var="doc"><cruisecontrol></cruisecontrol></x:parse>
     <util:available file="${maven.cruisecontrol.config}">
       <util:file var="inputFile" name="${maven.cruisecontrol.config}" />

cruisecontrol/src/plugin-resources/cruisecontrol.jsl

@@ -67,7 +67,7 @@
         <j:when test="${type == 'time'}">
         <schedule>
           <maven
-            mavenscript="${maven.cruisecontrol.mavenhome}/bin/maven"
+            mavenscript="${maven.cruisecontrol.mavenhome}/bin/maven${mavenScriptExtension}"
             time="${maven.cruisecontrol.schedule.time}"
             goal="${maven.cruisecontrol.goals}" 
             projectfile="${maven.cruisecontrol.checkout.dir}/${module}/project.xml"/>
@@ -76,7 +76,7 @@
         <j:otherwise>
         <schedule interval="${maven.cruisecontrol.schedule.interval}">
           <maven
-            mavenscript="${maven.cruisecontrol.mavenhome}/bin/maven"
+            mavenscript="${maven.cruisecontrol.mavenhome}/bin/maven${mavenScriptExtension}"
             goal="${maven.cruisecontrol.goals}"
             projectfile="${maven.cruisecontrol.checkout.dir}/${module}/project.xml"/>
         </schedule>

cruisecontrol/xdocs/changes.xml

@@ -25,6 +25,7 @@
   </properties>
   <body>
     <release version="1.6" date="in cvs">
+      <action dev="epugh" type="add" issue="MPCRUISECONTROL-15">Lost script extension when use "maven cruisecontrol:configure" command</action>        
       <action dev="epugh" type="add" issue="MPCRUISECONTROL-14" due-to="Marcin Gurbisz">Add more configuration, especially better handling of emails.</action>        
       <action dev="evenisse" type="add" issue="MPCRUISECONTROL-12" due-to="Alexandre Vivien">Add new properties to the maven cruisecontrol plugin. Ftp publisher, Scp publisher.</action>
     </release>