[jbossws-commits] JBossWS SVN: r15785 - in stack/cxf/branches/jbossws-cxf-4.0.x: modules/testsuite/cxf-spring-tests/scripts and 1 other directory.

Author: ropalka Date: 2012-02-29 01:31:24 -0500 (Wed, 29 Feb 2012) New Revision: 15785 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml Log: Merged revisions 15784 via svnmerge from https://svn.jboss.org/repos/jbossws/stack/cxf/trunk ....... r15784 | ropalka | 2012-02-29 07:27:58 +0100 (Wed, 29 Feb 2012) | 1 line fix build failure ....... Property changes on: stack/cxf/branches/jbossws-cxf-4.0.x ___________________________________________________________________ Modified: svnmerge-integrated - https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... + https://svn.jboss.org/repos/jbossws/stack/cxf/trunk:1-15635,15658,15668,1... Modified: svn:mergeinfo - /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781 + /stack/cxf/branches/asoldano:14032-14050,14068 /stack/cxf/trunk:15658,15668,15674-15675,15682,15695-15697,15708,15711,15713,15719,15723-15730,15738,15743,15748,15750-15751,15754-15757,15765-15766,15768,15773,15780-15781,15784 Modified: stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml =================================================================== --- stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2012-02-29 06:27:58 UTC (rev 15784) +++ stack/cxf/branches/jbossws-cxf-4.0.x/modules/testsuite/cxf-spring-tests/scripts/cxf-samples-jaxws.xml 2012-02-29 06:31:24 UTC (rev 15785) @@ -32,25 +32,6 @@ <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"> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/jaxws/samples/jmstransport/*.class"/> - </classes> - <webinf dir="${tests.output.dir}/test-resources/jaxws/samples/jmstransport/WEB-INF"> - <include name="wsdl/**"/> - <include name="jbossws-cxf.xml"/> - <include name="jboss-web.xml"/> - </webinf> - </war> - <!-- jaxws-samples-wsrm --> <war warfile="${tests.output.dir}/test-libs/jaxws-samples-wsrm.war"