Author: jim.ma Date: 2010-09-28 23:01:03 -0400 (Tue, 28 Sep 2010) New Revision: 13038 Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmsendpoints/jmstransport/JMSEndpointsTestCase.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/FromJavaJMSTransportTestCase.java stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java Log: [JBWS-3127]:Fix the build-Add queue deployment dependency to assure the jms queue deployed first Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2010-09-28 17:33:40 UTC (rev 13037) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2010-09-29 03:01:03 UTC (rev 13038) @@ -17,6 +17,11 @@ <mkdir dir="${tests.output.dir}/test-libs"/> <!-- jaxws-samples-jmstransport --> + <jar jarfile="${tests.output.dir}/test-libs/hornetq-samples-jmstransport-as6.sar"> + <fileset dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/META-INF"> + <include name="hornetq-jms.xml"/> + </fileset> + </jar> <war warfile="${tests.output.dir}/test-libs/jaxws-samples-jmstransport.war" webxml="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/WEB-INF/web.xml"> @@ -30,34 +35,41 @@ </webinf> </war> - <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-jmstransport-as6.sar"> - <fileset dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/META-INF"> + <!-- jms transport from java for as6 --> + + <jar jarfile="${tests.output.dir}/test-libs/hornetq-fromjava-jmsendpoints-as6.sar"> + <fileset dir="${tests.output.dir}/test-resources/jaxws/samples/jmsendpoints/META-INF"> <include name="hornetq-jms.xml"/> </fileset> </jar> - + <jar jarfile="${tests.output.dir}/test-libs/jaxws-fromjava-jmsendpoints-as6.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/jmstransport/Organization.class"/> <include name="org/jboss/test/ws/jaxws/samples/jmstransport/OrganizationJmsImpl.class"/> </fileset> <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/fromjava/META-INF"> - <include name="hornetq-jms.xml"/> <include name="jbossws-cxf.xml"/> + <include name="jboss-dependency.xml"/> </metainf> </jar> + + <!-- jms endpoints sample--> + + <jar jarfile="${tests.output.dir}/test-libs/hornetq-jmsendpoints-as6.sar"> + <fileset dir="${tests.output.dir}/test-resources/jaxws/samples/jmsendpoints/META-INF"> + <include name="hornetq-jms.xml"/> + </fileset> + </jar> - - <!-- jms endpoints sample--> - <!-- jms transport from java for as6 --> <jar jarfile="${tests.output.dir}/test-libs/jaxws-samples-jmsendpoints-as6.jar"> <fileset dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/samples/jmsendpoints/jmstransport/Organization.class"/> <include name="org/jboss/test/ws/jaxws/samples/jmsendpoints/jmstransport/OrganizationJmsEndpoint.class"/> </fileset> <metainf dir="${tests.output.dir}/test-resources/jaxws/samples/jmsendpoints/META-INF"> - <include name="hornetq-jms.xml"/> <include name="jbossws-cxf.xml"/> + <include name="jboss-dependency.xml"/> </metainf> </jar> Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmsendpoints/jmstransport/JMSEndpointsTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmsendpoints/jmstransport/JMSEndpointsTestCase.java 2010-09-28 17:33:40 UTC (rev 13037) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmsendpoints/jmstransport/JMSEndpointsTestCase.java 2010-09-29 03:01:03 UTC (rev 13038) @@ -56,7 +56,7 @@ public static Test suite() throws Exception { if (isHornetQAvailable()) { - return new JBossWSTestSetup(JMSEndpointsTestCase.class, "jaxws-samples-jmsendpoints-as6.jar"); + return new JBossWSTestSetup(JMSEndpointsTestCase.class, "hornetq-jmsendpoints-as6.sar, jaxws-samples-jmsendpoints-as6.jar"); } else { return new TestSuite(); } Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/FromJavaJMSTransportTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/FromJavaJMSTransportTestCase.java 2010-09-28 17:33:40 UTC (rev 13037) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/FromJavaJMSTransportTestCase.java 2010-09-29 03:01:03 UTC (rev 13038) @@ -58,7 +58,7 @@ if (isHornetQAvailable()) { return new JBossWSTestSetup(FromJavaJMSTransportTestCase.class, - "jaxws-fromjava-jmsendpoints-as6.jar"); + "hornetq-fromjava-jmsendpoints-as6.sar, jaxws-fromjava-jmsendpoints-as6.jar"); } else { Modified: stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java =================================================================== --- stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java 2010-09-28 17:33:40 UTC (rev 13037) +++ stack/cxf/trunk/modules/testsuite/cxf-spring-tests/src/test/java/org/jboss/test/ws/jaxws/samples/jmstransport/JMSTransportTestCase.java 2010-09-29 03:01:03 UTC (rev 13038) @@ -66,7 +66,7 @@ if (isHornetQAvailable()) { return new JBossWSTestSetup(JMSTransportTestCase.class, - "jaxws-samples-jmstransport-as6.sar, jaxws-samples-jmstransport.war"); + "hornetq-samples-jmstransport-as6.sar, jaxws-samples-jmstransport.war"); } else {