Author: chris.laprun(a)jboss.com Date: 2010-12-13 10:11:52 -0500 (Mon, 13 Dec 2010) New Revision: 5582 Added: components/wsrp/branches/2.0.x/consumer/src/test/resources/wsdl/both-services.wsdl components/wsrp/branches/2.0.x/consumer/src/test/resources/wsdl/dot-net-composite.wsdl components/wsrp/branches/2.0.x/consumer/src/test/resources/wsdl/simplev1.wsdl components/wsrp/branches/2.0.x/consumer/src/test/resources/wsdl/simplev2.wsdl Modified: components/wsrp/branches/2.0.x/consumer/src/test/java/org/gatein/wsrp/consumer/services/SOAPServiceFactoryTestCase.java Log: - GTNWSRP-190: Use local WSDL files instead of relying on external services. Modified: components/wsrp/branches/2.0.x/consumer/src/test/java/org/gatein/wsrp/consumer/services/SOAPServiceFactoryTestCase.java =================================================================== --- components/wsrp/branches/2.0.x/consumer/src/test/java/org/gatein/wsrp/consumer/services/SOAPServiceFactoryTestCase.java 2010-12-13 15:02:35 UTC (rev 5581) +++ components/wsrp/branches/2.0.x/consumer/src/test/java/org/gatein/wsrp/consumer/services/SOAPServiceFactoryTestCase.java 2010-12-13 15:11:52 UTC (rev 5582) @@ -89,25 +89,25 @@ public void testSimpleV2Service() throws Exception { - factory.setWsdlDefinitionURL("http://www.netunitysoftware.com/wsrp2i...; + factory.setWsdlDefinitionURL(getWSDLURL("wsdl/simplev2.wsdl")); checkPorts(WSRP2_PORT_TYPES); } public void testSimpleV1Service() throws Exception { - factory.setWsdlDefinitionURL("http://www.netunitysoftware.com/wsrp2i...; + factory.setWsdlDefinitionURL(getWSDLURL("wsdl/simplev1.wsdl")); checkPorts(WSRP1_PORT_TYPES); } public void testBothServices() throws Exception { - factory.setWsdlDefinitionURL("http://www.netunitysoftware.com/wsrp2i...; + factory.setWsdlDefinitionURL(getWSDLURL("wsdl/both-services.wsdl")); checkPorts(WSRP2_PORT_TYPES); } public void testDefaultDotNetWSDLCompositeService() throws Exception { - factory.setWsdlDefinitionURL("http://www.netunitysoftware.com/wsrp2i...; + factory.setWsdlDefinitionURL(getWSDLURL("wsdl/dot-net-composite.wsdl")); try { checkPorts(WSRP2_PORT_TYPES); Added: components/wsrp/branches/2.0.x/consumer/src/test/resources/wsdl/both-services.wsdl =================================================================== --- components/wsrp/branches/2.0.x/consumer/src/test/resources/wsdl/both-services.wsdl (rev 0) +++ components/wsrp/branches/2.0.x/consumer/src/test/resources/wsdl/both-services.wsdl 2010-12-13 15:11:52 UTC (rev 5582) @@ -0,0 +1,47 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions targetNamespace="urn:oasis:names:tc:wsrp:v2:wsdl" + xmlns:v2bind="urn:oasis:names:tc:wsrp:v2:bind" + xmlns:v1bind="urn:oasis:names:tc:wsrp:v1:bind" + + xmlns="http://schemas.xmlsoap.org/wsdl/" + + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + + <!-- Original from http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.asmx?Operation=... --> + <import namespace="urn:oasis:names:tc:wsrp:v2:bind" + location="http://docs.oasis-open.org/wsrp/v2/wsrp-2.0-bindings.wsdl&... + <import namespace="urn:oasis:names:tc:wsrp:v1:bind" + location="http://www.oasis-open.org/committees/wsrp/specifications/v... + + <wsdl:service name="WSRP_v1_Service"> + <wsdl:port binding="v1bind:WSRP_v1_Markup_Binding_SOAP" name="WSRPBaseService"> + <soap:address location="http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.... + </wsdl:port> + <wsdl:port binding="v1bind:WSRP_v1_ServiceDescription_Binding_SOAP" name="WSRPServiceDescriptionService"> + <soap:address location="http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.... + </wsdl:port> + <wsdl:port binding="v1bind:WSRP_v1_Registration_Binding_SOAP" name="WSRPRegistrationService"> + <soap:address location="http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.... + </wsdl:port> + <wsdl:port binding="v1bind:WSRP_v1_PortletManagement_Binding_SOAP" name="WSRPPortletManagementService"> + <soap:address location="http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.... + </wsdl:port> + </wsdl:service> + + <wsdl:service name="WSRP_v2_Service"> + <wsdl:port binding="v2bind:WSRP_v2_Markup_Binding_SOAP" name="WSRP_v2_Markup_Binding_SOAP"> + <soap:address location="http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.... + </wsdl:port> + <wsdl:port binding="v2bind:WSRP_v2_ServiceDescription_Binding_SOAP" + name="WSRP_v2_ServiceDescription_Binding_SOAP"> + <soap:address location="http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.... + </wsdl:port> + <wsdl:port binding="v2bind:WSRP_v2_Registration_Binding_SOAP" name="WSRP_v2_Registration_Binding_SOAP"> + <soap:address location="http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.... + </wsdl:port> + <wsdl:port binding="v2bind:WSRP_v2_PortletManagement_Binding_SOAP" name="WSRP_v2_PortletManagement_Binding_SOAP"> + <soap:address location="http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.... + </wsdl:port> + </wsdl:service> +</wsdl:definitions> Added: components/wsrp/branches/2.0.x/consumer/src/test/resources/wsdl/dot-net-composite.wsdl =================================================================== --- components/wsrp/branches/2.0.x/consumer/src/test/resources/wsdl/dot-net-composite.wsdl (rev 0) +++ components/wsrp/branches/2.0.x/consumer/src/test/resources/wsdl/dot-net-composite.wsdl 2010-12-13 15:11:52 UTC (rev 5582) @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="utf-8"?> +<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:tm="http://microsoft.com/wsdl/mime/textMatching/" + xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/" + xmlns:mime="http://schemas.xmlsoap.org/wsdl/mime/" xmlns:tns="urn:netunitysoftware:wsrp2interop" + xmlns:i0="urn:oasis:names:tc:wsrp:v1:bind" xmlns:i1="urn:oasis:names:tc:wsrp:v2:bind" + xmlns:s="http://www.w3.org/2001/XMLSchema" xmlns:soap12="http://schemas.xmlsoap.org/wsdl/soap12/" + xmlns:http="http://schemas.xmlsoap.org/wsdl/http/" targetNamespace="urn:netunitysoftware:wsrp2interop" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"> + <!-- Original from http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.asmx?WSDL --> + <wsdl:import namespace="urn:oasis:names:tc:wsrp:v1:bind" + location="http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.... + <wsdl:import namespace="urn:oasis:names:tc:wsrp:v2:bind" + location="http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.... + <wsdl:types> + <s:schema targetNamespace="urn:netunitysoftware:wsrp2interop"> + <s:import schemaLocation="http://www.netunitysoftware.com/wsrp2interop/WsrpPro... + namespace="urn:oasis:names:tc:wsrp:v1:types"/> + <s:import schemaLocation="http://www.netunitysoftware.com/wsrp2interop/WsrpPro... + namespace="urn:oasis:names:tc:wsrp:v2:types"/> + </s:schema> + </wsdl:types> + <wsdl:service name="WsrpProducer"> + <wsdl:port name="WSRP_v1_PortletManagement_Binding_SOAP" binding="i0:WSRP_v1_PortletManagement_Binding_SOAP"> + <soap:address location="http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.... + </wsdl:port> + <wsdl:port name="WSRP_v1_ServiceDescription_Binding_SOAP" binding="i0:WSRP_v1_ServiceDescription_Binding_SOAP"> + <soap:address location="http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.... + </wsdl:port> + <wsdl:port name="WSRP_v2_ServiceDescription_Binding_SOAP" binding="i1:WSRP_v2_ServiceDescription_Binding_SOAP"> + <soap:address location="http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.... + </wsdl:port> + <wsdl:port name="WSRP_v1_Markup_Binding_SOAP" binding="i0:WSRP_v1_Markup_Binding_SOAP"> + <soap:address location="http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.... + </wsdl:port> + <wsdl:port name="WSRP_v2_PortletManagement_Binding_SOAP" binding="i1:WSRP_v2_PortletManagement_Binding_SOAP"> + <soap:address location="http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.... + </wsdl:port> + <wsdl:port name="WSRP_v1_Registration_Binding_SOAP" binding="i0:WSRP_v1_Registration_Binding_SOAP"> + <soap:address location="http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.... + </wsdl:port> + <wsdl:port name="WSRP_v2_Registration_Binding_SOAP" binding="i1:WSRP_v2_Registration_Binding_SOAP"> + <soap:address location="http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.... + </wsdl:port> + <wsdl:port name="WSRP_v2_Markup_Binding_SOAP" binding="i1:WSRP_v2_Markup_Binding_SOAP"> + <soap:address location="http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.... + </wsdl:port> + </wsdl:service> +</wsdl:definitions> \ No newline at end of file Added: components/wsrp/branches/2.0.x/consumer/src/test/resources/wsdl/simplev1.wsdl =================================================================== --- components/wsrp/branches/2.0.x/consumer/src/test/resources/wsdl/simplev1.wsdl (rev 0) +++ components/wsrp/branches/2.0.x/consumer/src/test/resources/wsdl/simplev1.wsdl 2010-12-13 15:11:52 UTC (rev 5582) @@ -0,0 +1,22 @@ +<?xml version = '1.0'?> +<wsdl:definitions xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:bind="urn:oasis:names:tc:wsrp:v1:bind" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + targetNamespace="urn:oasis:names:tc:wsrp:v1:wsdl"> + <!-- Original from http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.asmx?Operation=... --> + <import namespace="urn:oasis:names:tc:wsrp:v1:bind" + location="http://www.oasis-open.org/committees/wsrp/specifications/v... + <wsdl:service name="WSRPService"> + <wsdl:port binding="bind:WSRP_v1_Markup_Binding_SOAP" name="WSRPBaseService"> + <soap:address location="http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.... + </wsdl:port> + <wsdl:port binding="bind:WSRP_v1_ServiceDescription_Binding_SOAP" name="WSRPServiceDescriptionService"> + <soap:address location="http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.... + </wsdl:port> + <wsdl:port binding="bind:WSRP_v1_Registration_Binding_SOAP" name="WSRPRegistrationService"> + <soap:address location="http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.... + </wsdl:port> + <wsdl:port binding="bind:WSRP_v1_PortletManagement_Binding_SOAP" name="WSRPPortletManagementService"> + <soap:address location="http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.... + </wsdl:port> + </wsdl:service> +</wsdl:definitions> \ No newline at end of file Added: components/wsrp/branches/2.0.x/consumer/src/test/resources/wsdl/simplev2.wsdl =================================================================== --- components/wsrp/branches/2.0.x/consumer/src/test/resources/wsdl/simplev2.wsdl (rev 0) +++ components/wsrp/branches/2.0.x/consumer/src/test/resources/wsdl/simplev2.wsdl 2010-12-13 15:11:52 UTC (rev 5582) @@ -0,0 +1,28 @@ +<?xml version="1.0" encoding="UTF-8"?> +<wsdl:definitions targetNamespace="urn:oasis:names:tc:wsrp:v2:wsdl" + xmlns:v2bind="urn:oasis:names:tc:wsrp:v2:bind" + + xmlns="http://schemas.xmlsoap.org/wsdl/" + + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"> + + <!-- Original from http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.asmx?Operation=... --> + <import namespace="urn:oasis:names:tc:wsrp:v2:bind" location="wsrp-2.0-bindings.wsdl"/> + + <wsdl:service name="WSRP_v2_Service"> + <wsdl:port binding="v2bind:WSRP_v2_Markup_Binding_SOAP" name="WSRP_v2_Markup_Binding_SOAP"> + <soap:address location="http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.... + </wsdl:port> + <wsdl:port binding="v2bind:WSRP_v2_ServiceDescription_Binding_SOAP" + name="WSRP_v2_ServiceDescription_Binding_SOAP"> + <soap:address location="http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.... + </wsdl:port> + <wsdl:port binding="v2bind:WSRP_v2_Registration_Binding_SOAP" name="WSRP_v2_Registration_Binding_SOAP"> + <soap:address location="http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.... + </wsdl:port> + <wsdl:port binding="v2bind:WSRP_v2_PortletManagement_Binding_SOAP" name="WSRP_v2_PortletManagement_Binding_SOAP"> + <soap:address location="http://www.netunitysoftware.com/wsrp2interop/WsrpProducer.... + </wsdl:port> + </wsdl:service> +</wsdl:definitions>