Author: richard.opalka(a)jboss.com Date: 2010-04-14 04:14:15 -0400 (Wed, 14 Apr 2010) New Revision: 11982 Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/AddressingClientTestCase.java Log: fixing hudson regression Modified: stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2010-04-13 14:58:21 UTC (rev 11981) +++ stack/native/trunk/modules/testsuite/native-tests/scripts/build-samples-jaxws.xml 2010-04-14 08:14:15 UTC (rev 11982) @@ -59,13 +59,15 @@ <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/dar/META-INF"> <include name="jboss.xml"/> </metainf> + </jar> + <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-dar-queue-as6.sar"> <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/dar"> - <include name="jboss-service.xml"/> + <include name="hornetq-jms.xml"/> </metainf> </jar> <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-dar-queue.sar"> <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/dar"> - <include name="hornetq-jms.xml"/> + <include name="jboss-service.xml"/> </metainf> </jar> <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-dar-addressing-client.jar"> Modified: stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/AddressingClientTestCase.java =================================================================== --- stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/AddressingClientTestCase.java 2010-04-13 14:58:21 UTC (rev 11981) +++ stack/native/trunk/modules/testsuite/native-tests/src/test/java/org/jboss/test/ws/jaxws/samples/dar/AddressingClientTestCase.java 2010-04-14 08:14:15 UTC (rev 11982) @@ -46,7 +46,9 @@ public static Test suite() { //TODO: replace isHornetQAvailable call with JBossWSTestHelper.isTargetJBoss6() once AS 6 M3 is out and hence M2 is not supported anymore - return new JBossWSTestSetup(AddressingClientTestCase.class, isHornetQAvailable() ? "jaxws-samples-dar-queue.sar,jaxws-samples-dar-addressing-client.war,jaxws-samples-dar-addressing.jar" : "jaxws-samples-dar-addressing-client.war,jaxws-samples-dar-addressing.jar"); + return new JBossWSTestSetup(AddressingClientTestCase.class, isHornetQAvailable() + ? "jaxws-samples-dar-queue-as6.sar,jaxws-samples-dar-addressing-client.war,jaxws-samples-dar-addressing.jar" + : "jaxws-samples-dar-queue.sar,jaxws-samples-dar-addressing-client.war,jaxws-samples-dar-addressing.jar"); } private static boolean isHornetQAvailable()