Author: thomas.diesler(a)jboss.com Date: 2007-01-22 16:11:38 -0500 (Mon, 22 Jan 2007) New Revision: 2028 Modified: trunk/jbossws-tests/build.xml trunk/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt trunk/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt trunk/jbossws-tests/src/main/resources/tests-jboss42-noejb3-excludes.txt trunk/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt Log: Use excludes for compile as well Fix test compile classpath Modified: trunk/jbossws-tests/build.xml =================================================================== --- trunk/jbossws-tests/build.xml 2007-01-22 18:52:12 UTC (rev 2027) +++ trunk/jbossws-tests/build.xml 2007-01-22 21:11:38 UTC (rev 2028) @@ -43,17 +43,17 @@ </condition> <!-- Available integration target --> - <property name="${jbossws.integration.target}.available" value="true"/> + <property name="integration.target.${jbossws.integration.target}" value="true"/> <!-- Define jboss.home --> <condition property="jboss.home" value="${jboss50.home}"> - <isset property="jboss50.available"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss50"/> </condition> <condition property="jboss.home" value="${jboss42.home}"> - <isset property="jboss42.available"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss42"/> </condition> <condition property="jboss.home" value="${jboss40.home}"> - <isset property="jboss40.available"/> + <equals arg1="${jbossws.integration.target}" arg2="jboss40"/> </condition> <!-- Integration Target Server --> @@ -134,15 +134,15 @@ </not> </condition> <property name="excludes-short-name" value="tests-${jbossws.integration.target}-excludes.txt"/> - <property name="tests.excludefile" value="${tests.resources.dir}/${excludes-short-name}"/> + <property name="excludesfile" value="${tests.resources.dir}/${excludes-short-name}"/> <echo/> <echo message="-----------------------------------------------"/> - <echo message="jboss.home = ${jboss.home}"/> - <echo message="tomcat.home = ${tomcat.home}"/> - <echo message="java.home = ${java.home}"/> - <echo message="endorsed = ${endorsed.dirs}"/> - <echo message="excludefile = ${excludes-short-name}"/> + <echo message="jboss.home = ${jboss.home}"/> + <echo message="tomcat.home = ${tomcat.home}"/> + <echo message="java.home = ${java.home}"/> + <echo message="endorsed = ${endorsed.dirs}"/> + <echo message="excludesfile = ${excludes-short-name}"/> <echo message="-----------------------------------------------"/> </target> @@ -150,10 +150,7 @@ <!-- Init the various classpaths --> - <target name="init" depends="prepare,thirdparty,init-jboss50-classpath"> - </target> - - <target name="init-jboss50-classpath" depends="prepare" if="jboss50.available"> + <target name="init" depends="prepare,thirdparty"> <!-- The combined compile classpath --> <path id="javac.classpath"> @@ -186,7 +183,6 @@ <pathelement location="${jboss.server.lib}/hibernate3.jar"/> <pathelement location="${jboss.server.lib}/jboss.jar"/> <pathelement location="${jboss.server.lib}/jbosssx.jar"/> - <pathelement location="${integration.jboss50.dir}/output/lib/jbossws-jboss50-integration.jar"/> <path refid="javac.classpath"/> </path> </target> @@ -199,7 +195,8 @@ <target name="compile14" depends="init" unless="HAVE_JDK_1.5"> <mkdir dir="${tests.output.dir}/classes"/> - <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> + <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" + failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> <src path="${tests.java.dir}"/> <exclude name="org/jboss/test/ws/interop/**"/> <exclude name="org/jboss/test/ws/jaxrpc/jbws718/**"/> @@ -213,12 +210,9 @@ <target name="compile15" depends="init" if="HAVE_JDK_1.5"> <mkdir dir="${tests.output.dir}/classes"/> - <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" failonerror="${javac.fail.onerror}"> + <javac destdir="${tests.output.dir}/classes" debug="${javac.debug}" encoding="utf-8" verbose="${javac.verbose}" deprecation="${javac.deprecation}" + failonerror="${javac.fail.onerror}" excludesfile="${excludesfile}"> <src path="${tests.java.dir}"/> - <exclude name="org/jboss/test/ws/interop/**"/> - <exclude name="org/jboss/test/ws/jaxrpc/jbws718/**"/> - <exclude name="org/jboss/test/ws/jaxrpc/wseventing/**"/> - <exclude name="org/jboss/test/ws/jaxrpc/samples/wseventing/**"/> <classpath refid="javac.classpath"/> </javac> </target> @@ -337,8 +331,6 @@ <target name="tests" depends="main" description="Run all unit tests and generate a report"> <antcall target="tests-main"> <param name="include.wildcard" value="org/jboss/test/ws/**/*TestCase.class"/> - <param name="exclude.wildcard" value="org/jboss/test/ws/*/benchmark/**"/> - <param name="excludesfile" value="${tests.excludefile}"/> </antcall> <antcall target="tests-report"/> </target> @@ -347,7 +339,6 @@ <target name="tests-benchmark" depends="init" description="Run benchmark unit tests"> <antcall target="tests-main"> <param name="include.wildcard" value="org/jboss/test/ws/benchmark/**/*TestCase.class"/> - <param name="excludesfile" value="${tests.excludefile}"/> </antcall> <antcall target="tests-report"/> </target> @@ -356,7 +347,6 @@ <target name="tests-samples" depends="init" description="Run samples unit tests"> <antcall target="tests-main"> <param name="include.wildcard" value="org/jboss/test/ws/*/samples/**/*TestCase.class"/> - <param name="excludesfile" value="${tests.excludefile}"/> </antcall> <antcall target="tests-report"/> </target> @@ -365,7 +355,6 @@ <target name="tests-tools" depends="init" description="Run tools unit tests"> <antcall target="tests-main"> <param name="include.wildcard" value="org/jboss/test/ws/tools/**/*TestCase.class"/> - <param name="excludesfile" value="${tests.excludefile}"/> </antcall> <antcall target="tests-report"/> </target> @@ -377,8 +366,6 @@ <target name="test" depends="init" if="test" description="Run all unit tests in a given directory"> <antcall target="tests-main"> <param name="include.wildcard" value="org/jboss/test/ws/${test}/**/*TestCase.class"/> - <param name="exclude.wildcard" value="org/jboss/test/ws/*/benchmark/**"/> - <param name="excludesfile" value="${tests.excludefile}"/> </antcall> </target> @@ -412,7 +399,7 @@ <formatter type="plain" usefile="true"/> <formatter type="xml" usefile="true"/> <batchtest todir="${tests.output.dir}/reports" fork="true"> - <fileset dir="${tests.output.dir}/classes" includes="${include.wildcard}" excludes="${exclude.wildcard}" excludesfile="${excludesfile}"/> + <fileset dir="${tests.output.dir}/classes" includes="${include.wildcard}" excludesfile="${excludesfile}"/> </batchtest> </junit> </target> Modified: trunk/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt =================================================================== --- trunk/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt 2007-01-22 18:52:12 UTC (rev 2027) +++ trunk/jbossws-tests/src/main/resources/tests-jboss40-excludes.txt 2007-01-22 21:11:38 UTC (rev 2028) @@ -1,3 +1,10 @@ +org/jboss/test/ws/interop/** +org/jboss/test/ws/jaxrpc/benchmark/** +org/jboss/test/ws/jaxrpc/jbws718/** +org/jboss/test/ws/jaxrpc/samples/wseventing/** +org/jboss/test/ws/jaxrpc/wseventing/** +org/jboss/test/ws/jaxws/benchmark/** org/jboss/test/ws/jaxws/endpoint/** -org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.class +org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.* org/jboss/test/ws/jaxws/webserviceref/** + Modified: trunk/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt =================================================================== --- trunk/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt 2007-01-22 18:52:12 UTC (rev 2027) +++ trunk/jbossws-tests/src/main/resources/tests-jboss42-excludes.txt 2007-01-22 21:11:38 UTC (rev 2028) @@ -1,3 +1,9 @@ +org/jboss/test/ws/interop/** +org/jboss/test/ws/jaxrpc/benchmark/** +org/jboss/test/ws/jaxrpc/jbws718/** +org/jboss/test/ws/jaxrpc/samples/wseventing/** +org/jboss/test/ws/jaxrpc/wseventing/** +org/jboss/test/ws/jaxws/benchmark/** org/jboss/test/ws/jaxws/endpoint/** -org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.class +org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.* org/jboss/test/ws/jaxws/webserviceref/** Modified: trunk/jbossws-tests/src/main/resources/tests-jboss42-noejb3-excludes.txt =================================================================== --- trunk/jbossws-tests/src/main/resources/tests-jboss42-noejb3-excludes.txt 2007-01-22 18:52:12 UTC (rev 2027) +++ trunk/jbossws-tests/src/main/resources/tests-jboss42-noejb3-excludes.txt 2007-01-22 21:11:38 UTC (rev 2028) @@ -1,9 +1,18 @@ +org/jboss/test/ws/interop/** +org/jboss/test/ws/jaxrpc/benchmark/** +org/jboss/test/ws/jaxrpc/jbws718/** +org/jboss/test/ws/jaxrpc/samples/wseventing/** +org/jboss/test/ws/jaxrpc/wseventing/** +org/jboss/test/ws/jaxws/benchmark/** +org/jboss/test/ws/jaxws/endpoint/** +org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.* +org/jboss/test/ws/jaxws/webserviceref/** + +# EJB3 excludes org/jboss/test/ws/jaxws/eardeployment/** org/jboss/test/ws/jaxws/jbws944/** org/jboss/test/ws/jaxws/jbws981/** -org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.class -org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB3TestCase.class -org/jboss/test/ws/jaxws/samples/jsr181ejb/JSR181WebServiceEJB3TestCase.class +org/jboss/test/ws/jaxws/jsr181/webservice/JSR181WebServiceEJB3TestCase.* +org/jboss/test/ws/jaxws/samples/jsr181ejb/JSR181WebServiceEJB3TestCase.* org/jboss/test/ws/jaxws/samples/retail/** -org/jboss/test/ws/jaxws/webserviceref/** org/jboss/test/ws/jaxws/xop/** Modified: trunk/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt =================================================================== --- trunk/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt 2007-01-22 18:52:12 UTC (rev 2027) +++ trunk/jbossws-tests/src/main/resources/tests-jboss50-excludes.txt 2007-01-22 21:11:38 UTC (rev 2028) @@ -1 +1,5 @@ -nothing-to-exclude/** \ No newline at end of file +org/jboss/test/ws/interop/** +org/jboss/test/ws/jaxrpc/benchmark/** +org/jboss/test/ws/jaxrpc/jbws718/** +org/jboss/test/ws/jaxrpc/samples/wseventing/** +org/jboss/test/ws/jaxrpc/wseventing/** Modified: trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt =================================================================== --- trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-01-22 18:52:12 UTC (rev 2027) +++ trunk/jbossws-tests/src/main/resources/tests-tomcat-excludes.txt 2007-01-22 21:11:38 UTC (rev 2028) @@ -1,10 +1,15 @@ +org/jboss/test/ws/interop/** +org/jboss/test/ws/jaxrpc/benchmark/** +org/jboss/test/ws/jaxrpc/jbws718/** org/jboss/test/ws/jaxrpc/jbws1011/** +org/jboss/test/ws/jaxrpc/samples/wseventing/** org/jboss/test/ws/jaxrpc/samples/dynamichandler/** org/jboss/test/ws/jaxrpc/samples/jmstransport/** org/jboss/test/ws/jaxrpc/samples/jsr109ejb/** org/jboss/test/ws/jaxrpc/samples/secureejb/** org/jboss/test/ws/jaxrpc/samples/wsbpel/** -org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.class -org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.class +org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.* +org/jboss/test/ws/jaxrpc/wseventing/** +org/jboss/test/ws/jaxws/jsr181/handlerchain/HandlerChainClientTestCase.* org/jboss/test/ws/jaxws/samples/jsr181ejb/** org/jboss/test/ws/jaxws/samples/retail/**