You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by mr...@apache.org on 2008/04/17 16:32:27 UTC
svn commit: r649127 - in /ode/trunk/bpel-test/src/test:
java/org/apache/ode/test/ resources/bpel/2.0/ProbeService/
resources/bpel/2.0/TestCorrelation/ resources/bpel/2.0/TestCorrelation1/
resources/bpel/2.0/TestCorrelationOpaque/ resources/bpel/2.0/Tes...
Author: mriou
Date: Thu Apr 17 07:32:07 2008
New Revision: 649127
URL: http://svn.apache.org/viewvc?rev=649127&view=rev
Log:
Fixing more routing tests.
Modified:
ode/trunk/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Test.java
ode/trunk/bpel-test/src/test/resources/bpel/2.0/ProbeService/probeService.wsdl
ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/deploy.xml
ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/test1.properties
ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/test2.properties
ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/testCorrelation.bpel
ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/testCorrelation.wsdl
ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/TestCorrelation1.bpel
ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/TestCorrelation1.wsdl
ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/test1.properties
ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/test2.properties
ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationOpaque/TestCorrelationOpaque.bpel
ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationOpaque/test1.properties
ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/TestDynamicPick.wsdl
ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/deploy.xml
ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/test1.properties
ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/test2.properties
ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/test3.properties
Modified: ode/trunk/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Test.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Test.java?rev=649127&r1=649126&r2=649127&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Test.java (original)
+++ ode/trunk/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Test.java Thu Apr 17 07:32:07 2008
@@ -27,7 +27,7 @@
go("/bpel/2.0/TestCorrelation");
}
- @Ignore("fix test bed for handling ASYNC mex") @Test public void testCorrelation1() throws Throwable {
+ @Test public void testCorrelation1() throws Throwable {
go("/bpel/2.0/TestCorrelation1");
}
@@ -36,7 +36,7 @@
go("/bpel/2.0/TestCorrelationOpaque");
}
- @Ignore("fix test bed for handling ASYNC mex") @Test public void testDynamicPick() throws Throwable {
+ @Test public void testDynamicPick() throws Throwable {
go("/bpel/2.0/TestDynamicPick");
}
Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/ProbeService/probeService.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/ProbeService/probeService.wsdl?rev=649127&r1=649126&r2=649127&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/ProbeService/probeService.wsdl (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/ProbeService/probeService.wsdl Thu Apr 17 07:32:07 2008
@@ -18,24 +18,32 @@
-->
<wsdl:definitions targetNamespace="http://ode/bpel/unit-test/ProbeService.wsdl"
- xmlns:tns="http://ode/bpel/unit-test/ProbeService.wsdl"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns="http://ode/bpel/unit-test/ProbeService.wsdl">
+ xmlns:tns="http://ode/bpel/unit-test/ProbeService.wsdl"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns="http://ode/bpel/unit-test/ProbeService.wsdl">
+ <wsdl:message name="probeMessage">
+ <wsdl:part name="probeName" type="xsd:string"/>
+ <wsdl:part name="probeData" type="xsd:string"/>
+ </wsdl:message>
- <wsdl:message name="probeMessage">
- <wsdl:part name="probeName" type="xsd:string"/>
- <wsdl:part name="probeData" type="xsd:string"/>
- </wsdl:message>
+ <wsdl:portType name="probeMessagePT">
+ <wsdl:operation name="probe">
+ <wsdl:input name="ProbeInputMessage" message="tns:probeMessage"/>
+ <wsdl:output name="ProbeOutputMessage" message="tns:probeMessage"/>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="probeBinding" type="tns:probeMessagePT">
+ <wsdl:operation name="probe">
+ </wsdl:operation>
+ </wsdl:binding>
- <wsdl:portType name="probeMessagePT">
- <wsdl:operation name="probe">
- <wsdl:input name="ProbeInputMessage" message="tns:probeMessage"/>
- <wsdl:output name="ProbeOutputMessage" message="tns:probeMessage"/>
- </wsdl:operation>
- </wsdl:portType>
+ <wsdl:service name="ProbeService">
+ <wsdl:port name="ProbePort" binding="tns:probeBinding">
+ </wsdl:port>
+ </wsdl:service>
</wsdl:definitions>
Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/deploy.xml
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/deploy.xml?rev=649127&r1=649126&r2=649127&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/deploy.xml (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/deploy.xml Thu Apr 17 07:32:07 2008
@@ -19,6 +19,7 @@
<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
xmlns:pns="http://ode/bpel/unit-test/testCorrelation"
+ xmlns:prns="http://ode/bpel/unit-test/ProbeService.wsdl"
xmlns:wns="http://ode/bpel/unit-test/testCorrelation.wsdl">
@@ -27,5 +28,8 @@
<provide partnerLink="request">
<service name="wns:testCorrelationService" port="wns:testCorrelationPort"/>
</provide>
+ <invoke partnerLink="probe">
+ <service name="prns:testCorrelationService" port="prns:testCorrelationPort"/>
+ </invoke>
</process>
</deploy>
Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/test1.properties
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/test1.properties?rev=649127&r1=649126&r2=649127&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/test1.properties (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/test1.properties Thu Apr 17 07:32:07 2008
@@ -18,5 +18,5 @@
namespace=http://ode/bpel/unit-test/testCorrelation.wsdl
service=testCorrelationService
operation=request
-request1=<message><requestMessageData><testMessage><requestID>Start Test5.1</requestID><requestText>Event Start Test5.1</requestText><requestEnd>no</requestEnd></testMessage></requestMessageData></message>
-response1=ASYNC
\ No newline at end of file
+request1=<message><requestMessageData><requestID>Start Test5.1</requestID><requestText>Event Start Test5.1</requestText><requestEnd>no</requestEnd></requestMessageData></message>
+response1=.*Event Start Test5.1 -> loop on receive until message includes requestEnd = yes -> received message -> process complete.*
Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/test2.properties
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/test2.properties?rev=649127&r1=649126&r2=649127&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/test2.properties (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/test2.properties Thu Apr 17 07:32:07 2008
@@ -18,5 +18,4 @@
namespace=http://ode/bpel/unit-test/testCorrelation.wsdl
service=testCorrelationService
operation=continue
-request1=<message><requestMessageData><testMessage><requestID>Start Test5.1</requestID><requestText>Event Start Test5.2.1</requestText><requestEnd>yes</requestEnd></testMessage></requestMessageData></message>
-response1=.*Event Start Test5.1 -> loop on receive until message includes requestEnd = yes -> received message -> process complete.*
+request1=<message><requestMessageData><requestID>Start Test5.1</requestID><requestText>Event Start Test5.2.1</requestText><requestEnd>yes</requestEnd></requestMessageData></message>
Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/testCorrelation.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/testCorrelation.bpel?rev=649127&r1=649126&r2=649127&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/testCorrelation.bpel (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/testCorrelation.bpel Thu Apr 17 07:32:07 2008
@@ -1,118 +1,118 @@
-<!--
- ~ 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 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://docs.oasis-open.org/wsbpel/2.0/process/executable ../../../../../../../bpel-schemas/src/main/resources/wsbpel_executable.xsd"
- xmlns:tns="http://ode/bpel/unit-test/testCorrelation"
- xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
- xmlns:wns="http://ode/bpel/unit-test/testCorrelation.wsdl"
- xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
- name="TestCorrelationProcess"
- targetNamespace="http://ode/bpel/unit-test/testCorrelation"
- queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
- expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
- suppressJoinFailure="yes">
-
- <import location="testCorrelation.wsdl"
- namespace="http://ode/bpel/unit-test/testCorrelation.wsdl"
- importType="http://schemas.xmlsoap.org/wsdl/" />
- <import location="../ProbeService/probeService.wsdl"
- namespace="http://ode/bpel/unit-test/ProbeService.wsdl"
- importType="http://schemas.xmlsoap.org/wsdl/"/>
-
- <!-- test correlated receive -->
- <partnerLinks>
- <partnerLink name="request" partnerLinkType="wns:testCorrelationRequest" myRole="testCorrelationService"/>
- <partnerLink name="probe" partnerLinkType="wns:probeRequest" partnerRole="probeService" initializePartnerRole="yes"/>
- </partnerLinks>
- <variables>
- <variable name="request" messageType="wns:requestMessage"/>
- <variable name="probeInput" messageType="prb:probeMessage"/>
- <variable name="reply" messageType="wns:replyMessage"/>
- </variables>
- <correlationSets>
- <correlationSet name="testCorr1" properties="wns:testProbeID"/>
- </correlationSets>
- <sequence>
- <receive name="receive1" partnerLink="request" portType="wns:testCorrelationPT" operation="request" variable="request" createInstance="yes">
- <correlations>
- <correlation set="testCorr1" initiate="yes"/>
- </correlations>
- </receive>
- <!-- Copy input variables to internal accumulators -->
- <assign name="assign1">
- <copy>
- <from variable="request" property="wns:testProbeID"/>
- <to variable="probeInput" part="probeName"/>
- </copy>
- <copy>
- <from variable="request" property="wns:testProbeData"/>
- <to variable="probeInput" part="probeData"/>
- </copy>
- </assign>
- <assign>
- <copy>
- <from>
- <literal><![CDATA[loop on receive until message includes requestEnd = yes]]></literal>
- </from>
- <to variable="probeInput" part="probeName"/>
- </copy>
- </assign>
- <invoke name="probe" partnerLink="probe" portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput" outputVariable="probeInput"> </invoke>
- <while>
- <condition>$request.requestMessageData/requestEnd = 'no'</condition>
- <sequence>
- <receive name="receive2" partnerLink="request" portType="wns:testCorrelationPT" operation="continue" variable="request">
- <correlations>
- <correlation set="testCorr1"/>
- </correlations>
- </receive>
- <assign>
- <copy>
- <from>
- <literal><![CDATA[received message]]></literal>
- </from>
- <to variable="probeInput" part="probeName"/>
- </copy>
- </assign>
- <invoke name="probe" partnerLink="probe" portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput" outputVariable="probeInput"> </invoke>
- </sequence>
- </while>
- <assign>
- <copy>
- <from>
- <literal><![CDATA[process complete]]></literal>
- </from>
- <to variable="probeInput" part="probeName"/>
- </copy>
- </assign>
- <invoke name="probe" partnerLink="probe" portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput" outputVariable="probeInput"> </invoke>
- <assign name="assign2">
- <copy>
- <from variable="probeInput" part="probeName"/>
- <to variable="reply" part="replyID"/>
- </copy>
- <copy>
- <from variable="probeInput" part="probeData"/>
- <to variable="reply" part="replyText"/>
- </copy>
- </assign>
- <reply name="reply" partnerLink="request" portType="wns:testCorrelationPT" operation="continue" variable="reply"> </reply>
- </sequence>
+<!--
+ ~ 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 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://docs.oasis-open.org/wsbpel/2.0/process/executable ../../../../../../../bpel-schemas/src/main/resources/wsbpel_executable.xsd"
+ xmlns:tns="http://ode/bpel/unit-test/testCorrelation"
+ xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
+ xmlns:wns="http://ode/bpel/unit-test/testCorrelation.wsdl"
+ xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+ name="TestCorrelationProcess"
+ targetNamespace="http://ode/bpel/unit-test/testCorrelation"
+ queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+ expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+ suppressJoinFailure="yes">
+
+ <import location="testCorrelation.wsdl"
+ namespace="http://ode/bpel/unit-test/testCorrelation.wsdl"
+ importType="http://schemas.xmlsoap.org/wsdl/" />
+ <import location="../ProbeService/probeService.wsdl"
+ namespace="http://ode/bpel/unit-test/ProbeService.wsdl"
+ importType="http://schemas.xmlsoap.org/wsdl/"/>
+
+ <!-- test correlated receive -->
+ <partnerLinks>
+ <partnerLink name="request" partnerLinkType="wns:testCorrelationRequest" myRole="testCorrelationService"/>
+ <partnerLink name="probe" partnerLinkType="wns:probeRequest" partnerRole="probeService" initializePartnerRole="yes"/>
+ </partnerLinks>
+ <variables>
+ <variable name="request" messageType="wns:requestMessage"/>
+ <variable name="probeInput" messageType="prb:probeMessage"/>
+ <variable name="reply" messageType="wns:replyMessage"/>
+ </variables>
+ <correlationSets>
+ <correlationSet name="testCorr1" properties="wns:testProbeID"/>
+ </correlationSets>
+ <sequence>
+ <receive name="receive1" partnerLink="request" portType="wns:testCorrelationPT" operation="request" variable="request" createInstance="yes">
+ <correlations>
+ <correlation set="testCorr1" initiate="yes"/>
+ </correlations>
+ </receive>
+ <!-- Copy input variables to internal accumulators -->
+ <assign name="assign1">
+ <copy>
+ <from variable="request" property="wns:testProbeID"/>
+ <to variable="probeInput" part="probeName"/>
+ </copy>
+ <copy>
+ <from variable="request" property="wns:testProbeData"/>
+ <to variable="probeInput" part="probeData"/>
+ </copy>
+ </assign>
+ <assign>
+ <copy>
+ <from>
+ <literal><![CDATA[loop on receive until message includes requestEnd = yes]]></literal>
+ </from>
+ <to variable="probeInput" part="probeName"/>
+ </copy>
+ </assign>
+ <invoke name="probe" partnerLink="probe" portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput" outputVariable="probeInput"> </invoke>
+ <while>
+ <condition>$request.requestMessageData/requestEnd = 'no'</condition>
+ <sequence>
+ <receive name="receive2" partnerLink="request" portType="wns:testCorrelationPT" operation="continue" variable="request">
+ <correlations>
+ <correlation set="testCorr1"/>
+ </correlations>
+ </receive>
+ <assign>
+ <copy>
+ <from>
+ <literal><![CDATA[received message]]></literal>
+ </from>
+ <to variable="probeInput" part="probeName"/>
+ </copy>
+ </assign>
+ <invoke name="probe" partnerLink="probe" portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput" outputVariable="probeInput"> </invoke>
+ </sequence>
+ </while>
+ <assign>
+ <copy>
+ <from>
+ <literal><![CDATA[process complete]]></literal>
+ </from>
+ <to variable="probeInput" part="probeName"/>
+ </copy>
+ </assign>
+ <invoke name="probe" partnerLink="probe" portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput" outputVariable="probeInput"> </invoke>
+ <assign name="assign2">
+ <copy>
+ <from variable="probeInput" part="probeName"/>
+ <to variable="reply" part="replyID"/>
+ </copy>
+ <copy>
+ <from variable="probeInput" part="probeData"/>
+ <to variable="reply" part="replyText"/>
+ </copy>
+ </assign>
+ <reply name="reply" partnerLink="request" portType="wns:testCorrelationPT" operation="request" variable="reply"> </reply>
+ </sequence>
</process>
Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/testCorrelation.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/testCorrelation.wsdl?rev=649127&r1=649126&r2=649127&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/testCorrelation.wsdl (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/testCorrelation.wsdl Thu Apr 17 07:32:07 2008
@@ -17,86 +17,87 @@
~ under the License.
-->
-<wsdl:definitions
- targetNamespace="http://ode/bpel/unit-test/testCorrelation.wsdl"
- xmlns:tns="http://ode/bpel/unit-test/testCorrelation.wsdl"
- xmlns:typens="http://ode/bpel/unit-test/testCorrelation.wsdl.types"
- xmlns="http://ode/bpel/unit-test/testCorrelation.wsdl"
- xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
- xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-
-
- <!-- type defs -->
- <wsdl:types>
- <xsd:schema
- targetNamespace="http://ode/bpel/unit-test/testCorrelation.wsdl.types"
+<wsdl:definitions
+ targetNamespace="http://ode/bpel/unit-test/testCorrelation.wsdl"
+ xmlns:tns="http://ode/bpel/unit-test/testCorrelation.wsdl"
+ xmlns:typens="http://ode/bpel/unit-test/testCorrelation.wsdl.types"
+ xmlns="http://ode/bpel/unit-test/testCorrelation.wsdl"
+ xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
+ xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:prop="http://docs.oasis-open.org/wsbpel/2.0/varprop">
+
+
+ <!-- type defs -->
+ <wsdl:types>
+ <xsd:schema
+ targetNamespace="http://ode/bpel/unit-test/testCorrelation.wsdl.types"
xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <xsd:complexType name="testMessage">
- <xsd:sequence>
- <xsd:element name="requestID" type="xsd:string"/>
- <xsd:element name="requestText" type="xsd:string"/>
- <xsd:element name="requestEnd" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
- </xsd:schema>
- </wsdl:types>
-
-
- <wsdl:message name="requestMessage">
- <wsdl:part name="requestMessageData" type="typens:testMessage"/>
- </wsdl:message>
-
- <wsdl:message name="replyMessage">
- <wsdl:part name="replyID" type="xsd:string"/>
- <wsdl:part name="replyText" type="xsd:string"/>
- </wsdl:message>
-
-
- <wsdl:portType name="testCorrelationPT">
- <wsdl:operation name="request">
- <wsdl:input message="requestMessage"/>
- </wsdl:operation>
- <wsdl:operation name="continue">
- <wsdl:input message="requestMessage"/>
- <wsdl:output message="replyMessage"/>
- </wsdl:operation>
- </wsdl:portType>
-
- <wsdl:binding name="TestCorrelationBinding" type="tns:testCorrelationPT">
- <wsdl:operation name="request">
- </wsdl:operation>
- <wsdl:operation name="continue">
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="TestCorrelationService">
- <wsdl:port name="TestCorrelationPort" binding="tns:TestCorrelationBinding">
- </wsdl:port>
- </wsdl:service>
-
- <plnk:partnerLinkType name="testCorrelationRequest">
- <plnk:role name="testCorrelationService" portType="testCorrelationPT"/>
- </plnk:partnerLinkType>
-
- <plnk:partnerLinkType name="probeRequest">
- <plnk:role name="probeService" portType="prb:probeMessagePT"/>
- </plnk:partnerLinkType>
-
- <bpws:property name="testProbeID" type="xsd:string"/>
- <bpws:propertyAlias propertyName="tns:testProbeID" messageType="tns:requestMessage" part="requestMessageData">
- <bpws:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
- testMessage/requestID
- </bpws:query>
- </bpws:propertyAlias>
-
- <bpws:property name="testProbeData" type="xsd:string"/>
- <bpws:propertyAlias propertyName="tns:testProbeData" messageType="tns:requestMessage" part="requestMessageData">
- <bpws:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
- testMessage/requestText
- </bpws:query>
- </bpws:propertyAlias>
+ <xsd:complexType name="testMessage">
+ <xsd:sequence>
+ <xsd:element name="requestID" type="xsd:string"/>
+ <xsd:element name="requestText" type="xsd:string"/>
+ <xsd:element name="requestEnd" type="xsd:string"/>
+ </xsd:sequence>
+ </xsd:complexType>
+ </xsd:schema>
+ </wsdl:types>
+
+
+ <wsdl:message name="requestMessage">
+ <wsdl:part name="requestMessageData" type="typens:testMessage"/>
+ </wsdl:message>
+
+ <wsdl:message name="replyMessage">
+ <wsdl:part name="replyID" type="xsd:string"/>
+ <wsdl:part name="replyText" type="xsd:string"/>
+ </wsdl:message>
+
+
+ <wsdl:portType name="testCorrelationPT">
+ <wsdl:operation name="request">
+ <wsdl:input message="requestMessage"/>
+ <wsdl:output message="replyMessage"/>
+ </wsdl:operation>
+ <wsdl:operation name="continue">
+ <wsdl:input message="requestMessage"/>
+ </wsdl:operation>
+ </wsdl:portType>
+
+ <wsdl:binding name="TestCorrelationBinding" type="tns:testCorrelationPT">
+ <wsdl:operation name="request">
+ </wsdl:operation>
+ <wsdl:operation name="continue">
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="TestCorrelationService">
+ <wsdl:port name="TestCorrelationPort" binding="tns:TestCorrelationBinding">
+ </wsdl:port>
+ </wsdl:service>
+
+ <plnk:partnerLinkType name="testCorrelationRequest">
+ <plnk:role name="testCorrelationService" portType="testCorrelationPT"/>
+ </plnk:partnerLinkType>
+
+ <plnk:partnerLinkType name="probeRequest">
+ <plnk:role name="probeService" portType="prb:probeMessagePT"/>
+ </plnk:partnerLinkType>
+
+ <prop:property name="testProbeID" type="xsd:string"/>
+ <prop:propertyAlias propertyName="tns:testProbeID" messageType="tns:requestMessage" part="requestMessageData">
+ <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+ requestID
+ </prop:query>
+ </prop:propertyAlias>
+
+ <prop:property name="testProbeData" type="xsd:string"/>
+ <prop:propertyAlias propertyName="tns:testProbeData" messageType="tns:requestMessage" part="requestMessageData">
+ <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+ requestText
+ </prop:query>
+ </prop:propertyAlias>
</wsdl:definitions>
Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/TestCorrelation1.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/TestCorrelation1.bpel?rev=649127&r1=649126&r2=649127&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/TestCorrelation1.bpel (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/TestCorrelation1.bpel Thu Apr 17 07:32:07 2008
@@ -23,7 +23,7 @@
targetNamespace="http://ode/bpel/unit-test/testCorrelation1"
xmlns:wns="http://ode/bpel/unit-test/testCorrelation1.wsdl"
xmlns:ns0="http://www.w3schools.com"
- xmlns:bpel="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+ xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
name="TestCorrelation1"
queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/TestCorrelation1.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/TestCorrelation1.wsdl?rev=649127&r1=649126&r2=649127&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/TestCorrelation1.wsdl (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/TestCorrelation1.wsdl Thu Apr 17 07:32:07 2008
@@ -17,80 +17,81 @@
~ under the License.
-->
-<wsdl:definitions targetNamespace="http://ode/bpel/unit-test/testCorrelation1.wsdl" xmlns:tns="http://ode/bpel/unit-test/testCorrelation1.wsdl" xmlns="http://ode/bpel/unit-test/testCorrelation1.wsdl"
- xmlns:ns0="http://www.w3schools.com" xmlns:ns1="http://ode/bpel/unit-test/testCorrelation1.wsdl.types" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-
- <wsdl:types>
- <xsd:schema targetNamespace="http://ode/bpel/unit-test/testCorrelation1.wsdl.types" xmlns="http://ode/bpel/unit-test/testCorrelation1.wsdl.types" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
- <xsd:element name="simpleString" type="xsd:string"/>
- </xsd:schema>
- <xs:schema elementFormDefault="qualified" targetNamespace="http://www.w3schools.com" xmlns="http://www.w3schools.com" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:element name="note">
- <xs:complexType>
- <xs:sequence>
- <xs:element name="to" type="xs:string"/>
- <xs:element name="from" type="xs:string"/>
- <xs:element name="heading" type="xs:string"/>
- <xs:element name="body" type="xs:string"/>
- </xs:sequence>
- </xs:complexType>
- </xs:element>
-
- </xs:schema>
- </wsdl:types>
- <wsdl:message name="operation2Request">
- <wsdl:part name="newParameter1" element="ns0:note"/>
- </wsdl:message>
- <wsdl:message name="operation3Request">
- <wsdl:part name="newParameter1" element="ns1:simpleString"/>
- </wsdl:message>
- <wsdl:message name="operation1Request">
- <wsdl:part name="newParameter1" type="xsd:string"/>
- </wsdl:message>
- <wsdl:message name="operation3Response">
- <wsdl:part name="newParameter2" type="xsd:string"/>
- </wsdl:message>
- <wsdl:portType name="testCorrelation1PT">
- <wsdl:operation name="operation3">
- <wsdl:input name="operation3Input" message="tns:operation3Request"/>
- <wsdl:output name="operation3Output" message="tns:operation3Response"/>
- </wsdl:operation>
- <wsdl:operation name="operation2">
- <wsdl:input name="operation2Input" message="tns:operation2Request"/>
- </wsdl:operation>
- <wsdl:operation name="operation1">
- <wsdl:input name="operation1Input" message="tns:operation1Request"/>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="testCorrelation1Binding" type="tns:testCorrelation1PT">
- <wsdl:operation name="operation3">
- <wsdl:input name="operation3Input"> </wsdl:input>
- <wsdl:output name="operation3Output"> </wsdl:output>
- </wsdl:operation>
- <wsdl:operation name="operation2">
- <wsdl:input name="operation2Input"> </wsdl:input>
- </wsdl:operation>
- <wsdl:operation name="operation1">
- <wsdl:input name="operation1Input"> </wsdl:input>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="testCorrelation1Service">
- <wsdl:port name="testCorrelation1Port" binding="tns:testCorrelation1Binding"> </wsdl:port>
- </wsdl:service>
-
- <plnk:partnerLinkType name="testCorrelation1Request">
- <plnk:role name="testCorrelation1Service" portType="testCorrelation1PT"/>
- </plnk:partnerLinkType>
-
- <bpws:property name="testCorrelation1Variable1" type="xsd:string"/>
- <bpws:propertyAlias messageType="tns:operation2Request" part="newParameter1" propertyName="tns:testCorrelation1Variable1">
- <bpws:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">ns0:to</bpws:query>
- </bpws:propertyAlias>
- <bpws:propertyAlias messageType="tns:operation3Request" part="newParameter1" propertyName="tns:testCorrelation1Variable1">
- </bpws:propertyAlias>
- <bpws:propertyAlias messageType="tns:operation1Request" part="newParameter1" propertyName="tns:testCorrelation1Variable1">
- </bpws:propertyAlias>
+<wsdl:definitions targetNamespace="http://ode/bpel/unit-test/testCorrelation1.wsdl" xmlns:tns="http://ode/bpel/unit-test/testCorrelation1.wsdl" xmlns="http://ode/bpel/unit-test/testCorrelation1.wsdl"
+ xmlns:ns0="http://www.w3schools.com" xmlns:ns1="http://ode/bpel/unit-test/testCorrelation1.wsdl.types" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:prop="http://docs.oasis-open.org/wsbpel/2.0/varprop">
+
+ <wsdl:types>
+ <xsd:schema targetNamespace="http://ode/bpel/unit-test/testCorrelation1.wsdl.types" xmlns="http://ode/bpel/unit-test/testCorrelation1.wsdl.types" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+ <xsd:element name="simpleString" type="xsd:string"/>
+ </xsd:schema>
+ <xs:schema elementFormDefault="qualified" targetNamespace="http://www.w3schools.com" xmlns="http://www.w3schools.com" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <xs:element name="note">
+ <xs:complexType>
+ <xs:sequence>
+ <xs:element name="to" type="xs:string"/>
+ <xs:element name="from" type="xs:string"/>
+ <xs:element name="heading" type="xs:string"/>
+ <xs:element name="body" type="xs:string"/>
+ </xs:sequence>
+ </xs:complexType>
+ </xs:element>
+
+ </xs:schema>
+ </wsdl:types>
+ <wsdl:message name="operation2Request">
+ <wsdl:part name="newParameter1" element="ns0:note"/>
+ </wsdl:message>
+ <wsdl:message name="operation3Request">
+ <wsdl:part name="newParameter1" element="ns1:simpleString"/>
+ </wsdl:message>
+ <wsdl:message name="operation1Request">
+ <wsdl:part name="newParameter1" type="xsd:string"/>
+ </wsdl:message>
+ <wsdl:message name="operation3Response">
+ <wsdl:part name="newParameter2" type="xsd:string"/>
+ </wsdl:message>
+ <wsdl:portType name="testCorrelation1PT">
+ <wsdl:operation name="operation3">
+ <wsdl:input name="operation3Input" message="tns:operation3Request"/>
+ <wsdl:output name="operation3Output" message="tns:operation3Response"/>
+ </wsdl:operation>
+ <wsdl:operation name="operation2">
+ <wsdl:input name="operation2Input" message="tns:operation2Request"/>
+ </wsdl:operation>
+ <wsdl:operation name="operation1">
+ <wsdl:input name="operation1Input" message="tns:operation1Request"/>
+ </wsdl:operation>
+ </wsdl:portType>
+ <wsdl:binding name="testCorrelation1Binding" type="tns:testCorrelation1PT">
+ <wsdl:operation name="operation3">
+ <wsdl:input name="operation3Input"> </wsdl:input>
+ <wsdl:output name="operation3Output"> </wsdl:output>
+ </wsdl:operation>
+ <wsdl:operation name="operation2">
+ <wsdl:input name="operation2Input"> </wsdl:input>
+ </wsdl:operation>
+ <wsdl:operation name="operation1">
+ <wsdl:input name="operation1Input"> </wsdl:input>
+ </wsdl:operation>
+ </wsdl:binding>
+ <wsdl:service name="testCorrelation1Service">
+ <wsdl:port name="testCorrelation1Port" binding="tns:testCorrelation1Binding"> </wsdl:port>
+ </wsdl:service>
+
+ <plnk:partnerLinkType name="testCorrelation1Request">
+ <plnk:role name="testCorrelation1Service" portType="testCorrelation1PT"/>
+ </plnk:partnerLinkType>
+
+ <prop:property name="testCorrelation1Variable1" type="xsd:string"/>
+ <prop:propertyAlias messageType="tns:operation2Request" part="newParameter1" propertyName="tns:testCorrelation1Variable1">
+ <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">ns0:to</prop:query>
+ </prop:propertyAlias>
+ <prop:propertyAlias messageType="tns:operation3Request" part="newParameter1" propertyName="tns:testCorrelation1Variable1">
+ </prop:propertyAlias>
+ <prop:propertyAlias messageType="tns:operation1Request" part="newParameter1" propertyName="tns:testCorrelation1Variable1">
+ </prop:propertyAlias>
</wsdl:definitions>
Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/test1.properties
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/test1.properties?rev=649127&r1=649126&r2=649127&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/test1.properties (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/test1.properties Thu Apr 17 07:32:07 2008
@@ -18,5 +18,4 @@
namespace=http://ode/bpel/unit-test/testCorrelation1.wsdl
service=testCorrelation1Service
operation=operation1
-request1=<message><newParameter1>To Test</newParameter1></message>
-response1=ASYNC
\ No newline at end of file
+request1=<message><newParameter1>To Test</newParameter1></message>
\ No newline at end of file
Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/test2.properties
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/test2.properties?rev=649127&r1=649126&r2=649127&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/test2.properties (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/test2.properties Thu Apr 17 07:32:07 2008
@@ -18,5 +18,4 @@
namespace=http://ode/bpel/unit-test/testCorrelation1.wsdl
service=testCorrelation1Service
operation=operation2
-request1=<message><newParameter1><tns2:note xmlns:tns2="http://www.w3schools.com"><tns2:to>To Test</tns2:to><tns2:from>From Test</tns2:from><tns2:heading>x</tns2:heading><tns2:body>x</tns2:body></tns2:note></newParameter1></message>
-response1=ASYNC
\ No newline at end of file
+request1=<message><newParameter1><tns2:note xmlns:tns2="http://www.w3schools.com"><tns2:to>To Test</tns2:to><tns2:from>From Test</tns2:from><tns2:heading>x</tns2:heading><tns2:body>x</tns2:body></tns2:note></newParameter1></message>
\ No newline at end of file
Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationOpaque/TestCorrelationOpaque.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationOpaque/TestCorrelationOpaque.bpel?rev=649127&r1=649126&r2=649127&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationOpaque/TestCorrelationOpaque.bpel (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationOpaque/TestCorrelationOpaque.bpel Thu Apr 17 07:32:07 2008
@@ -20,7 +20,7 @@
<bpel:process xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://docs.oasis-open.org/wsbpel/2.0/process/executable ../../../../../../../bpel-schemas/src/main/resources/wsbpel_executable.xsd"
xmlns:tns="http://ode/bpel/unit-test/testCorrelationOpaque" targetNamespace="http://ode/bpel/unit-test/testCorrelationOpaque" xmlns:wns="http://ode/bpel/unit-test/testCorrelationOpaque.wsdl"
- xmlns:ns0="http://www.w3schools.com" xmlns:bpel="http://schemas.xmlsoap.org/ws/2004/03/business-process/" name="TestCorrelationOpaque" queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+ xmlns:ns0="http://www.w3schools.com" xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" name="TestCorrelationOpaque" queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0" suppressJoinFailure="yes">
<bpel:import location="TestCorrelationOpaque.wsdl" namespace="http://ode/bpel/unit-test/testCorrelationOpaque.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationOpaque/test1.properties
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationOpaque/test1.properties?rev=649127&r1=649126&r2=649127&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationOpaque/test1.properties (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationOpaque/test1.properties Thu Apr 17 07:32:07 2008
@@ -18,5 +18,4 @@
namespace=http://ode/bpel/unit-test/testCorrelationOpaque.wsdl
service=testCorrelationOpaqueService
operation=operation1
-request1=<message><newParameter1>Receive One</newParameter1></message>
-response1=ASYNC
\ No newline at end of file
+request1=<message><newParameter1>Receive One</newParameter1></message>
\ No newline at end of file
Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/TestDynamicPick.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/TestDynamicPick.wsdl?rev=649127&r1=649126&r2=649127&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/TestDynamicPick.wsdl (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/TestDynamicPick.wsdl Thu Apr 17 07:32:07 2008
@@ -26,7 +26,8 @@
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+ xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+ xmlns:prop="http://docs.oasis-open.org/wsbpel/2.0/varprop">
<wsdl:types>
@@ -91,33 +92,32 @@
<plnk:role name="probeService" portType="prb:probeMessagePT"/>
</plnk:partnerLinkType>
- <bpws:property name="testProbeKey1" type="xsd:string"/>
- <bpws:propertyAlias propertyName="tns:testProbeKey1" messageType="tns:requestMessage" part="requestMessageData">
- <bpws:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
- testMessage/requestKey1
- </bpws:query>
- </bpws:propertyAlias>
+ <prop:property name="testProbeKey1" type="xsd:string"/>
+ <prop:propertyAlias propertyName="tns:testProbeKey1" messageType="tns:requestMessage" part="requestMessageData">
+ <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+ requestKey1
+ </prop:query>
+ </prop:propertyAlias>
- <bpws:property name="testProbeKey2" type="xsd:string"/>
- <bpws:propertyAlias propertyName="tns:testProbeKey2" messageType="tns:requestMessage" part="requestMessageData">
- <bpws:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
- testMessage/requestKey2
- </bpws:query>
- </bpws:propertyAlias>
+ <prop:property name="testProbeKey2" type="xsd:string"/>
+ <prop:propertyAlias propertyName="tns:testProbeKey2" messageType="tns:requestMessage" part="requestMessageData">
+ <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+ requestKey2
+ </prop:query>
+ </prop:propertyAlias>
- <bpws:property name="testProbeID" type="xsd:string"/>
- <bpws:propertyAlias propertyName="tns:testProbeID" messageType="tns:requestMessage" part="requestMessageData">
- <bpws:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
- testMessage/requestID
- </bpws:query>
- </bpws:propertyAlias>
-
- <bpws:property name="testProbeData" type="xsd:string"/>
- <bpws:propertyAlias propertyName="tns:testProbeData" messageType="tns:requestMessage" part="requestMessageData">
- <bpws:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
- testMessage/requestText
- </bpws:query>
- </bpws:propertyAlias>
+ <prop:property name="testProbeID" type="xsd:string"/>
+ <prop:propertyAlias propertyName="tns:testProbeID" messageType="tns:requestMessage" part="requestMessageData">
+ <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+ requestID
+ </prop:query>
+ </prop:propertyAlias>
+ <prop:property name="testProbeData" type="xsd:string"/>
+ <prop:propertyAlias propertyName="tns:testProbeData" messageType="tns:requestMessage" part="requestMessageData">
+ <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+ requestText
+ </prop:query>
+ </prop:propertyAlias>
</wsdl:definitions>
Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/deploy.xml
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/deploy.xml?rev=649127&r1=649126&r2=649127&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/deploy.xml (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/deploy.xml Thu Apr 17 07:32:07 2008
@@ -19,6 +19,7 @@
<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
xmlns:pns="http://ode/bpel/unit-test/TestDynamicPick"
+ xmlns:prns="http://ode/bpel/unit-test/ProbeService.wsdl"
xmlns:wns="http://ode/bpel/unit-test/TestDynamicPick.wsdl">
@@ -27,5 +28,8 @@
<provide partnerLink="request">
<service name="wns:TestDynamicPickService" port="wns:TestDynamicPickPort"/>
</provide>
+ <invoke partnerLink="probe">
+ <service name="prns:testCorrelationService" port="prns:testCorrelationPort"/>
+ </invoke>
</process>
</deploy>
Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/test1.properties
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/test1.properties?rev=649127&r1=649126&r2=649127&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/test1.properties (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/test1.properties Thu Apr 17 07:32:07 2008
@@ -18,5 +18,5 @@
namespace=http://ode/bpel/unit-test/TestDynamicPick.wsdl
service=TestDynamicPickService
operation=request
-request1=<message><requestMessageData><testMessage><requestID>Start Test Dynamic Pick</requestID><requestKey1>Test Dynamic Pick Key 1</requestKey1><requestKey2>Test Dynamic Pick Key 2</requestKey2><requestText>Event Test Dynamic Pick Start</requestText><requestEnd>no</requestEnd></testMessage></requestMessageData></message>
+request1=<message><requestMessageData><requestID>Start Test Dynamic Pick</requestID><requestKey1>Test Dynamic Pick Key 1</requestKey1><requestKey2>Test Dynamic Pick Key 2</requestKey2><requestText>Event Test Dynamic Pick Start</requestText><requestEnd>no</requestEnd></requestMessageData></message>
response1=.*Event Test Dynamic Pick Start -> loop on pick until message includes requestEnd = yes -> (pick branch one invoked -> )?pick branch two invoked -> process complete.*
Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/test2.properties
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/test2.properties?rev=649127&r1=649126&r2=649127&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/test2.properties (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/test2.properties Thu Apr 17 07:32:07 2008
@@ -18,5 +18,4 @@
namespace=http://ode/bpel/unit-test/TestDynamicPick.wsdl
service=TestDynamicPickService
operation=continue1
-request1=<message><requestMessageData><testMessage><requestID>Start Test Dynamic Pick</requestID><requestKey1>Test Dynamic Pick Key 1</requestKey1><requestKey2>Test Dynamic Pick Key 2</requestKey2><requestText>Event Test Dynamic Pick Continue1</requestText><requestEnd>no</requestEnd></testMessage></requestMessageData></message>
-response1=ASYNC
+request1=<message><requestMessageData><requestID>Start Test Dynamic Pick</requestID><requestKey1>Test Dynamic Pick Key 1</requestKey1><requestKey2>Test Dynamic Pick Key 2</requestKey2><requestText>Event Test Dynamic Pick Continue1</requestText><requestEnd>no</requestEnd></requestMessageData></message>
Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/test3.properties
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/test3.properties?rev=649127&r1=649126&r2=649127&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/test3.properties (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/test3.properties Thu Apr 17 07:32:07 2008
@@ -18,5 +18,4 @@
namespace=http://ode/bpel/unit-test/TestDynamicPick.wsdl
service=TestDynamicPickService
operation=continue2
-request1=<message><requestMessageData><testMessage><requestID>Start Test Dynamic Pick</requestID><requestKey1>Test Dynamic Pick Key 1</requestKey1><requestKey2>Test Dynamic Pick Key 2</requestKey2><requestText>Event Test Dynamic Pick Continue2</requestText><requestEnd>yes</requestEnd></testMessage></requestMessageData></message>
-response1=ASYNC
+request1=<message><requestMessageData><requestID>Start Test Dynamic Pick</requestID><requestKey1>Test Dynamic Pick Key 1</requestKey1><requestKey2>Test Dynamic Pick Key 2</requestKey2><requestText>Event Test Dynamic Pick Continue2</requestText><requestEnd>yes</requestEnd></requestMessageData></message>