Author: objectiser Date: 2010-12-08 07:03:32 -0500 (Wed, 08 Dec 2010) New Revision: 1198 Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/DynPartnerMain.bpel trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/DynPartnerResponder.bpel trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/Main.wsdl trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/Responder.wsdl trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/deploy.xml trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/messages/request.xml trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/messages/response.xml Log: RIFTSAW-326 - fix npe when running dynpartner ODE example in riftsaw. Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/DynPartnerMain.bpel =================================================================== --- trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/DynPartnerMain.bpel (rev 0) +++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/DynPartnerMain.bpel 2010-12-08 12:03:32 UTC (rev 1198) @@ -0,0 +1,138 @@ +<?xml version="1.0" encoding="utf-8" ?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> + +<process name="DynPartnerMain" + targetNamespace="http://ode/bpel/unit-test" + xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" + xmlns:sref="http://docs.oasis-open.org/wsbpel/2.0/serviceref" + xmlns:tns="http://ode/bpel/unit-test" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:test="http://ode/bpel/unit-test.wsdl" + xmlns:resp="http://ode/bpel/responder.wsdl" + queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0" + expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"> + + <import location="Main.wsdl" namespace="http://ode/bpel/unit-test.wsdl" + importType="http://schemas.xmlsoap.org/wsdl/" /> + + <partnerLinks> + <partnerLink name="initiatorPartnerLink" partnerLinkType="test:InitiatorPartnerLinkType" + myRole="me"/> + <partnerLink name="responderPartnerLink" partnerLinkType="resp:ResponderPartnerLinkType" + partnerRole="responder" initializePartnerRole="yes"/> + </partnerLinks> + + <variables> + <variable name="dummy" messageType="resp:DummyMessage"/> + <variable name="dummy2" messageType="resp:Dummy2Message"/> + <variable name="partnerEndpoint" messageType="resp:EndpointMessage"/> + <variable name="partnerAck" messageType="resp:AcknowledgementMessage"/> + <variable name="result" messageType="test:ResultMessage"/> + <!-- <variable name="wsaVar" messageType="resp:WSAEndpointMessage"/> --> + </variables> + + <correlationSets> + <correlationSet name="dummyCorr" properties="test:dummyProp" /> + </correlationSets> + + <sequence> + <receive name="start" partnerLink="initiatorPartnerLink" + portType="test:DynMainPortType" operation="execute" createInstance="yes" variable="dummy"/> + + <invoke name="get-endpoint" partnerLink="responderPartnerLink" portType="resp:DynResponderPortType" + operation="getDynamicEndpoint" inputVariable="dummy" outputVariable="partnerEndpoint"> + <correlations> + <correlation set="dummyCorr" initiate="yes" pattern="request"/> + </correlations> + </invoke> + + <assign> + <copy> + <!-- Partner link assignment using the value returned by previous invoke --> + <from>$partnerEndpoint.payload</from> + <to partnerLink="responderPartnerLink"/> + </copy> + <copy> + <!-- Just needed for correlation --> + <from>$dummy.payload</from> + <to variable="dummy2" part="payload"/> + </copy> + </assign> + + <!-- Invoking the partner link service endpoint that has just been assigned --> + <invoke name="dynamic-invoke" partnerLink="responderPartnerLink" portType="resp:DynResponderPortType" + operation="acknowledge" inputVariable="dummy2" outputVariable="partnerAck"> + <correlations> + <correlation set="dummyCorr" initiate="no" pattern="request"/> + </correlations> + </invoke> + + <!-- Playing around with epr conversion (url to wsa) --> + <assign> + <copy> + <from> + <literal>http://localhost:8080/dynpartner/DynResponderService</literal> + </from> + <to partnerLink="responderPartnerLink"/> + </copy> + <copy> + <from> + <literal> + <sref:service-ref> + <soap:address location="http://localhost:8080/dynpartner/DynResponderService"/> + </sref:service-ref> + </literal> + </from> + <to partnerLink="responderPartnerLink"/> + </copy> +<!-- + <copy> + <from partnerLink="responderPartnerLink" endpointReference="partnerRole"/> + <to variable="wsaVar" part="payload"/> + </copy> + <copy> + <from variable="wsaVar" part="payload"/> + <to partnerLink="responderPartnerLink"/> + </copy> +--> + </assign> + + <!-- Invoking the partner link service endpoint that has just been explicitly assigned --> + <invoke name="dynamic-invoke" partnerLink="responderPartnerLink" portType="resp:DynResponderPortType" + operation="acknowledge" inputVariable="dummy2" outputVariable="partnerAck"> + <correlations> + <correlation set="dummyCorr" initiate="no" pattern="request"/> + </correlations> + </invoke> + + <assign> + <copy> + <from variable="partnerAck" part="payload"/> + <to variable="result" part="ack"/> + </copy> + </assign> + + <reply name="end" partnerLink="initiatorPartnerLink" + portType="test:DynMainPortType" operation="execute" variable="result"> + </reply> + + </sequence> +</process> Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/DynPartnerResponder.bpel =================================================================== --- trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/DynPartnerResponder.bpel (rev 0) +++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/DynPartnerResponder.bpel 2010-12-08 12:03:32 UTC (rev 1198) @@ -0,0 +1,88 @@ +<?xml version="1.0" encoding="utf-8" ?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> + +<process name="DynPartnerResponder" + targetNamespace="http://ode/bpel/responder" + xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" + xmlns:tns="http://ode/bpel/responder" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:resp="http://ode/bpel/responder.wsdl"> + + <import location="Responder.wsdl" namespace="http://ode/bpel/responder.wsdl" + importType="http://schemas.xmlsoap.org/wsdl/" /> + + <partnerLinks> + <partnerLink name="mainPartnerLink" partnerLinkType="resp:ResponderPartnerLinkType" + myRole="responder"/> + </partnerLinks> + + <variables> + <variable name="dummy" messageType="resp:DummyMessage"/> + <variable name="dummy2" messageType="resp:Dummy2Message"/> + <variable name="myEndpoint" messageType="resp:EndpointMessage"/> + <variable name="ack" messageType="resp:AcknowledgementMessage"/> + </variables> + + <correlationSets> + <correlationSet name="dummyCorr" properties="resp:dummyProp" /> + </correlationSets> + + <sequence> + <receive name="start" partnerLink="mainPartnerLink" variable="dummy" + portType="resp:DynResponderPortType" operation="getDynamicEndpoint" createInstance="yes"> + <correlations> + <correlation set="dummyCorr" initiate="yes"/> + </correlations> + </receive> + <assign> + <copy> + <from partnerLink="mainPartnerLink" endpointReference="myRole"/> + <to>$myEndpoint.payload</to> + </copy> + </assign> + <reply name="reply-endpoint" partnerLink="mainPartnerLink" + portType="resp:DynResponderPortType" operation="getDynamicEndpoint" variable="myEndpoint"/> + + <receive name="dyn-invoke" partnerLink="mainPartnerLink" variable="dummy2" + portType="resp:DynResponderPortType" operation="acknowledge"> + <correlations> + <correlation set="dummyCorr" initiate="no"/> + </correlations> + </receive> + <assign> + <copy> + <from>'OK'</from> + <to variable="ack" part="payload"/> + </copy> + </assign> + <reply name="reply-ack" partnerLink="mainPartnerLink" + portType="resp:DynResponderPortType" operation="acknowledge" variable="ack"/> + + <receive name="dyn-invoke2" partnerLink="mainPartnerLink" variable="dummy2" + portType="resp:DynResponderPortType" operation="acknowledge"> + <correlations> + <correlation set="dummyCorr" initiate="no"/> + </correlations> + </receive> + <reply name="reply-ack" partnerLink="mainPartnerLink" + portType="resp:DynResponderPortType" operation="acknowledge" variable="ack"/> + + </sequence> +</process> \ No newline at end of file Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/Main.wsdl =================================================================== --- trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/Main.wsdl (rev 0) +++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/Main.wsdl 2010-12-08 12:03:32 UTC (rev 1198) @@ -0,0 +1,80 @@ +<?xml version="1.0" encoding="utf-8" ?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> + +<wsdl:definitions + targetNamespace="http://ode/bpel/unit-test.wsdl" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:tns="http://ode/bpel/unit-test.wsdl" + xmlns:resp="http://ode/bpel/responder.wsdl" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" + xmlns:prop="http://docs.oasis-open.org/wsbpel/2.0/varprop"> + + <import namespace="http://ode/bpel/responder.wsdl" location="Responder.wsdl"/> + + <wsdl:types> + <xsd:schema targetNamespace="http://ode/bpel/unit-test.wsdl"> + <xsd:element name="result" type="xsd:string"/> + </xsd:schema> + </wsdl:types> + + <wsdl:message name="ResultMessage"> + <wsdl:part name="ack" element="tns:result"/> + </wsdl:message> + + <wsdl:portType name="DynMainPortType"> + <wsdl:operation name="execute"> + <wsdl:input message="resp:DummyMessage" name="dummy"/> + <wsdl:output message="tns:ResultMessage" name="result"/> + </wsdl:operation> + </wsdl:portType> + + <wsdl:binding name="DynMainBinding" type="tns:DynMainPortType"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="execute"> + <soap:operation soapAction="" style="document"/> + <wsdl:input> + <soap:body namespace="http://ode/bpel/unit-test.wsdl" use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body namespace="http://ode/bpel/unit-test.wsdl" use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + + <wsdl:service name="DynMainService"> + <wsdl:port name="DynMainPort" binding="tns:DynMainBinding"> + <soap:address location="http://localhost:8080/dynpartner/DynMainService"/> + </wsdl:port> + </wsdl:service> + + <plnk:partnerLinkType name="InitiatorPartnerLinkType"> + <plnk:role name="me" portType="tns:DynMainPortType"/> + </plnk:partnerLinkType> + + <prop:property name="dummyProp" type="xsd:string"/> + <prop:propertyAlias propertyName="tns:dummyProp" messageType="resp:DummyMessage" + part="payload"/> + <prop:propertyAlias propertyName="tns:dummyProp" messageType="resp:Dummy2Message" + part="payload"/> + +</wsdl:definitions> Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/Responder.wsdl =================================================================== --- trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/Responder.wsdl (rev 0) +++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/Responder.wsdl 2010-12-08 12:03:32 UTC (rev 1198) @@ -0,0 +1,112 @@ +<?xml version="1.0" encoding="utf-8" ?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> + +<wsdl:definitions + targetNamespace="http://ode/bpel/responder.wsdl" + xmlns="http://schemas.xmlsoap.org/wsdl/" + xmlns:tns="http://ode/bpel/responder.wsdl" + xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" + xmlns:xsd="http://www.w3.org/2001/XMLSchema" + xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" + xmlns:wsa="http://www.w3.org/2005/08/addressing" + xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" + xmlns:prop="http://docs.oasis-open.org/wsbpel/2.0/varprop"> + + <wsdl:types> + <xsd:schema targetNamespace="http://ode/bpel/responder.wsdl"> + <xsd:element name="dummy" type="xsd:string"/> + <xsd:element name="dummy2" type="xsd:string"/> + <xsd:element name="acknowledgement" type="xsd:string"/> + <xsd:element name="url" type="xsd:string"/> + </xsd:schema> + </wsdl:types> + + <wsdl:message name="DummyMessage"> + <wsdl:part name="payload" element="tns:dummy"/> + </wsdl:message> + + <wsdl:message name="Dummy2Message"> + <wsdl:part name="payload" element="tns:dummy2"/> + </wsdl:message> + + <wsdl:message name="EndpointMessage"> + <wsdl:part name="payload" element="tns:url"/> + </wsdl:message> + +<!-- + <wsdl:message name="WSAEndpointMessage"> + <wsdl:part name="payload" element="wsa:EndpointReference"/> + </wsdl:message> +--> + + <wsdl:message name="AcknowledgementMessage"> + <wsdl:part name="payload" element="tns:acknowledgement"/> + </wsdl:message> + + <wsdl:portType name="DynResponderPortType"> + <wsdl:operation name="getDynamicEndpoint"> + <wsdl:input message="tns:DummyMessage" name="dummy"/> + <wsdl:output message="tns:EndpointMessage" name="endpoint"/> + </wsdl:operation> + <wsdl:operation name="acknowledge"> + <wsdl:input message="tns:Dummy2Message" name="dummy2"/> + <wsdl:output message="tns:AcknowledgementMessage" name="ack"/> + </wsdl:operation> + </wsdl:portType> + + <wsdl:binding name="DynResponderBinding" type="tns:DynResponderPortType"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="getDynamicEndpoint"> + <soap:operation soapAction="" style="document"/> + <wsdl:input> + <soap:body namespace="http://ode/bpel/responder.wsdl" use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body namespace="http://ode/bpel/responder.wsdl" use="literal"/> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="acknowledge"> + <soap:operation soapAction="" style="document"/> + <wsdl:input> + <soap:body namespace="http://ode/bpel/responder.wsdl" use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body namespace="http://ode/bpel/responder.wsdl" use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + + <wsdl:service name="DynResponderService"> + <wsdl:port name="DynResponderPort" binding="tns:DynResponderBinding"> + <soap:address location="http://localhost:8080/dynpartner/DynResponderService"/> + </wsdl:port> + </wsdl:service> + + <plnk:partnerLinkType name="ResponderPartnerLinkType"> + <plnk:role name="responder" portType="tns:DynResponderPortType"/> + </plnk:partnerLinkType> + + <prop:property name="dummyProp" type="xsd:string"/> + <prop:propertyAlias propertyName="tns:dummyProp" messageType="tns:DummyMessage" + part="payload"/> + <prop:propertyAlias propertyName="tns:dummyProp" messageType="tns:Dummy2Message" + part="payload"/> + +</wsdl:definitions> Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/deploy.xml =================================================================== --- trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/deploy.xml (rev 0) +++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/bpel/deploy.xml 2010-12-08 12:03:32 UTC (rev 1198) @@ -0,0 +1,40 @@ +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> +<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03" + xmlns:main="http://ode/bpel/unit-test" + xmlns:mws="http://ode/bpel/unit-test.wsdl" + xmlns:resp="http://ode/bpel/responder" + xmlns:rws="http://ode/bpel/responder.wsdl"> + + <process name="main:DynPartnerMain"> + <provide partnerLink="initiatorPartnerLink"> + <service name="mws:DynMainService" port="DynMainPort"/> + </provide> + <invoke partnerLink="responderPartnerLink"> + <service name="rws:DynResponderService" port="DynResponderPort"/> + </invoke> + </process> + <process name="resp:DynPartnerResponder"> + <in-memory>true</in-memory> + <type>resp:DynPartnerResponder</type> + <provide partnerLink="mainPartnerLink"> + <service name="rws:DynResponderService" port="DynResponderPort"/> + </provide> + </process> +</deploy> Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/messages/request.xml =================================================================== --- trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/messages/request.xml (rev 0) +++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/messages/request.xml 2010-12-08 12:03:32 UTC (rev 1198) @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8" ?> +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> + +<SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"> + <!-- test soap message --> + <SOAP-ENV:Body> + <ns2:dummy xmlns:ns2="http://ode/bpel/responder.wsdl">fire!</ns2:dummy> + </SOAP-ENV:Body> +</SOAP-ENV:Envelope> Added: trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/messages/response.xml =================================================================== --- trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/messages/response.xml (rev 0) +++ trunk/integration-tests/src/test/resources/testcases/RiftSaw_326/messages/response.xml 2010-12-08 12:03:32 UTC (rev 1198) @@ -0,0 +1 @@ +<env:Envelope xmlns:env='http://schemas.xmlsoap.org/soap/envelope/'><env:... xmlns='http://ode/bpel/unit-test.wsdl'>OK</result></env:Body></env:Envelope> \ No newline at end of file