Author: jim.ma Date: 2010-11-26 02:37:18 -0500 (Fri, 26 Nov 2010) New Revision: 13336 Modified: framework/branches/jbossws-framework-3.4.0/testsuite/test/ant-import/build-jars-jaxws.xml framework/branches/jbossws-framework-3.4.0/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3140/MTOMTestImpl.java framework/branches/jbossws-framework-3.4.0/testsuite/test/resources/jaxws/jbws3140/WEB-INF-Server/webservices.xml Log: [JBWS-3140][JBWS-3141]:Updated the test to without wsdlLocation specified Modified: framework/branches/jbossws-framework-3.4.0/testsuite/test/ant-import/build-jars-jaxws.xml =================================================================== --- framework/branches/jbossws-framework-3.4.0/testsuite/test/ant-import/build-jars-jaxws.xml 2010-11-25 12:04:50 UTC (rev 13335) +++ framework/branches/jbossws-framework-3.4.0/testsuite/test/ant-import/build-jars-jaxws.xml 2010-11-26 07:37:18 UTC (rev 13336) @@ -958,15 +958,13 @@ <classes dir="${tests.output.dir}/test-classes"> <include name="org/jboss/test/ws/jaxws/jbws3140/*.class" /> <include name="org/jboss/test/ws/jaxws/jbws3140/server*.xml" /> + <exclude name="org/jboss/test/ws/jaxws/jbws3140/*EndpointService.class" /> <exclude name="org/jboss/test/ws/jaxws/jbws3140/*TestCase.class" /> <exclude name="org/jboss/test/ws/jaxws/jbws3140/*TestClient.class" /> </classes> <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws3140/WEB-INF-Server"> <include name="*.xml" /> </webinf> - <webinf dir="${tests.output.dir}/test-resources/jaxws/jbws3140"> - <include name="wsdl/*.wsdl"/> - </webinf> </war> <war warfile="${tests.output.dir}/test-libs/jbws3140-responses-server.war" webxml="${tests.output.dir}/test-resources/jaxws/jbws3140/WEB-INF-Server/web.xml"> <classes dir="${tests.output.dir}/test-classes"> Modified: framework/branches/jbossws-framework-3.4.0/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3140/MTOMTestImpl.java =================================================================== --- framework/branches/jbossws-framework-3.4.0/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3140/MTOMTestImpl.java 2010-11-25 12:04:50 UTC (rev 13335) +++ framework/branches/jbossws-framework-3.4.0/testsuite/test/java/org/jboss/test/ws/jaxws/jbws3140/MTOMTestImpl.java 2010-11-26 07:37:18 UTC (rev 13336) @@ -27,7 +27,6 @@ portName="MTOMTestPort", serviceName="TestEndpointService", targetNamespace="http://TestEndpoint.org", - wsdlLocation="WEB-INF/wsdl/TestEndpoint.wsdl", endpointInterface="org.jboss.test.ws.jaxws.jbws3140.MTOMTest" ) public class MTOMTestImpl implements MTOMTest Modified: framework/branches/jbossws-framework-3.4.0/testsuite/test/resources/jaxws/jbws3140/WEB-INF-Server/webservices.xml =================================================================== --- framework/branches/jbossws-framework-3.4.0/testsuite/test/resources/jaxws/jbws3140/WEB-INF-Server/webservices.xml 2010-11-25 12:04:50 UTC (rev 13335) +++ framework/branches/jbossws-framework-3.4.0/testsuite/test/resources/jaxws/jbws3140/WEB-INF-Server/webservices.xml 2010-11-26 07:37:18 UTC (rev 13336) @@ -6,7 +6,6 @@ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/javaee_web_services_1_3.xsd"> <webservice-description> <webservice-description-name>MTOMTestService</webservice-description-name> - <wsdl-file>WEB-INF/wsdl/TestEndpoint.wsdl</wsdl-file> <port-component> <port-component-name>MTOMTestImpl</port-component-name> <wsdl-port>wsdl:MTOMTestPort</wsdl-port>