[jboss-cvs] JBossAS SVN: r70526 - projects/ejb3/trunk/installer/src/main/java/org/jboss/ejb3/installer.

[jboss-cvs-commits at lists.jboss.org]

Author: ALRubinger
Date: 2008-03-06 17:58:53 -0500 (Thu, 06 Mar 2008)
New Revision: 70526

Modified:
   projects/ejb3/trunk/installer/src/main/java/org/jboss/ejb3/installer/Installer.java
Log:
[EJBTHREE-1205] Check for existence of "ant", not Win32 directly, before adding batch extension.

Modified: projects/ejb3/trunk/installer/src/main/java/org/jboss/ejb3/installer/Installer.java
===================================================================
--- projects/ejb3/trunk/installer/src/main/java/org/jboss/ejb3/installer/Installer.java	2008-03-06 22:42:28 UTC (rev 70525)
+++ projects/ejb3/trunk/installer/src/main/java/org/jboss/ejb3/installer/Installer.java	2008-03-06 22:58:53 UTC (rev 70526)
@@ -103,7 +103,7 @@
    /*
     * Extension to append to Windows-based systems
     */
-   private static final String COMMAND_EXTENSION_WINDOWS = ".bat";
+   private static final String COMMAND_EXTENSION_BATCH = ".bat";
 
    /*
     * Switch to set buildfile for Ant
@@ -333,17 +333,18 @@
       }
       this.getPrintStream().println("Using ANT_HOME: " + antHome);
 
-      // Construct "ant" command
-      String antCommand = antHome + File.separator + "bin" + File.separator + Installer.COMMAND_ANT;
+      // Construct "ant" command path
+      String antCommandPath = antHome + File.separator + "bin" + File.separator + Installer.COMMAND_ANT;
 
-      // Windows Hack
-      if (System.getProperty(Installer.SYSTEM_PROPERTY_OS).trim().toLowerCase().contains("windows"))
+      // If "ant" doesn't exist
+      if (!new File(antCommandPath).exists())
       {
-         antCommand = antCommand + Installer.COMMAND_EXTENSION_WINDOWS;
+         // Add batch extension
+         antCommandPath = antCommandPath + Installer.COMMAND_EXTENSION_BATCH;
       }
 
       // Construct the Process
-      ProcessBuilder antProcessBuilder = new ProcessBuilder(antCommand, Installer.SWITCH_ANT_BUILDFILE, buildfile);
+      ProcessBuilder antProcessBuilder = new ProcessBuilder(antCommandPath, Installer.SWITCH_ANT_BUILDFILE, buildfile);
       antProcessBuilder.redirectErrorStream(true);
       antProcessBuilder.environment().put(Installer.ENV_PROPERTY_JBOSS_HOME,
             this.getJbossAsInstallationDirectory().getAbsolutePath());
@@ -354,7 +355,7 @@
       {
          // Start the Process
          this.getPrintStream().println(
-               "Starting Ant> " + antCommand + " " + Installer.SWITCH_ANT_BUILDFILE + " " + buildfile);
+               "Starting Ant> " + antCommandPath + " " + Installer.SWITCH_ANT_BUILDFILE + " " + buildfile);
          antProcess = antProcessBuilder.start();
 
          // Capture the output