From: Dr. C. G. J. <cg...@us...> - 2003-11-19 17:02:52
|
User: cgjung Date: 03/11/19 09:02:51 Modified: . build.xml Log: Full ws4eesimple test. Revision Changes Path 1.310 +25 -16 jbosstest/build.xml Index: build.xml =================================================================== RCS file: /cvsroot/jboss/jbosstest/build.xml,v retrieving revision 1.309 retrieving revision 1.310 diff -u -r1.309 -r1.310 --- build.xml 18 Nov 2003 22:48:30 -0000 1.309 +++ build.xml 19 Nov 2003 17:02:50 -0000 1.310 @@ -15,7 +15,7 @@ <!-- --> <!-- ====================================================================== --> -<!-- $Id: build.xml,v 1.309 2003/11/18 22:48:30 tdiesler Exp $ --> +<!-- $Id: build.xml,v 1.310 2003/11/19 17:02:50 cgjung Exp $ --> <project default="main" name="JBoss/Testsuite"> @@ -3659,14 +3659,33 @@ </webinf> <fileset dir="${source.resources}/webservice/ws4eesimple"> <include name="WEB-INF/webservices.xml"/> + <include name="WEB-INF/web.xml"/> </fileset> </war> + <!-- build ws4eesimpleclient.jar --> + <jar destfile="${build.lib}/ws4eesimpleclient.jar" manifest="${build.etc}/manifest.mf"> + <fileset dir="${build.classes}"> + <include name="org/jboss/test/webservice/ws4eesimple/HelloWs.class"/> + </fileset> + <fileset dir="${source.resources}/webservice/ws4eesimple"> + <include name="META-INF/webservicesclient.xml"/> + <include name="META-INF/HelloClient.wsdl"/> + </fileset> + <fileset dir="${source.resources}/webservice/ws4eesimple/"> + <include name="META-INF/HelloMapping.xml"/> + </fileset> + </jar> + <ear destfile="${build.lib}/ws4eesimple.ear" manifest="${build.etc}/manifest.mf" appxml="${source.resources}/webservice/ws4eesimple/META-INF/application.xml"> <fileset dir="${build.lib}"> <include name="ws4eesimple.jar"/> <include name="ws4eesimple.war"/> + <include name="ws4eesimpleclient.jar"/> + </fileset> + <fileset dir="${source.resources}/webservice/ws4eesimple"> + <include name="META-INF/application.xml"/> </fileset> </ear> @@ -3711,19 +3730,7 @@ </war> --> - <!-- build ws4eesimpleclient.jar --> - <jar destfile="${build.lib}/ws4eesimpleclient.jar" manifest="${build.etc}/manifest.mf"> - <fileset dir="${build.classes}"> - <include name="org/jboss/test/webservice/ws4eesimple/HelloWs.class"/> - </fileset> - <fileset dir="${source.resources}/webservice/ws4eesimple"> - <include name="META-INF/webservicesclient.xml"/> - <include name="META-INF/HelloClient.wsdl"/> - </fileset> - <fileset dir="${source.resources}/webservice/ws4eesimple/"> - <include name="META-INF/HelloMapping.xml"/> - </fileset> - </jar> + </target> @@ -5329,6 +5336,8 @@ <target name="tests-webservice-unit" depends="maybejars"> <mkdir dir="${build.reports}"/> <mkdir dir="${build.testlog}"/> + <!-- choose a testpattern via a property --> + <property name="jbosstest.pattern" value="**"/> <junit dir="${module.output}" printsummary="${junit.printsummary}" haltonerror="${junit.haltonerror}" @@ -5337,7 +5346,7 @@ timeout="${junit.timeout}" jvm="${junit.jvm}"> - <jvmarg value="${junit.jvm.options}"/> + <jvmarg line="${junit.jvm.options}"/> <sysproperty key="jbosstest.deploy.dir" file="${build.lib}"/> <sysproperty key="jbosstest.secure" value="true"/> @@ -5365,7 +5374,7 @@ fork="${junit.batchtest.fork}"> <fileset dir="${build.classes}"> - <include name="**/test/webservice/**/*TestCase.class"/> + <include name="**/test/webservice/${jbosstest.pattern}/*TestCase.class"/> </fileset> </batchtest> </junit> |