Author: thomas.diesler(a)jboss.com Date: 2007-08-23 05:02:27 -0400 (Thu, 23 Aug 2007) New Revision: 4474 Modified: framework/trunk/src/test/ant-import/build-testsuite.xml Log: Verify availability of tools.jar Modified: framework/trunk/src/test/ant-import/build-testsuite.xml =================================================================== --- framework/trunk/src/test/ant-import/build-testsuite.xml 2007-08-22 14:44:46 UTC (rev 4473) +++ framework/trunk/src/test/ant-import/build-testsuite.xml 2007-08-23 09:02:27 UTC (rev 4474) @@ -28,6 +28,15 @@ <!-- Verify required properties that must be set before this file is imported --> <fail message="Tests output dir not set." unless="tests.output.dir"/> + <!-- Verify availabililty of tools.jar --> + <condition property="tools.jar" value="${java.home}/lib/tools.jar"> + <available file="${java.home}/lib/tools.jar"/> + </condition> + <condition property="tools.jar" value="${java.home}/../lib/tools.jar"> + <available file="${java.home}/../lib/tools.jar"/> + </condition> + <fail message="Not available: ${java.home}/lib/tools.jar, ${java.home}/../lib/tools.jar" unless="tools.jar"/> + <!-- Use -Ddebug=true for remote debugging --> <condition property="remote.debug.line" value="-Xdebug -Xnoagent -Djava.compiler=NONE -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=5005"> <isset property="debug"/> @@ -131,7 +140,6 @@ <pathelement location="${jboss.client}/jaxb-api.jar"/> <pathelement location="${jboss.client}/jaxb-impl.jar"/> <pathelement location="${jboss.client}/jaxb-xjc.jar"/> - <pathelement location="${jboss.client}/jboss-jboss50.jar"/> <pathelement location="${jboss.client}/jboss-remoting.jar"/> <pathelement location="${jboss.client}/jboss-xml-binding.jar"/> <pathelement location="${jboss.client}/jbossall-client.jar"/> @@ -148,7 +156,7 @@ <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/> <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/> <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/> - <pathelement location="${env.JAVA_HOME}/lib/tools.jar"/> + <pathelement location="${tools.jar}"/> </path> </target> @@ -204,7 +212,7 @@ <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/> <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/> <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/> - <pathelement location="${env.JAVA_HOME}/lib/tools.jar"/> + <pathelement location="${tools.jar}"/> </path> </target> @@ -257,7 +265,7 @@ <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi.jar"/> <pathelement location="${jboss.server.deploy}/juddi-service.sar/juddi-saaj.jar"/> <pathelement location="${jboss.server.deploy}/juddi-service.sar/scout.jar"/> - <pathelement location="${env.JAVA_HOME}/lib/tools.jar"/> + <pathelement location="${tools.jar}"/> </path> </target>