Author: thomas.diesler(a)jboss.com Date: 2007-07-25 04:15:11 -0400 (Wed, 25 Jul 2007) New Revision: 3986 Modified: trunk/build/ant-import/build-testsuite.xml trunk/integration/native/build.xml trunk/integration/sunri/build.xml trunk/integration/sunri/src/main/etc/bin-dist-build.xml trunk/integration/xfire/build.xml trunk/testsuite/src/etc/log4j.xml Log: Append to test.log. Add conditional switch to javadoc target Modified: trunk/build/ant-import/build-testsuite.xml =================================================================== --- trunk/build/ant-import/build-testsuite.xml 2007-07-25 05:56:07 UTC (rev 3985) +++ trunk/build/ant-import/build-testsuite.xml 2007-07-25 08:15:11 UTC (rev 3986) @@ -68,7 +68,7 @@ <target name="tests-prepare"> <mkdir dir="${tests.output.dir}/log"/> - <touch file="${tests.output.dir}/log/test.log"/> + <delete file="${tests.output.dir}/log/test.log"/> <property name="jboss.client" value="${jboss.home}/client"/> <property name="jboss.lib" value="${jboss.home}/lib"/> Modified: trunk/integration/native/build.xml =================================================================== --- trunk/integration/native/build.xml 2007-07-25 05:56:07 UTC (rev 3985) +++ trunk/integration/native/build.xml 2007-07-25 08:15:11 UTC (rev 3986) @@ -42,6 +42,7 @@ <target name="init" depends="prepare,thirdparty"> <ant antfile="${core.dir}/build.xml" target="jars" inheritall="false"/> + <mkdir dir="${native.output.apidocs.dir}"/> </target> <!-- ================================================================== --> @@ -265,9 +266,8 @@ </jar> </target> - <target name="javadoc" description="Generate the Javadoc"> + <target name="javadoc" depends="init" description="Generate the Javadoc" unless="nojavadoc"> - <mkdir dir="${native.output.apidocs.dir}"/> <javadoc destdir="${native.output.apidocs.dir}" author="true" version="true" Modified: trunk/integration/sunri/build.xml =================================================================== --- trunk/integration/sunri/build.xml 2007-07-25 05:56:07 UTC (rev 3985) +++ trunk/integration/sunri/build.xml 2007-07-25 08:15:11 UTC (rev 3986) @@ -42,6 +42,7 @@ <target name="init" depends="prepare,thirdparty"> <ant antfile="${spi.dir}/build.xml" target="jars" inheritall="false"/> + <mkdir dir="${sunri.output.apidocs.dir}"/> </target> <!-- ================================================================== --> @@ -250,15 +251,12 @@ </target> <!-- Generate the JavaDoc --> - <target name="javadoc" depends="init" description="Generate the Javadoc"> + <target name="javadoc" depends="init" description="Generate the Javadoc" unless="nojavadoc"> - <mkdir dir="${sunri.output.apidocs.dir}"/> - <!-- expand the sunri sources --> <mkdir dir="${sunri.output.dir}/thirdparty-sources"/> <unzip src="${thirdparty.dir}/jaxws-ri-src.jar" dest="${sunri.output.dir}/thirdparty-sources"/> - <javadoc destdir="${sunri.output.apidocs.dir}" author="true" version="true" use="true" windowtitle="JBossWS API"> <classpath> <pathelement path="${sunri50.integration.classpath}"/> Modified: trunk/integration/sunri/src/main/etc/bin-dist-build.xml =================================================================== --- trunk/integration/sunri/src/main/etc/bin-dist-build.xml 2007-07-25 05:56:07 UTC (rev 3985) +++ trunk/integration/sunri/src/main/etc/bin-dist-build.xml 2007-07-25 08:15:11 UTC (rev 3986) @@ -78,6 +78,7 @@ <target name="tests-init" depends="prepare,tests-classpath"> <path id="ws.stack.classpath"> + <pathelement location="${lib.dir}/jbossws-spi.jar"/> <pathelement location="${thirdparty.dir}/FastInfoset.jar"/> <pathelement location="${thirdparty.dir}/http.jar"/> <pathelement location="${thirdparty.dir}/jaxws-api.jar"/> @@ -93,10 +94,10 @@ <pathelement location="${thirdparty.dir}/stax-ex.jar"/> <pathelement location="${thirdparty.dir}/streambuffer.jar"/> <pathelement location="${thirdparty.dir}/wstx.jar"/> + <pathelement location="${thirdparty.dir}/wsdl4j.jar"/> </path> <path id="tests.extra.classpath"> - <pathelement location="${lib.dir}/jbossws-spi.jar"/> <pathelement location="${lib.dir}/jbossws-sunri-client.jar"/> </path> Modified: trunk/integration/xfire/build.xml =================================================================== --- trunk/integration/xfire/build.xml 2007-07-25 05:56:07 UTC (rev 3985) +++ trunk/integration/xfire/build.xml 2007-07-25 08:15:11 UTC (rev 3986) @@ -11,7 +11,7 @@ <!-- $Id$ --> -<project default="main" basedir="../.." name="JBossWS-SunRI-JBoss50"> +<project default="main" basedir="../.." name="JBossWS-CXF"> <import file="${basedir}/build/ant-import/build-setup.xml"/> @@ -42,6 +42,7 @@ <target name="init" depends="prepare,thirdparty"> <ant antfile="${spi.dir}/build.xml" target="jars" inheritall="false"/> + <mkdir dir="${xfire.output.apidocs.dir}"/> </target> <!-- ================================================================== --> @@ -243,10 +244,8 @@ </target> <!-- Generate the JavaDoc --> - <target name="javadoc" depends="init" description="Generate the Javadoc" if="javadoc"> + <target name="javadoc" depends="init" description="Generate the Javadoc" unless="nojavadoc"> - <mkdir dir="${xfire.output.apidocs.dir}"/> - <!-- expand the xfire sources --> <mkdir dir="${xfire.output.dir}/thirdparty-sources"/> <unzip src="${thirdparty.dir}/xfire-distribution-sources.jar" dest="${xfire.output.dir}/thirdparty-sources"/> Modified: trunk/testsuite/src/etc/log4j.xml =================================================================== --- trunk/testsuite/src/etc/log4j.xml 2007-07-25 05:56:07 UTC (rev 3985) +++ trunk/testsuite/src/etc/log4j.xml 2007-07-25 08:15:11 UTC (rev 3986) @@ -23,7 +23,7 @@ <!-- A time/date based rolling appender --> <appender name="FILE" class="org.jboss.logging.appender.DailyRollingFileAppender"> <param name="File" value="${build.testlog}/test.log"/> - <param name="Append" value="false"/> + <param name="Append" value="true"/> <!-- Rollover at midnight each day --> <param name="DatePattern" value="'.'yyyy-MM-dd"/>