Author: rsvoboda(a)redhat.com Date: 2013-03-26 08:15:49 -0400 (Tue, 26 Mar 2013) New Revision: 17417 Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/ shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3140/EndpointService.java Log: BZ 899644 - merge from trunk - svn merge -r 17388:17389 http://svn.jboss.org/repos/jbossws/shared-testsuite/trunk/ Property changes on: shared-testsuite/branches/jbossws-shared-testsuite-4.1.x ___________________________________________________________________ Modified: svn:mergeinfo - /shared-testsuite/branches/asoldano:14040-14045 + /shared-testsuite/branches/asoldano:14040-14045 /shared-testsuite/trunk:17389 Modified: shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3140/EndpointService.java =================================================================== --- shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3140/EndpointService.java 2013-03-26 11:43:31 UTC (rev 17416) +++ shared-testsuite/branches/jbossws-shared-testsuite-4.1.x/testsuite/src/test/java/org/jboss/test/ws/jaxws/jbws3140/EndpointService.java 2013-03-26 12:15:49 UTC (rev 17417) @@ -98,13 +98,8 @@ { return super.getPort(new QName("http://TestEndpoint.org", "MTOMTestPort"), MTOMTest.class); } - - @WebEndpoint(name = "MTOMTestPort2") - public MTOMTest getMTOMTestPort2() - { - return super.getPort(new QName("http://TestEndpoint.org", "MTOMTestPort2"), MTOMTest.class); - } + /** * * @param features @@ -120,12 +115,7 @@ return super.getPort(new QName("http://TestEndpoint.org", "MTOMTestPort"), MTOMTest.class, features); } - @WebEndpoint(name = "MTOMTestPort2") - public MTOMTest getMTOMTestPort2(WebServiceFeature... features) - { - return super.getPort(new QName("http://TestEndpoint.org", "MTOMTestPort2"), MTOMTest.class, features); - } - + private static URL __getWsdlLocation() { if (TESTENDPOINTSERVICE_EXCEPTION != null)