[seam-commits] Seam SVN: r11596 - in branches/community/Seam_2_2/src/test/ftest: seamgen/src/main/org/jboss/seam/test/functional/seamgen and 1 other directories.

[seam-commits at lists.jboss.org]

Author: oskutka at redhat.com
Date: 2009-10-16 09:17:31 -0400 (Fri, 16 Oct 2009)
New Revision: 11596

Modified:
   branches/community/Seam_2_2/src/test/ftest/ftest.properties
   branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/SeamGenTest.java
   branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils/SeamGenAdapter.java
Log:
JBSEAM-4445 Use rutime.exec to call ant targets in functional tests, added default value for ant.exec

Modified: branches/community/Seam_2_2/src/test/ftest/ftest.properties
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/ftest.properties	2009-10-16 12:31:40 UTC (rev 11595)
+++ branches/community/Seam_2_2/src/test/ftest/ftest.properties	2009-10-16 13:17:31 UTC (rev 11596)
@@ -100,4 +100,4 @@
 test.package=com.example.test
 richfaces.skin=classic
 icefaces.home=
-ant.exec=/usr/bin/ant
+# ant.exec=/usr/bin/ant

Modified: branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/SeamGenTest.java
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/SeamGenTest.java	2009-10-16 12:31:40 UTC (rev 11595)
+++ branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/SeamGenTest.java	2009-10-16 13:17:31 UTC (rev 11596)
@@ -157,7 +157,7 @@
       ftestProperties.load(new FileInputStream(SEAM_FTEST_PROPERTIES_FILE));
       
       WORKSPACE = getProperty(ftestProperties,"workspace.home");
-      ANT_EXECUTABLE = getProperty(ftestProperties, "ant.exec");
+      ANT_EXECUTABLE = getProperty(ftestProperties, "ant.exec", "ant");
       
       // container specific
       CONTAINER = getProperty(ftestProperties, "container", "jboss5");

Modified: branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils/SeamGenAdapter.java
===================================================================
--- branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils/SeamGenAdapter.java	2009-10-16 12:31:40 UTC (rev 11595)
+++ branches/community/Seam_2_2/src/test/ftest/seamgen/src/main/org/jboss/seam/test/functional/seamgen/utils/SeamGenAdapter.java	2009-10-16 13:17:31 UTC (rev 11596)
@@ -74,8 +74,9 @@
       try
       {
          OutputStreamFeeder feeder = null;
-         String antExecutable = getAntCommand(task);
-         Process process = Runtime.getRuntime().exec((antExecutable));
+         String antCommand = getAntCommand(task);
+         out.print(antCommand);
+         Process process = Runtime.getRuntime().exec((antCommand));
          if (properties != null && properties.length > 0)
          {
             feeder = new OutputStreamFeeder(process.getOutputStream(), out, properties);