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:27:57 UTC
svn commit: r649125 - in /ode/branches/APACHE_ODE_1.1/bpel-test/src/test:
java/org/apache/ode/test/ resources/bpel/2.0/TestCorrelation1/
resources/bpel/2.0/TestCorrelationOpaque/ resources/bpel/2.0/TestDynamicPick/
Author: mriou
Date: Thu Apr 17 07:27:38 2008
New Revision: 649125
URL: http://svn.apache.org/viewvc?rev=649125&view=rev
Log:
Fixing more routing tests.
Modified:
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Test.java
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/TestCorrelation1.bpel
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/TestCorrelation1.wsdl
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/test1.properties
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/test2.properties
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelationOpaque/TestCorrelationOpaque.bpel
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelationOpaque/test1.properties
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/TestDynamicPick.wsdl
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/deploy.xml
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/test1.properties
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/test2.properties
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/test3.properties
Modified: ode/branches/APACHE_ODE_1.1/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Test.java
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Test.java?rev=649125&r1=649124&r2=649125&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Test.java (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-test/src/test/java/org/apache/ode/test/MessageRouting20Test.java Thu Apr 17 07:27:38 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/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/TestCorrelation1.bpel
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/TestCorrelation1.bpel?rev=649125&r1=649124&r2=649125&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/TestCorrelation1.bpel (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/TestCorrelation1.bpel Thu Apr 17 07:27:38 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/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/TestCorrelation1.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/TestCorrelation1.wsdl?rev=649125&r1=649124&r2=649125&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/TestCorrelation1.wsdl (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/TestCorrelation1.wsdl Thu Apr 17 07:27:38 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/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/test1.properties
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/test1.properties?rev=649125&r1=649124&r2=649125&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/test1.properties (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/test1.properties Thu Apr 17 07:27:38 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/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/test2.properties
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/test2.properties?rev=649125&r1=649124&r2=649125&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/test2.properties (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/test2.properties Thu Apr 17 07:27:38 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/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelationOpaque/TestCorrelationOpaque.bpel
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelationOpaque/TestCorrelationOpaque.bpel?rev=649125&r1=649124&r2=649125&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelationOpaque/TestCorrelationOpaque.bpel (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelationOpaque/TestCorrelationOpaque.bpel Thu Apr 17 07:27:38 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/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelationOpaque/test1.properties
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelationOpaque/test1.properties?rev=649125&r1=649124&r2=649125&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelationOpaque/test1.properties (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestCorrelationOpaque/test1.properties Thu Apr 17 07:27:38 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/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/TestDynamicPick.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/TestDynamicPick.wsdl?rev=649125&r1=649124&r2=649125&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/TestDynamicPick.wsdl (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/TestDynamicPick.wsdl Thu Apr 17 07:27:38 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/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/deploy.xml
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/deploy.xml?rev=649125&r1=649124&r2=649125&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/deploy.xml (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/deploy.xml Thu Apr 17 07:27:38 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/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/test1.properties
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/test1.properties?rev=649125&r1=649124&r2=649125&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/test1.properties (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/test1.properties Thu Apr 17 07:27:38 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/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/test2.properties
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/test2.properties?rev=649125&r1=649124&r2=649125&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/test2.properties (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/test2.properties Thu Apr 17 07:27:38 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/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/test3.properties
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/test3.properties?rev=649125&r1=649124&r2=649125&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/test3.properties (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/test3.properties Thu Apr 17 07:27:38 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>