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

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

Author: scott.stark at jboss.org
Date: 2008-03-06 19:42:39 -0500 (Thu, 06 Mar 2008)
New Revision: 70532

Modified:
   projects/ejb3/trunk/installer/src/main/java/org/jboss/ejb3/installer/Installer.java
Log:
Add an ANT_CMD env setting to allow one to override the ant command to use.

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-07 00:01:18 UTC (rev 70531)
+++ projects/ejb3/trunk/installer/src/main/java/org/jboss/ejb3/installer/Installer.java	2008-03-07 00:42:39 UTC (rev 70532)
@@ -69,6 +69,10 @@
     * Environment Property key for ANT_HOME 
     */
    private static final String ENV_PROPERTY_ANT_HOME = "ANT_HOME";
+   /*
+    * Environment Property key for ANT_CMD 
+    */
+   private static final String ENV_PROPERTY_ANT_CMD = "ANT_CMD";
 
    /*
     * Environment Property key for the Installation location
@@ -320,20 +324,26 @@
       Process antProcess = null;
       String buildfile = this.getInstallationDirectory() + File.separator + Installer.FILENAME_BUILDFILE;
 
-      // Obtain ANT_HOME and ensure specified
-      String antHome = System.getenv(Installer.ENV_PROPERTY_ANT_HOME);
-      if (antHome == null || "".equals(antHome))
+      // Try
+      String antCommandPath = System.getenv(Installer.ENV_PROPERTY_ANT_CMD);
+      if(antCommandPath == null)
       {
-         throw new RuntimeException("Environment Variable '" + Installer.ENV_PROPERTY_ANT_HOME + "' must be specified.");
+         // Obtain ANT_HOME and ensure specified
+         String antHome = System.getenv(Installer.ENV_PROPERTY_ANT_HOME);
+         if (antHome == null || "".equals(antHome))
+         {
+            throw new RuntimeException("Environment Variable '" + Installer.ENV_PROPERTY_ANT_HOME + "' must be specified.");
+         }
+         this.getPrintStream().println("Using ANT_HOME: " + antHome);
+   
+         // Construct "ant" command path
+         antCommandPath = antHome + File.separator + "bin" + File.separator + Installer.COMMAND_ANT;
       }
-      this.getPrintStream().println("Using ANT_HOME: " + antHome);
 
-      // Construct "ant" command path
-      String antCommandPath = antHome + File.separator + "bin" + File.separator + Installer.COMMAND_ANT;
-
       // If "ant" doesn't exist
       if (!new File(antCommandPath).exists())
       {
+         this.getPrintStream().println(antCommandPath+" does not existing, trying .bat extension");
          // Add batch extension
          antCommandPath = antCommandPath + Installer.COMMAND_EXTENSION_BATCH;
       }