[jbossws-commits] JBossWS SVN: r1692 - in branches/tdiesler/trunk/jbossws/src: main/resources test

Author: thomas.diesler(a)jboss.com Date: 2006-12-21 09:30:54 -0500 (Thu, 21 Dec 2006) New Revision: 1692 Removed: branches/tdiesler/trunk/jbossws/src/main/resources/jbossws.deployer/ Modified: branches/tdiesler/trunk/jbossws/src/test/build.xml Log: partial commit Modified: branches/tdiesler/trunk/jbossws/src/test/build.xml =================================================================== --- branches/tdiesler/trunk/jbossws/src/test/build.xml 2006-12-21 13:48:05 UTC (rev 1691) +++ branches/tdiesler/trunk/jbossws/src/test/build.xml 2006-12-21 14:30:54 UTC (rev 1692) @@ -10,16 +10,16 @@ <project name="JBossWS-Tests" default="main" basedir="../.."> - <import file="${basedir}/src/ant/build-thirdparty.xml"/> + <import file="${basedir}/../build/import/build-thirdparty.xml"/> <!-- ================================================================== --> <!-- Setup --> <!-- ================================================================== --> - <property file="${basedir}/ant.properties"/> - <property file="${basedir}/version.properties"/> + <property file="${basedir}/../build/ant.properties"/> + <property file="${basedir}/../build/version.properties"/> - <property name="build.dir" value="${basedir}/output"/> + <property name="build.dir" value="${basedir}/../build/output"/> <property name="build.lib.dir" value="${build.dir}/lib"/> <property name="build.resources.dir" value="${build.dir}/resources"/> <property name="build.tests.dir" value="${build.dir}/tests"/> @@ -27,22 +27,13 @@ <property name="test.etc.dir" value="${test.dir}/etc"/> <property name="test.java.dir" value="${test.dir}/java"/> <property name="test.resources.dir" value="${test.dir}/resources"/> - <property name="thirdparty.dir" value="${basedir}/thirdparty"/> + <property name="thirdparty.dir" value="${basedir}/../build/thirdparty"/> + <!-- JDK Detection --> <available classname="java.lang.StackTraceElement" property="HAVE_JDK_1.4"/> <available classname="java.lang.Enum" property="HAVE_JDK_1.5"/> - <!-- JBoss Home --> - <condition property="jboss.home" value="${jboss.jdk14.home}"> - <not> - <isset property="HAVE_JDK_1.5"/> - </not> - </condition> - <condition property="jboss.home" value="${jboss.jdk15.home}"> - <isset property="HAVE_JDK_1.5"/> - </condition> - <!-- 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=5006"> <isset property="debug"/> @@ -53,6 +44,7 @@ </not> </condition> + <property name="jboss.home" value="${jboss50.home}"/> <property name="jboss.client" value="${jboss.home}/client"/> <property name="jboss.lib" value="${jboss.home}/lib"/> <property name="jboss.server" value="${jboss.home}/server/${jboss.server.instance}"/> @@ -113,32 +105,6 @@ --> <target name="init" depends="prepare,thirdparty"> - <condition property="jbossws.build" value="jbossws14"> - <not> - <isset property="HAVE_JDK_1.5"/> - </not> - </condition> - <condition property="jbossws.build" value="jbossws"> - <isset property="HAVE_JDK_1.5"/> - </condition> - - <property name="jbossws.client.jar" value="${jbossws.build}-client.jar"/> - - <!-- Check that the latest build has been deployed --> - <condition property="jbossws.deployed"> - <and> - <filesmatch file1="${jboss.client}/${jbossws.client.jar}" file2="${build.lib.dir}/${jbossws.client.jar}"/> - <equals arg1="${jbossws.target.server}" arg2="jboss"/> - </and> - </condition> - <condition property="jbossws.deployed"> - <and> - <filesmatch file1="${tomcat.home}/common/lib/jbossws-core.jar" file2="${build.lib.dir}/jbossws-core.jar"/> - <equals arg1="${jbossws.target.server}" arg2="tomcat"/> - </and> - </condition> - <fail message="jbossws not deployed, run the deploy target" unless="jbossws.deployed"/> - <!-- Define excluded tests --> <condition property="tests.excludesfile" value="${test.resources.dir}/tests-no-excludes.txt"> <equals arg1="${jbossws.target.server}" arg2="jboss"/> @@ -149,7 +115,7 @@ <!-- The jbossws client classpath --> <path id="jbossws.client.classpath"> - <pathelement location="${build.lib.dir}/${jbossws.client.jar}"/> + <pathelement location="${build.lib.dir}/jbossws-client.jar"/> <pathelement location="${jboss.client}/activation.jar"/> <pathelement location="${jboss.client}/commons-logging.jar"/> <pathelement location="${jboss.client}/javassist.jar"/> @@ -178,8 +144,8 @@ <pathelement location="${jboss.server.lib}/jboss.jar"/> <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-annotations-ejb3.jar"/> <pathelement location="${jboss.server.deploy}/ejb3.deployer/jboss-ejb3x.jar"/> - <pathelement location="${build.lib.dir}/${jbossws.build}-jboss-integration.jar"/> - <pathelement location="${build.lib.dir}/${jbossws.build}-tomcat-integration.jar"/> + <pathelement location="${build.lib.dir}/jbossws-jboss50-integration.jar"/> + <pathelement location="${build.lib.dir}/jbossws-tomcat-integration.jar"/> </path> <!-- @@ -188,8 +154,8 @@ --> <path id="test.client.classpath"> <path refid="jbossws.client.classpath"/> - <pathelement location="${build.lib.dir}/${jbossws.build}-jboss-integration.jar"/> - <pathelement location="${build.lib.dir}/${jbossws.build}-tomcat-integration.jar"/> + <pathelement location="${build.lib.dir}/jbossws-jboss50-integration.jar"/> + <pathelement location="${build.lib.dir}/jbossws-tomcat-integration.jar"/> <pathelement location="${jboss.client}/jboss-aspect-jdk50-client.jar"/> <pathelement location="${jboss.client}/jboss-aop-jdk50-client.jar"/> <pathelement location="${jboss.client}/jboss-ejb3-client.jar"/>