Author: richard.opalka(a)jboss.com Date: 2008-09-28 13:30:49 -0400 (Sun, 28 Sep 2008) New Revision: 8280 Modified: framework/trunk/testsuite/test/ant-import/build-testsuite.xml framework/trunk/testsuite/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java Log: [JBWS-2322] final regression fix Modified: framework/trunk/testsuite/test/ant-import/build-testsuite.xml =================================================================== --- framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2008-09-28 14:21:25 UTC (rev 8279) +++ framework/trunk/testsuite/test/ant-import/build-testsuite.xml 2008-09-28 17:30:49 UTC (rev 8280) @@ -423,6 +423,7 @@ <sysproperty key="org.jboss.ws.wsse.trustStoreType" value="jks"/> <sysproperty key="test.archive.directory" value="${tests.output.dir}/test-libs"/> <sysproperty key="test.resources.directory" value="${tests.output.dir}/test-resources"/> + <sysproperty key="binary.distribution" value="true"/> <classpath> <path refid="tests.client.classpath"/> <pathelement location="${tests.output.dir}/test-classes"/> @@ -483,6 +484,7 @@ <sysproperty key="org.jboss.ws.wsse.trustStoreType" value="jks"/> <sysproperty key="test.archive.directory" value="${tests.output.dir}/test-libs"/> <sysproperty key="test.resources.directory" value="${tests.output.dir}/test-resources"/> + <sysproperty key="binary.distribution" value="true"/> <classpath> <path refid="tests.client.classpath"/> <pathelement location="${tests.output.dir}/test-classes"/> Modified: framework/trunk/testsuite/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java =================================================================== --- framework/trunk/testsuite/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java 2008-09-28 14:21:25 UTC (rev 8279) +++ framework/trunk/testsuite/test/java/org/jboss/test/ws/projectGenerator/ProjectGeneratorTestCase.java 2008-09-28 17:30:49 UTC (rev 8280) @@ -22,7 +22,6 @@ package org.jboss.test.ws.projectGenerator; import java.io.BufferedWriter; -import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileWriter; import java.net.URL; @@ -31,7 +30,6 @@ import javax.xml.ws.Service; import org.jboss.wsf.test.JBossWSTest; -import org.jboss.wsf.test.JBossWSTestHelper; /** * A test case for the user project generator: @@ -160,20 +158,6 @@ private boolean isDistroTest() throws Exception { - if (binDistroDir == null) - return false; - - File build = new File(binDistroDir, "build.xml"); - if (!build.exists()) - { - String testResDir = JBossWSTestHelper.getTestResourcesDir(); - build = new File(testResDir.substring(0, testResDir.lastIndexOf("modules")) + "build.xml"); - } - if (!build.exists()) - throw new Exception("Unable to find build.xml!"); - - ByteArrayOutputStream baos = new ByteArrayOutputStream(); - executeCommand(ANT_SHELL + " -f " + build.getAbsolutePath() + " -p", baos); - return !(new String(baos.toByteArray()).contains("build-bin-dist")); + return Boolean.getBoolean("binary.distribution"); } }