Author: asoldano Date: 2014-02-03 12:40:34 -0500 (Mon, 03 Feb 2014) New Revision: 18305 Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxws.xml Log: Fixing binary distro testsuite regressions: move the endpoint publish build to build-jars-jaxws.xml where it really belongs to (not being meant to be part of the bindist) Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml 2014-02-03 17:02:53 UTC (rev 18304) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-jars-jaxws.xml 2014-02-03 17:40:34 UTC (rev 18305) @@ -32,6 +32,28 @@ <target name="build-jars-jaxws" description="Build the deployments."> + <!-- endpoint-publish.war --> + <war warfile="${tests.output.dir}/test-libs/endpoint-publish.war" needxmlfile='false'> + <classes dir="${tests.output.dir}/test-classes"> + <include name="org/jboss/test/ws/publish/**/*.class"/> + <include name="org/jboss/test/ws/publish/EndpointImpl5.xml"/> + <include name="org/jboss/test/ws/publish/TestService.xml"/> + <exclude name="org/jboss/test/ws/publish/*TestCase.class"/> + </classes> + <classes dir="${tests.output.dir}/test-classes/org/jboss/test/ws/publish"> + <include name="WEB-INF/wsdl/**" /> + </classes> + <webinf dir="${tests.output.dir}/test-resources/publish/WEB-INF"> + <include name="wsdl/**"/> + </webinf> + <zipfileset dir="${tests.output.dir}/test-resources/publish/META-INF" prefix="META-INF"> + <include name="permissions.xml"/> + </zipfileset> + <manifest> + <attribute name="Dependencies" value="org.jboss.ws.common" /> + </manifest> + </war> + <!-- jaxws-anonymous --> <war warfile="${tests.output.dir}/test-libs/jaxws-anonymous.war" webxml="${tests.output.dir}/test-resources/jaxws/anonymous/WEB-INF/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Modified: stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxws.xml =================================================================== --- stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxws.xml 2014-02-03 17:02:53 UTC (rev 18304) +++ stack/cxf/trunk/modules/testsuite/shared-tests/src/test/ant-import/build-samples-jaxws.xml 2014-02-03 17:40:34 UTC (rev 18305) @@ -553,28 +553,6 @@ </classes> </war> - <!-- endpoint-publish.war --> - <war warfile="${tests.output.dir}/test-libs/endpoint-publish.war" needxmlfile='false'> - <classes dir="${tests.output.dir}/test-classes"> - <include name="org/jboss/test/ws/publish/**/*.class"/> - <include name="org/jboss/test/ws/publish/EndpointImpl5.xml"/> - <include name="org/jboss/test/ws/publish/TestService.xml"/> - <exclude name="org/jboss/test/ws/publish/*TestCase.class"/> - </classes> - <classes dir="${tests.output.dir}/test-classes/org/jboss/test/ws/publish" erroronmissingdir="false"> - <include name="WEB-INF/wsdl/**" /> - </classes> - <webinf dir="${tests.output.dir}/test-resources/publish/WEB-INF" erroronmissingdir="false"> - <include name="wsdl/**"/> - </webinf> - <zipfileset dir="${tests.output.dir}/test-resources/publish/META-INF" prefix="META-INF"> - <include name="permissions.xml"/> - </zipfileset> - <manifest> - <attribute name="Dependencies" value="org.jboss.ws.common" /> - </manifest> - </war> - <!-- management-recording-as7.jar --> <jar destfile="${tests.output.dir}/test-libs/management-recording-as7.jar"> <fileset dir="${tests.output.dir}/test-classes">