Author: thomas.diesler(a)jboss.com Date: 2007-01-25 12:56:54 -0500 (Thu, 25 Jan 2007) New Revision: 2117 Added: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/tests-jboss-excludes.txt branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/tests-tomcat-excludes.txt Modified: branches/jbossws-1.2.0/build/ant-import/build-samples.xml branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/imported-build.xml Log: Fix tomcat samples build Modified: branches/jbossws-1.2.0/build/ant-import/build-samples.xml =================================================================== --- branches/jbossws-1.2.0/build/ant-import/build-samples.xml 2007-01-25 17:29:05 UTC (rev 2116) +++ branches/jbossws-1.2.0/build/ant-import/build-samples.xml 2007-01-25 17:56:54 UTC (rev 2117) @@ -67,6 +67,7 @@ </copy> <copy todir="${build.src.samples.dir}/common/resources"> <fileset dir="${core.samples.dir}/common"> + <include name="tests-*-excludes.txt"/> <include name="jndi.properties"/> <include name="log4j.xml"/> </fileset> Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml 2007-01-25 17:29:05 UTC (rev 2116) +++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/build-thirdparty.xml 2007-01-25 17:56:54 UTC (rev 2117) @@ -71,6 +71,7 @@ <pathelement location="${lib.dir}/jboss-jaxws.jar"/> <pathelement location="${lib.dir}/jboss-saaj.jar"/> <pathelement location="${lib.dir}/jbossws-client.jar"/> + <pathelement location="${lib.dir}/jbossws-tomcat-integration.jar"/> </path> <path id="compile.classpath"> Modified: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/imported-build.xml =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/imported-build.xml 2007-01-25 17:29:05 UTC (rev 2116) +++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/imported-build.xml 2007-01-25 17:56:54 UTC (rev 2117) @@ -37,19 +37,19 @@ </condition> <!-- Integration Target Server --> - <condition property="jbossws.integration.target.jboss"> + <condition property="integration.target.jboss"> <isset property="jboss.home"/> </condition> - <condition property="jbossws.integration.target.tomcat"> + <condition property="integration.target.tomcat"> <equals arg1="${jbossws.integration.target}" arg2="tomcat"/> </condition> <!-- Java Endorsed --> <condition property="endorsed.dirs" value="${jboss.home}/lib/endorsed"> - <isset property="jbossws.integration.target.jboss"/> + <isset property="integration.target.jboss"/> </condition> <condition property="endorsed.dirs" value="${tomcat.home}/common/endorsed"> - <isset property="jbossws.integration.target.tomcat"/> + <isset property="integration.target.tomcat"/> </condition> <!-- Set a hostname property based on COMPUTERNAME for win32, HOSTNAME @@ -112,7 +112,7 @@ </target> <!-- Check JBoss --> - <target name="check-jboss"> + <target name="check-jboss" if="integration.target.jboss"> <available property="jboss.available" file="${jboss.home}/client/jboss-client.jar"/> <fail message="JBoss not available: ${jboss.home}" unless="jboss.available"/> @@ -123,15 +123,19 @@ <property name="jboss.server.deploy" value="${jboss.server}/deploy"/> <property name="jboss.server.lib" value="${jboss.server}/lib"/> + <!-- Define excluded tests --> + <property name="excludes-short-name" value="tests-jboss-excludes.txt"/> + <property name="excludesfile" value="${common.resources}/${excludes-short-name}"/> + </target> <!-- Check tomcat --> - <target name="check-tomcat" if="jbossws.integration.target.tomcat"> + <target name="check-tomcat" if="integration.target.tomcat"> <available property="tomcat.available" file="${tomcat.home}/server/lib/catalina.jar"/> <condition property="cannot.use.tomcat"> <and> - <isset property="jbossws.integration.target.tomcat"/> + <isset property="integration.target.tomcat"/> <not> <isset property="tomcat.available"/> </not> @@ -139,12 +143,16 @@ </condition> <fail message="Tomcat not available: ${tomcat.home}" if="cannot.use.tomcat"/> + <!-- Define excluded tests --> + <property name="excludes-short-name" value="tests-tomcat-excludes.txt"/> + <property name="excludesfile" value="${common.resources}/${excludes-short-name}"/> + </target> <!-- Compile the java sources --> <target name="compile" depends="init,thirdparty" description="compile the sources"> - <javac destdir="${build.tests.dir}/classes" classpathref="compile.classpath" debug="on"> + <javac destdir="${build.tests.dir}/classes" classpathref="compile.classpath" debug="on" excludesfile="${excludesfile}"> <src path="${common.java}"/> <src path="${java.dir}"/> </javac> Added: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/tests-jboss-excludes.txt =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/tests-jboss-excludes.txt (rev 0) +++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/tests-jboss-excludes.txt 2007-01-25 17:56:54 UTC (rev 2117) @@ -0,0 +1,2 @@ + +# Nothing to exclude Property changes on: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/tests-jboss-excludes.txt ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF Added: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/tests-tomcat-excludes.txt =================================================================== --- branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/tests-tomcat-excludes.txt (rev 0) +++ branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/tests-tomcat-excludes.txt 2007-01-25 17:56:54 UTC (rev 2117) @@ -0,0 +1,16 @@ + +# EJB/Injection excludes +org/jboss/test/ws/jaxrpc/samples/jmstransport/JMSTransportTestCase.* +org/jboss/test/ws/jaxrpc/samples/jsr109ejb/*TestCase.* +org/jboss/test/ws/jaxrpc/samples/secureejb/*TestCase.* +org/jboss/test/ws/jaxws/samples/jsr181ejb/** +org/jboss/test/ws/jaxws/samples/retail/** + +# JBoss excludes +org/jboss/test/ws/jaxrpc/samples/dynamichandler/*TestCase.* +org/jboss/test/ws/jaxrpc/samples/wsbpel/** + +# TODO: Why are these excluded +# [JBWS-1471] - Remove unwanted tomcat excludes +org/jboss/test/ws/jaxrpc/samples/wssecurity/StorePassEncryptTestCase.* +org/jboss/test/ws/jaxws/samples/wseventing/** Property changes on: branches/jbossws-1.2.0/jbossws-core/src/main/resources/samples/common/tests-tomcat-excludes.txt ___________________________________________________________________ Name: svn:keywords + Id Revision Name: svn:eol-style + LF