Author: ffang Date: Tue Jun 4 07:45:19 2013 New Revision: 1489310 URL: http://svn.apache.org/r1489310 Log: Merged revisions 1489306 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes
................ r1489306 | ffang | 2013-06-04 15:38:56 +0800 (二, 04 6 2013) | 13 lines Merged revisions 1489304-1489305 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1489304 | ffang | 2013-06-04 15:21:54 +0800 (二, 04 6 2013) | 1 line [CXF-5047]add a testcase to demonstrate that how multiple endpoints with publishedEndpointUrl property work ........ r1489305 | ffang | 2013-06-04 15:27:15 +0800 (二, 04 6 2013) | 1 line [CXF-5047]more clean up ........ ................ Modified: cxf/branches/2.6.x-fixes/ (props changed) cxf/branches/2.6.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java cxf/branches/2.6.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java cxf/branches/2.6.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/cxf-servlet.xml Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Merged /cxf/branches/2.7.x-fixes:r1489306 Merged /cxf/trunk:r1489304-1489305 Propchange: cxf/branches/2.6.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.6.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java?rev=1489310&r1=1489309&r2=1489310&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java (original) +++ cxf/branches/2.6.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java Tue Jun 4 07:45:19 2013 @@ -19,10 +19,13 @@ package org.apache.cxf.systest.servlet; + import java.util.HashSet; import java.util.Set; import javax.jws.WebService; +import javax.wsdl.factory.WSDLFactory; +import javax.wsdl.xml.WSDLReader; import javax.xml.ws.Endpoint; import javax.xml.ws.soap.SOAPBinding; @@ -39,6 +42,7 @@ import org.apache.cxf.Bus; import org.apache.cxf.BusException; import org.apache.cxf.BusFactory; import org.apache.cxf.helpers.DOMUtils; +import org.apache.cxf.helpers.XMLUtils; import org.apache.hello_world_soap_http.BaseGreeterImpl; import org.junit.Before; @@ -47,7 +51,7 @@ import org.junit.Test; public class CXFServletTest extends AbstractServletTest { - + @Before public void setUp() throws Exception { BusFactory.setDefaultBus(null); @@ -97,7 +101,7 @@ public class CXFServletTest extends Abst WebLink[] links = res.getLinks(); - assertEquals("Wrong number of service links", 4, links.length); + assertEquals("Wrong number of service links", 6, links.length); Set<String> links2 = new HashSet<String>(); for (WebLink l : links) { @@ -118,7 +122,7 @@ public class CXFServletTest extends Abst links2.add(l.getURLString()); } - assertEquals("Wrong number of service links", 4, links.length); + assertEquals("Wrong number of service links", 6, links.length); assertTrue(links2.contains(CONTEXT_URL + "/services/greeter?wsdl")); assertTrue(links2.contains(CONTEXT_URL + "/services/greeter2?wsdl")); assertTrue(links2.contains("http://cxf.apache.org/MyGreeter?wsdl";)); @@ -178,10 +182,35 @@ public class CXFServletTest extends Abst assertEquals("text/xml", res.getContentType()); Document doc = DOMUtils.readXml(res.getInputStream()); assertNotNull(doc); + XMLUtils.printDOM(doc); assertValid("//wsdl:operation[@name='greetMe']", doc); assertValid("//wsdlsoap:address[@location='" + CONTEXT_URL + "/services/greeter']", doc); } + + + @Test + public void testGetWSDLWithMultiplePublishedEndpointUrl() throws Exception { + ServletUnitClient client = newClient(); + client.setExceptionsThrownOnErrorStatus(true); + + WebRequest req = new GetMethodQueryWebRequest(CONTEXT_URL + "/services/greeter5?wsdl"); + + WebResponse res = client.getResponse(req); + assertEquals(200, res.getResponseCode()); + assertEquals("text/xml", res.getContentType()); + Document doc = DOMUtils.readXml(res.getInputStream()); + assertNotNull(doc); + WSDLReader wsdlReader = WSDLFactory.newInstance().newWSDLReader(); + wsdlReader.setFeature("javax.wsdl.verbose", false); + + + assertValid("//wsdl:service[@name='SOAPService']/wsdl:port[@name='SoapPort']/wsdlsoap:address[@location='" + + "http://cxf.apache.org/publishedEndpointUrl1']", doc); + assertValid("//wsdl:service[@name='SOAPService']/wsdl:port[@name='SoapPort1']/wsdlsoap:address[@location='" + + "http://cxf.apache.org/publishedEndpointUrl2']", doc); + + } @Test public void testGetWSDLWithIncludes() throws Exception { ServletUnitClient client = newClient(); Modified: cxf/branches/2.6.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java?rev=1489310&r1=1489309&r2=1489310&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java (original) +++ cxf/branches/2.6.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java Tue Jun 4 07:45:19 2013 @@ -59,7 +59,7 @@ public class ExternalServicesServletTest //test the '/' context get service list WebResponse res = client.getResponse(CONTEXT_URL + "/"); WebLink[] links = res.getLinks(); - assertEquals("Wrong number of service links", 4, links.length); + assertEquals("Wrong number of service links", 6, links.length); Set<String> links2 = new HashSet<String>(); for (WebLink l : links) { Modified: cxf/branches/2.6.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/cxf-servlet.xml URL: http://svn.apache.org/viewvc/cxf/branches/2.6.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/cxf-servlet.xml?rev=1489310&r1=1489309&r2=1489310&view=diff ============================================================================== --- cxf/branches/2.6.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/cxf-servlet.xml (original) +++ cxf/branches/2.6.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/cxf-servlet.xml Tue Jun 4 07:45:19 2013 @@ -57,5 +57,24 @@ http://cxf.apache.org/jaxws http://cxf.a </jaxws:properties> </jaxws:endpoint> + <jaxws:endpoint + id="greeter5" + address="/greeter5" + publishedEndpointUrl="http://cxf.apache.org/publishedEndpointUrl1"; + implementor="org.apache.hello_world_soap_http.GreeterImpl" + wsdlLocation="/org/apache/cxf/systest/servlet/hello_world.wsdl" + serviceName="e:SOAPService" + endpointName="e:SoapPort" + xmlns:e="http://apache.org/hello_world_soap_http"; /> + + <jaxws:endpoint + id="greeter6" + address="/greeter6" + publishedEndpointUrl="http://cxf.apache.org/publishedEndpointUrl2"; + implementor="org.apache.hello_world_soap_http.GreeterImpl" + wsdlLocation="/org/apache/cxf/systest/servlet/hello_world.wsdl" + serviceName="e:SOAPService" + endpointName="e:SoapPort1" + xmlns:e="http://apache.org/hello_world_soap_http"; /> -</beans> \ No newline at end of file +</beans>
