Author: thomas.diesler(a)jboss.com Date: 2007-05-24 09:45:57 -0400 (Thu, 24 May 2007) New Revision: 3233 Modified: trunk/build/ant-import/build-testsuite.xml trunk/build/hudson/hudson-home/jobs/AS-4.2/config.xml trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml trunk/integration/jbws/ant-import/macros-deploy-jbws.xml trunk/integration/sunri/ant-import/build-distribution.xml trunk/integration/sunri/ant-import/macros-deploy-sunri.xml trunk/integration/sunri/src/main/etc/bindist-build.xml trunk/testsuite/ant-import/build-testsuite.xml Log: SunRI binary dist Modified: trunk/build/ant-import/build-testsuite.xml =================================================================== --- trunk/build/ant-import/build-testsuite.xml 2007-05-24 12:28:22 UTC (rev 3232) +++ trunk/build/ant-import/build-testsuite.xml 2007-05-24 13:45:57 UTC (rev 3233) @@ -10,9 +10,10 @@ <project> - <property name="tests.etc.dir" value="${tests.dir}/etc"/> - <property name="tests.java.dir" value="${tests.dir}/java"/> - <property name="tests.resources.dir" value="${tests.dir}/resources"/> + <property name="tests.etc.dir" value="${tests.dir}/src/etc"/> + <property name="tests.java.dir" value="${tests.dir}/src/java"/> + <property name="tests.resources.dir" value="${tests.dir}/src/resources"/> + <property name="tests.output.dir" value="${tests.dir}/output-tests"/> <!-- ================================================================== --> <!-- Setup --> @@ -91,7 +92,7 @@ <path id="tests.javac.classpath"> <path refid="ws.stack.classpath"/> <path refid="tests.extra.classpath"/> - <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> + <pathelement location="${jboss.client}/jbossws-spi.jar"/> <pathelement location="${jboss.client}/activation.jar"/> <pathelement location="${jboss.client}/jaxb-api.jar"/> <pathelement location="${jboss.client}/jaxb-impl.jar"/> @@ -128,7 +129,7 @@ <path id="tests.javac.classpath"> <path refid="ws.stack.classpath"/> <path refid="tests.extra.classpath"/> - <pathelement location="${spi.dir}/output/lib/jbossws-spi.jar"/> + <pathelement location="${jboss.client}/jbossws-spi.jar"/> <pathelement location="${jboss.client}/activation.jar"/> <pathelement location="${jboss.client}/jaxb-api.jar"/> <pathelement location="${jboss.client}/jaxb-impl.jar"/> @@ -181,8 +182,8 @@ <macrodef name="macro-copy-resources"> <attribute name="srcdir"/> <sequential> - <copy todir="${tests.output.dir}/classes" file="${testsuite.dir}/src/etc/jndi.properties"/> - <copy todir="${tests.output.dir}/classes" file="${testsuite.dir}/src/etc/log4j.xml"/> + <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/jndi.properties"/> + <copy todir="${tests.output.dir}/classes" file="${tests.etc.dir}/log4j.xml"/> <!-- copy handler definitions --> <copy todir="${tests.output.dir}/classes"> @@ -264,7 +265,7 @@ <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/> <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/> - <sysproperty key="java.security.policy" value="${testsuite.dir}/src/etc/tst.policy"/> + <sysproperty key="java.security.policy" value="${tests.etc.dir}/tst.policy"/> <sysproperty key="jboss.home" value="${jboss.home}"/> <sysproperty key="jbosstest.host.name" value="${node0}"/> <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/> @@ -300,7 +301,7 @@ <sysproperty key="java.endorsed.dirs" value="${endorsed.dirs}"/> <sysproperty key="java.naming.provider.url" value="${node0.jndi.url}"/> <sysproperty key="java.protocol.handler.pkgs" value="org.jboss.virtual.protocol"/> - <sysproperty key="java.security.policy" value="${testsuite.dir}/src/etc/tst.policy"/> + <sysproperty key="java.security.policy" value="${tests.etc.dir}/tst.policy"/> <sysproperty key="jboss.home" value="${jboss.home}"/> <sysproperty key="jbosstest.host.name" value="${node0}"/> <sysproperty key="jbossws.integration.target" value="${jbossws.integration.target}"/> Modified: trunk/build/hudson/hudson-home/jobs/AS-4.2/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/AS-4.2/config.xml 2007-05-24 12:28:22 UTC (rev 3232) +++ trunk/build/hudson/hudson-home/jobs/AS-4.2/config.xml 2007-05-24 13:45:57 UTC (rev 3233) @@ -22,7 +22,7 @@ # build jboss # cd $SVNBASE -rm -f thirdparty/libraries.ent +rm -rf thirdparty/* ./build/build.sh clean main # Modified: trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml =================================================================== --- trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml 2007-05-24 12:28:22 UTC (rev 3232) +++ trunk/build/hudson/hudson-home/jobs/AS-5.0/config.xml 2007-05-24 13:45:57 UTC (rev 3233) @@ -22,7 +22,8 @@ # build jboss # cd $SVNBASE -./build/build.sh clean main +rm -rf thirdparty/* +ant -f ./build/build.xml clean main # # Verify build Modified: trunk/integration/jbws/ant-import/macros-deploy-jbws.xml =================================================================== --- trunk/integration/jbws/ant-import/macros-deploy-jbws.xml 2007-05-24 12:28:22 UTC (rev 3232) +++ trunk/integration/jbws/ant-import/macros-deploy-jbws.xml 2007-05-24 13:45:57 UTC (rev 3233) @@ -26,6 +26,12 @@ <sequential> <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> <copy todir="${jboss50.home}/client" overwrite="true"> + <fileset dir="@{spilibs}"> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="@{jbosslibs}"> + <include name="jbossws-jboss50.jar"/> + </fileset> <fileset dir="@{corelibs}"> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> @@ -39,9 +45,6 @@ <include name="wsdl4j.jar"/> <include name="jbossws-wsconsume-impl.jar"/> </fileset> - <fileset dir="@{jbosslibs}"> - <include name="jbossws-jboss50.jar"/> - </fileset> </copy> <copy todir="${jboss50.home}/lib" overwrite="true"> <fileset dir="@{thirdpartylibs}"> @@ -82,6 +85,12 @@ <sequential> <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> <copy todir="${jboss42.home}/client" overwrite="true"> + <fileset dir="@{spilibs}"> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="@{jbosslibs}"> + <include name="jbossws-jboss42.jar"/> + </fileset> <fileset dir="@{corelibs}"> <include name="jboss-jaxrpc.jar"/> <include name="jboss-jaxws.jar"/> @@ -95,9 +104,6 @@ <include name="wsdl4j.jar"/> <include name="jbossws-wsconsume-impl.jar"/> </fileset> - <fileset dir="@{jbosslibs}"> - <include name="jbossws-jboss42.jar"/> - </fileset> </copy> <copy todir="${jboss42.home}/lib" overwrite="true"> <fileset dir="@{spilibs}"> @@ -119,57 +125,57 @@ <!-- Deploy juddi-service.sar --> <mkdir dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> <unzip dest="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar" src=&quot;(a){thirdpartylibs}/juddi-service.sar&quot;/&gt; - </sequential> + </sequential> </macrodef> <macrodef name="macro-undeploy-jbws50"> <sequential> <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> - <delete> - <fileset dir="${jboss50.home}/client"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - <include name="jbossws-wsconsume-impl.jar"/> - </fileset> - <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </delete> - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <delete file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/> - <!-- Undeploy juddi-service.sar --> - <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <delete> + <fileset dir="${jboss50.home}/client"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + <fileset dir="${jboss50.home}/server/${jboss.server.instance}/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </delete> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <delete file="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war"/> + <!-- Undeploy juddi-service.sar --> + <delete dir="${jboss50.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> </sequential> </macrodef> <macrodef name="macro-undeploy-jbws42"> <sequential> <fail message="Not available: ${jboss42.available.file}" unless="jboss42.available"/> - <delete> - <fileset dir="${jboss42.home}/client"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - <include name="jbossws-client.jar"/> - <include name="jbossws-wsconsume-impl.jar"/> - </fileset> - <fileset dir="${jboss42.home}/lib"> - <include name="jbossws-integration.jar"/> <!-- The old integration jar--> - </fileset> - <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib"> - <include name="jboss-jaxrpc.jar"/> - <include name="jboss-jaxws.jar"/> - <include name="jboss-saaj.jar"/> - </fileset> - </delete> - <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> - <!-- Undeploy juddi-service.sar --> - <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> + <delete> + <fileset dir="${jboss42.home}/client"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + <include name="jbossws-client.jar"/> + <include name="jbossws-wsconsume-impl.jar"/> + </fileset> + <fileset dir="${jboss42.home}/lib"> + <include name="jbossws-integration.jar"/> <!-- The old integration jar--> + </fileset> + <fileset dir="${jboss42.home}/server/${jboss.server.instance}/lib"> + <include name="jboss-jaxrpc.jar"/> + <include name="jboss-jaxws.jar"/> + <include name="jboss-saaj.jar"/> + </fileset> + </delete> + <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/jbossws.sar"/> + <!-- Undeploy juddi-service.sar --> + <delete dir="${jboss42.home}/server/${jboss.server.instance}/deploy/juddi-service.sar"/> </sequential> </macrodef> Modified: trunk/integration/sunri/ant-import/build-distribution.xml =================================================================== --- trunk/integration/sunri/ant-import/build-distribution.xml 2007-05-24 12:28:22 UTC (rev 3232) +++ trunk/integration/sunri/ant-import/build-distribution.xml 2007-05-24 13:45:57 UTC (rev 3233) @@ -27,7 +27,7 @@ <delete dir="${bindist.dir}"/> <mkdir dir="${bindist.build.dir}"/> - <mkdir dir="${bindist.lib.dir}"/> + <mkdir dir="${bindist.lib.dir}/thirdparty"/> <mkdir dir="${bindist.docs.dir}"/> <mkdir dir="${bindist.tests.dir}"/> @@ -48,7 +48,6 @@ <include name="macros-deploy-jbws.xml"/> </fileset> <fileset dir="${int.sunri.dir}/ant-import"> - <include name="build-thirdparty.xml"/> <include name="macros-deploy-sunri.xml"/> </fileset> <fileset dir="${testsuite.dir}/ant-import"> @@ -81,12 +80,18 @@ <include name="jbossws-sunri50-deployer.zip"/> </fileset> </copy> + <copy todir="${bindist.lib.dir}/thirdparty" overwrite="true"> + <fileset dir="${int.sunri.dir}/thirdparty"/> + </copy> <!-- tests --> <copy todir="${bindist.tests.dir}" overwrite="true"> <fileset dir="${testsuite.dir}"> <include name="src/**"/> </fileset> + <fileset dir="${int.sunri.dir}"> + <include name="src/test/**"/> + </fileset> </copy> <zip destfile="${sunri.output.dir}/jbossws-sunri-${version.id}.zip"> Modified: trunk/integration/sunri/ant-import/macros-deploy-sunri.xml =================================================================== --- trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-05-24 12:28:22 UTC (rev 3232) +++ trunk/integration/sunri/ant-import/macros-deploy-sunri.xml 2007-05-24 13:45:57 UTC (rev 3233) @@ -24,35 +24,38 @@ <attribute name="thirdpartylibs"/> <sequential> <fail message="Not available: ${jboss50.available.file}" unless="jboss50.available"/> - <copy todir="${jboss50.home}/client" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - <include name="jaxb-xjc.jar"/> - </fileset> - <fileset dir="@{jbosslibs}"> - <include name="jbossws-jboss50.jar"/> - </fileset> - </copy> - <copy todir="${jboss50.home}/lib" overwrite="true"> - <fileset dir="@{thirdpartylibs}"> - <include name="jaxb-api.jar"/> - <include name="jaxb-impl.jar"/> - </fileset> - </copy> - <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> - <fileset dir="@{spilibs}"> - <include name="jbossws-spi.jar"/> - </fileset> - <fileset dir="@{jbosslibs}"> - <include name="jbossws-jboss50.jar"/> - </fileset> - </copy> - <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> - <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src=&quot;(a){sunrilibs}/jbossws-sunri50-deployer.zip&quot;/&gt; - <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> - <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src=&quot;(a){sunrilibs}/jbossws-sunri50.sar&quot;/&gt; - <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file=&quot;(a){sunrilibs}/jbossws-context.war&quot; overwrite="true"/> + <copy todir="${jboss50.home}/client" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + <include name="jaxb-xjc.jar"/> + </fileset> + <fileset dir="@{spilibs}"> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="@{jbosslibs}"> + <include name="jbossws-jboss50.jar"/> + </fileset> + </copy> + <copy todir="${jboss50.home}/lib" overwrite="true"> + <fileset dir="@{thirdpartylibs}"> + <include name="jaxb-api.jar"/> + <include name="jaxb-impl.jar"/> + </fileset> + </copy> + <copy todir="${jboss50.home}/server/${jboss.server.instance}/lib" overwrite="true"> + <fileset dir="@{spilibs}"> + <include name="jbossws-spi.jar"/> + </fileset> + <fileset dir="@{jbosslibs}"> + <include name="jbossws-jboss50.jar"/> + </fileset> + </copy> + <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer"/> + <unzip dest="${jboss50.home}/server/${jboss.server.instance}/deployers/jbossws.deployer" src=&quot;(a){sunrilibs}/jbossws-sunri50-deployer.zip&quot;/&gt; + <mkdir dir="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar"/> + <unjar dest="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-sunri.sar" src=&quot;(a){sunrilibs}/jbossws-sunri50.sar&quot;/&gt; + <copy tofile="${jboss50.home}/server/${jboss.server.instance}/deploy/jbossws-context.war" file=&quot;(a){sunrilibs}/jbossws-context.war&quot; overwrite="true"/> </sequential> </macrodef> Modified: trunk/integration/sunri/src/main/etc/bindist-build.xml =================================================================== --- trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-05-24 12:28:22 UTC (rev 3232) +++ trunk/integration/sunri/src/main/etc/bindist-build.xml 2007-05-24 13:45:57 UTC (rev 3233) @@ -13,10 +13,6 @@ <project default="main" basedir="." name="JBossWS/SunRI"> - <import file="${basedir}/build/build-deploy.xml"/> - <import file="${basedir}/build/build-testsuite.xml"/> - <import file="${basedir}/build/build-thirdparty.xml"/> - <!-- ================================================================== --> <!-- Setup --> <!-- ================================================================== --> @@ -24,6 +20,7 @@ <property name="build.dir" value="${basedir}/build"/> <property name="docs.dir" value="${basedir}/docs"/> <property name="lib.dir" value="${basedir}/lib"/> + <property name="thirdparty.dir" value="${basedir}/lib/thirdparty"/> <property name="tests.dir" value="${basedir}/tests"/> <property file="${basedir}/ant.properties"/> @@ -51,28 +48,52 @@ <available property="jboss50.available" file="${jboss50.available.file}"/> <available property="jboss42.available" file="${jboss42.available.file}"/> + <import file="${basedir}/build/build-testsuite.xml"/> + <import file="${basedir}/build/macros-deploy-jbws.xml"/> + <import file="${basedir}/build/macros-deploy-sunri.xml"/> + <!-- ================================================================== --> <!-- Initialization --> <!-- ================================================================== --> - <target name="tests-init" depends="tests-classpath"> + <target name="prepare"> + + <!-- Define jboss.home --> + <condition property="jboss.home" value="${jboss50.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> + </condition> + <condition property="jboss.home" value="${jboss42.home}"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition> + + <!-- Define excludesfile --> + <condition property="excludesfile" value="${tests.dir}/src/test/resources/excludes-jboss50.txt"> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> + </condition> + <condition property="excludesfile" value="${tests.dir}/src/test/resources/excludes-jboss42.txt"> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> + </condition> + + </target> + + <target name="tests-init" depends="prepare,tests-classpath"> <path id="ws.stack.classpath"> - <pathelement location="${int.sunri.dir}/thirdparty/FastInfoset.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/http.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jaxws-api.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jaxws-rt.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jaxws-tools.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jsr173_api.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jsr181-api.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/jsr250-api.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/resolver.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/saaj-api.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/saaj-impl.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/sjsxp.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/stax-ex.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/streambuffer.jar"/> - <pathelement location="${int.sunri.dir}/thirdparty/wstx.jar"/> + <pathelement location="${thirdparty.dir}/FastInfoset.jar"/> + <pathelement location="${thirdparty.dir}/http.jar"/> + <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> + <pathelement location="${thirdparty.dir}/jaxws-rt.jar"/> + <pathelement location="${thirdparty.dir}/jaxws-tools.jar"/> + <pathelement location="${thirdparty.dir}/jsr173_api.jar"/> + <pathelement location="${thirdparty.dir}/jsr181-api.jar"/> + <pathelement location="${thirdparty.dir}/jsr250-api.jar"/> + <pathelement location="${thirdparty.dir}/resolver.jar"/> + <pathelement location="${thirdparty.dir}/saaj-api.jar"/> + <pathelement location="${thirdparty.dir}/saaj-impl.jar"/> + <pathelement location="${thirdparty.dir}/sjsxp.jar"/> + <pathelement location="${thirdparty.dir}/stax-ex.jar"/> + <pathelement location="${thirdparty.dir}/streambuffer.jar"/> + <pathelement location="${thirdparty.dir}/wstx.jar"/> </path> <path id="tests.extra.classpath"> @@ -84,22 +105,45 @@ <!-- Compile --> <!-- ================================================================== --> + <target name="tests-compile" depends="tests-init" description="Compile sources"> + <macro-compile-classes srcdir="${tests.dir}/src/java"/> + </target> + <!-- ================================================================== --> <!-- Building --> <!-- ================================================================== --> <!-- Copy resources --> - <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> - <macro-copy-resources srcdir="${tests.dir}"/> + <target name="tests-copy-resources" depends="tests-init"> + <macro-copy-resources srcdir="${tests.dir}/src"/> </target> - <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments."> + <target name="tests-jars" depends="tests-compile,tests-copy-resources"> <ant antfile="${build.dir}/build-jars-jaxws.xml" target="build-jars-jaxws" inheritall="true"/> </target> - <target name="tests-main" depends="tests-jars" description="Build the deployments."/> + <target name="tests-main" depends="tests-jars" description="Build the test deployments."/> <!-- ================================================================== --> + <!-- Deployment --> + <!-- ================================================================== --> + + <!-- Deploy jbossws/sunri to jboss50 --> + <target name="deploy-jboss50" depends="prepare" description="Deploy jbossws/sunri to jboss50"> + <macro-undeploy-jbws50/> + <macro-deploy-sunri50 + spilibs="${lib.dir}" + jbosslibs="${lib.dir}" + sunrilibs="${lib.dir}" + thirdpartylibs="${lib.dir}/thirdparty"/> + </target> + + <!-- Remove jbossws/sunri from jboss50 --> + <target name="undeploy-jboss50" depends="prepare" description="Remove jbossws/sunri from jboss50"> + <macro-undeploy-sunri50/> + </target> + + <!-- ================================================================== --> <!-- Miscellaneous --> <!-- ================================================================== --> @@ -109,11 +153,8 @@ <target name="clobber" depends="clean" description="Cleans up all generated files."> </target> - <target name="main" description="Executes the default target (most)." depends="most"/> + <target name="main" depends="most" description="Executes the default target (most)."/> - <target name="most" description="Builds almost everything." depends="tests-main"/> + <target name="most" depends="tests-main" description="Builds almost everything."/> - <target name="all" description="Create a distribution zip file" depends="most"> - </target> - </project> Modified: trunk/testsuite/ant-import/build-testsuite.xml =================================================================== --- trunk/testsuite/ant-import/build-testsuite.xml 2007-05-24 12:28:22 UTC (rev 3232) +++ trunk/testsuite/ant-import/build-testsuite.xml 2007-05-24 13:45:57 UTC (rev 3233) @@ -1,7 +1,6 @@ <project> - <property name="tests.dir" value="${testsuite.dir}/src"/> - <property name="tests.output.dir" value="${testsuite.dir}/output-tests"/> + <property name="tests.dir" value="${testsuite.dir}"/> <import file="${build.dir}/ant-import/build-testsuite.xml"/> @@ -25,7 +24,7 @@ <!-- Copy resources --> <target name="tests-copy-resources" depends="tests-init" description="Copy the deployment resources."> - <macro-copy-resources srcdir="${tests.dir}"/> + <macro-copy-resources srcdir="${tests.dir}/src"/> </target> <target name="tests-jars" depends="tests-compile,tests-copy-resources" description="Build the deployments.">