Add call prefix for windows batch file, fix SNAPSHOT handling

Author: ahatius

src/main/java/com/github/ahatius/maven/DeploymentGenerator.java

@@ -11,6 +11,7 @@
 import javax.xml.parsers.ParserConfigurationException;
 
 import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.filefilter.DirectoryFileFilter;
 import org.apache.commons.io.filefilter.RegexFileFilter;
 import org.w3c.dom.Document;
@@ -21,7 +22,8 @@
 import com.beust.jcommander.ParameterException;
 
 public class DeploymentGenerator {
-  public DeploymentGenerator(String[] args) throws ParserConfigurationException, IOException, SAXException {
+  public DeploymentGenerator(String[] args)
+          throws ParserConfigurationException, IOException, SAXException {
     // Parse arguments and validate them
     Arguments arguments = new Arguments();
     JCommander cli = new JCommander(arguments);
@@ -36,35 +38,44 @@ public DeploymentGenerator(String[] args) throws ParserConfigurationException, I
     }
 
     Collection<File> files = FileUtils.listFiles(arguments.dir, new RegexFileFilter("^(.*?)\\.pom"),
-        DirectoryFileFilter.DIRECTORY);
+            DirectoryFileFilter.DIRECTORY);
 
     DocumentBuilderFactory documentBuilderFactory = DocumentBuilderFactory.newInstance();
     DocumentBuilder documentBuilder = documentBuilderFactory.newDocumentBuilder();
 
     BufferedWriter writer = new BufferedWriter(new FileWriter(arguments.output));
     try {
+      String prefix = "";
+      if (arguments.windows) {
+        prefix = "call ";
+      } else {
+        writer.write("#!/bin/bash");
+        writer.newLine();
+      }
+
       for (File file : files) {
         Document document = documentBuilder.parse(file);
 
         String groupId = document.getElementsByTagName("groupId").item(0).getTextContent();
         String artifactId = document.getElementsByTagName("artifactId").item(0).getTextContent();
         String version = document.getElementsByTagName("version").item(0).getTextContent();
 
-        File artifact = new File(file.getParent(), artifactId + "-" + version + ".jar");
-        File sources = new File(file.getParent(), artifactId + "-" + version + "-sources.jar");
-        File javadoc = new File(file.getParent(), artifactId + "-" + version + "-javadoc.jar");
+        String filename = FilenameUtils.removeExtension(file.getName());
+        File artifact = new File(file.getParent(), filename + ".jar");
+        File sources = new File(file.getParent(), filename + "-sources.jar");
+        File javadoc = new File(file.getParent(), filename + "-javadoc.jar");
 
-        if(!artifact.isFile()) {
-          System.out.println("Artifact for " + groupId + ":" + artifactId + ":" + version + " not found");
+        if (!artifact.isFile()) {
           continue;
         }
 
         StringBuilder sb = new StringBuilder();
 
-        sb.append("call mvn deploy:deploy-file -DgeneratePom=false ");
+        sb.append(prefix);
+        sb.append("mvn deploy:deploy-file -DgeneratePom=false ");
         sb.append("-Durl=");
 
-        if(!version.toLowerCase().endsWith("-snapshot")) {
+        if (!version.toLowerCase().endsWith("-snapshot")) {
           sb.append(arguments.releaseUrl);
         } else {
           sb.append(arguments.snapshotUrl);
@@ -115,7 +126,7 @@ public DeploymentGenerator(String[] args) throws ParserConfigurationException, I
    * @param args Commandline arguments
    */
   public static void main(String[] args)
-      throws IOException, SAXException, ParserConfigurationException {
+          throws IOException, SAXException, ParserConfigurationException {
     new DeploymentGenerator(args);
   }
 
@@ -140,21 +151,25 @@ private static class Arguments {
     private File dir;
 
     @Parameter(names = {"-r"},
-        description = "The target repository id that is configured in the settings.xml",
-        required = true)
+            description = "The target repository id that is configured in the settings.xml",
+            required = true)
     private String repositoryId;
 
     @Parameter(names = {"-u"}, description = "The target deployment URL for releases",
-        required = true)
+            required = true)
     private String releaseUrl;
 
     @Parameter(names = {"-s"}, description = "The target deployment URL for snapshots",
             required = true)
     private String snapshotUrl;
 
     @Parameter(names = {"-o"},
-        description = "The shell script that should be generated by this application",
-        required = true)
+            description = "The shell script that should be generated by this application",
+            required = true)
     private File output;
+
+    @Parameter(names = {"-w"},
+            description = "Windows batch mode - adds a call command before each mvn command to allow execution within a batch script, otherwise a shell script will be created")
+    private boolean windows;
   }
 }