Author: objectiser Date: 2011-09-29 05:28:06 -0400 (Thu, 29 Sep 2011) New Revision: 1459 Modified: branches/RiftSaw-2.3.x/samples/esb/esb_helloworld_saml/bpelContent/HelloWorld.wsdl branches/RiftSaw-2.3.x/samples/esb/esb_helloworld_saml/bpelContent/HelloWorldProxy.wsdl branches/RiftSaw-2.3.x/samples/esb/esb_helloworld_saml/bpelContent/HelloWorldWS.wsdl trunk/samples/esb/esb_helloworld_saml/bpelContent/HelloWorld.wsdl trunk/samples/esb/esb_helloworld_saml/bpelContent/HelloWorldProxy.wsdl trunk/samples/esb/esb_helloworld_saml/bpelContent/HelloWorldWS.wsdl Log: SOA-3398 Fix security element not in schema issue - thanks to Filip for the solution. Modified: branches/RiftSaw-2.3.x/samples/esb/esb_helloworld_saml/bpelContent/HelloWorld.wsdl =================================================================== --- branches/RiftSaw-2.3.x/samples/esb/esb_helloworld_saml/bpelContent/HelloWorld.wsdl 2011-09-20 15:11:19 UTC (rev 1458) +++ branches/RiftSaw-2.3.x/samples/esb/esb_helloworld_saml/bpelContent/HelloWorld.wsdl 2011-09-29 09:28:06 UTC (rev 1459) @@ -47,9 +47,9 @@ </xs:sequence> </xs:complexType> </xs:schema> - <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"> - <import namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... - </xsd:schema> + <xsd:schema targetNamespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401... xmlns="http://www.w3.org/2001/XMLSchema"> + <xsd:include schemaLocation="oasis-200401-wss-wssecurity-secext-1.0.xsd" /> + </xsd:schema> </wsdl:types> <message name="HelloWorld_sayHi"> Modified: branches/RiftSaw-2.3.x/samples/esb/esb_helloworld_saml/bpelContent/HelloWorldProxy.wsdl =================================================================== --- branches/RiftSaw-2.3.x/samples/esb/esb_helloworld_saml/bpelContent/HelloWorldProxy.wsdl 2011-09-20 15:11:19 UTC (rev 1458) +++ branches/RiftSaw-2.3.x/samples/esb/esb_helloworld_saml/bpelContent/HelloWorldProxy.wsdl 2011-09-29 09:28:06 UTC (rev 1459) @@ -28,8 +28,8 @@ </xs:sequence> </xs:complexType> </xs:schema> - <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"> - <import namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... + <xsd:schema targetNamespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401... xmlns="http://www.w3.org/2001/XMLSchema"> + <xsd:include schemaLocation="oasis-200401-wss-wssecurity-secext-1.0.xsd" /> </xsd:schema> </types> <message name="HelloWorld_sayHelloResponse"> Modified: branches/RiftSaw-2.3.x/samples/esb/esb_helloworld_saml/bpelContent/HelloWorldWS.wsdl =================================================================== --- branches/RiftSaw-2.3.x/samples/esb/esb_helloworld_saml/bpelContent/HelloWorldWS.wsdl 2011-09-20 15:11:19 UTC (rev 1458) +++ branches/RiftSaw-2.3.x/samples/esb/esb_helloworld_saml/bpelContent/HelloWorldWS.wsdl 2011-09-29 09:28:06 UTC (rev 1459) @@ -27,9 +27,9 @@ </xs:sequence> </xs:complexType> </xs:schema> - <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"> - <import namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... - </xsd:schema> + <xsd:schema targetNamespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401... xmlns="http://www.w3.org/2001/XMLSchema"> + <xsd:include schemaLocation="oasis-200401-wss-wssecurity-secext-1.0.xsd" /> + </xsd:schema> </types> <message name="HelloWorld_sayHello"> Modified: trunk/samples/esb/esb_helloworld_saml/bpelContent/HelloWorld.wsdl =================================================================== --- trunk/samples/esb/esb_helloworld_saml/bpelContent/HelloWorld.wsdl 2011-09-20 15:11:19 UTC (rev 1458) +++ trunk/samples/esb/esb_helloworld_saml/bpelContent/HelloWorld.wsdl 2011-09-29 09:28:06 UTC (rev 1459) @@ -47,9 +47,9 @@ </xs:sequence> </xs:complexType> </xs:schema> - <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"> - <import namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... - </xsd:schema> + <xsd:schema targetNamespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401... xmlns="http://www.w3.org/2001/XMLSchema"> + <xsd:include schemaLocation="oasis-200401-wss-wssecurity-secext-1.0.xsd" /> + </xsd:schema> </wsdl:types> <message name="HelloWorld_sayHi"> Modified: trunk/samples/esb/esb_helloworld_saml/bpelContent/HelloWorldProxy.wsdl =================================================================== --- trunk/samples/esb/esb_helloworld_saml/bpelContent/HelloWorldProxy.wsdl 2011-09-20 15:11:19 UTC (rev 1458) +++ trunk/samples/esb/esb_helloworld_saml/bpelContent/HelloWorldProxy.wsdl 2011-09-29 09:28:06 UTC (rev 1459) @@ -28,8 +28,8 @@ </xs:sequence> </xs:complexType> </xs:schema> - <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"> - <import namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... + <xsd:schema targetNamespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401... xmlns="http://www.w3.org/2001/XMLSchema"> + <xsd:include schemaLocation="oasis-200401-wss-wssecurity-secext-1.0.xsd" /> </xsd:schema> </types> <message name="HelloWorld_sayHelloResponse"> @@ -75,4 +75,4 @@ <plnk:role name="externalRole" portType="tns:HelloWorld"/> </plnk:partnerLinkType> -</definitions> \ No newline at end of file +</definitions> Modified: trunk/samples/esb/esb_helloworld_saml/bpelContent/HelloWorldWS.wsdl =================================================================== --- trunk/samples/esb/esb_helloworld_saml/bpelContent/HelloWorldWS.wsdl 2011-09-20 15:11:19 UTC (rev 1458) +++ trunk/samples/esb/esb_helloworld_saml/bpelContent/HelloWorldWS.wsdl 2011-09-29 09:28:06 UTC (rev 1459) @@ -27,9 +27,9 @@ </xs:sequence> </xs:complexType> </xs:schema> - <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"> - <import namespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-w... - </xsd:schema> + <xsd:schema targetNamespace="http://docs.oasis-open.org/wss/2004/01/oasis-200401... xmlns="http://www.w3.org/2001/XMLSchema"> + <xsd:include schemaLocation="oasis-200401-wss-wssecurity-secext-1.0.xsd" /> + </xsd:schema> </types> <message name="HelloWorld_sayHello"> @@ -66,4 +66,4 @@ <plnk:partnerLinkType name="theExternalService_PartnerLinkType"> <plnk:role name="callingTheExternalService" portType="tns:HelloWorld"/> </plnk:partnerLinkType> -</definitions> \ No newline at end of file +</definitions>