Author: lwaterman
Date: Tue Oct 3 20:11:48 2006
New Revision: 452704
URL: http://svn.apache.org/viewvc?view=rev&rev=452704
Log:
Fix correlation error
Modified:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.bpel
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.wsdl
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/deploy.xml
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test1.properties
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test2.properties
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test3.properties
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test4.properties
Modified:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.bpel
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.bpel?view=diff&rev=452704&r1=452703&r2=452704
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.bpel
(original)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.bpel
Tue Oct 3 20:11:48 2006
@@ -22,8 +22,6 @@
<partnerLinks>
<partnerLink name="request1"
partnerLinkType="wns:TestStaticPick1Request" myRole="TestStaticPick1Service"/>
- <partnerLink name="request2"
partnerLinkType="wns:TestStaticPick2Request" myRole="TestStaticPick2Service"/>
- <partnerLink name="request3"
partnerLinkType="wns:TestStaticPick3Request" myRole="TestStaticPick3Service"/>
<partnerLink name="probe" partnerLinkType="wns:probeRequest"
partnerRole="probeService" initializePartnerRole="yes"/>
</partnerLinks>
@@ -44,7 +42,10 @@
<receive name="receive1" partnerLink="request1"
portType="wns:TestStaticPick1PT"
operation="request" variable="request"
- createInstance="yes">
+ createInstance="yes">
+ <correlations>
+ <correlation set="testCorr1" initiate="yes"/>
+ </correlations>
</receive>
<assign name="assign1">
@@ -76,8 +77,11 @@
</invoke>
<pick name="testPick">
- <onMessage partnerLink="request2"
- portType="wns:TestStaticPick2PT"
operation="request" variable="request">
+ <onMessage partnerLink="request1"
+ portType="wns:TestStaticPick1PT"
operation="continue1" variable="request">
+ <correlations>
+ <correlation set="testCorr1"/>
+ </correlations>
<sequence>
<assign>
<copy>
@@ -122,14 +126,17 @@
</copy>
</assign>
- <reply name="reply"
partnerLink="request2" portType="wns:TestStaticPick2PT"
- operation="request"
variable="reply">
+ <reply name="reply"
partnerLink="request1" portType="wns:TestStaticPick1PT"
+ operation="continue1"
variable="reply">
</reply>
</sequence>
</onMessage>
- <onMessage partnerLink="request3"
- portType="wns:TestStaticPick3PT"
operation="request" variable="request">
+ <onMessage partnerLink="request1"
+ portType="wns:TestStaticPick1PT"
operation="continue2" variable="request">
+ <correlations>
+ <correlation set="testCorr1"/>
+ </correlations>
<sequence>
<assign>
<copy>
@@ -173,8 +180,8 @@
</copy>
</assign>
- <reply name="reply"
partnerLink="request3" portType="wns:TestStaticPick3PT"
- operation="request"
variable="reply">
+ <reply name="reply"
partnerLink="request1" portType="wns:TestStaticPick1PT"
+ operation="continue2"
variable="reply">
</reply>
</sequence>
Modified:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.wsdl
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.wsdl?view=diff&rev=452704&r1=452703&r2=452704
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.wsdl
(original)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.wsdl
Tue Oct 3 20:11:48 2006
@@ -25,59 +25,32 @@
<wsdl:operation name="request">
<wsdl:input message="requestMessage"/>
</wsdl:operation>
- </wsdl:portType>
-
- <wsdl:portType name="TestStaticPick2PT">
- <wsdl:operation name="request">
+ <wsdl:operation name="continue1">
<wsdl:input message="requestMessage"/>
<wsdl:output message="replyMessage"/>
</wsdl:operation>
- </wsdl:portType>
-
- <wsdl:portType name="TestStaticPick3PT">
- <wsdl:operation name="request">
+ <wsdl:operation name="continue2">
<wsdl:input message="requestMessage"/>
<wsdl:output message="replyMessage"/>
</wsdl:operation>
</wsdl:portType>
+
<wsdl:binding name="TestStaticPick1Binding" type="tns:TestStaticPick1PT">
<wsdl:operation name="request">
</wsdl:operation>
+ <wsdl:operation name="continue1">
+ </wsdl:operation>
+ <wsdl:operation name="continue2">
+ </wsdl:operation>
</wsdl:binding>
<wsdl:service name="TestStaticPick1Service">
<wsdl:port name="TestStaticPick1Port"
binding="tns:TestStaticPick1Binding">
</wsdl:port>
</wsdl:service>
- <wsdl:binding name="TestStaticPick2Binding" type="tns:TestStaticPick2PT">
- <wsdl:operation name="request">
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="TestStaticPick2Service">
- <wsdl:port name="TestStaticPick2Port"
binding="tns:TestStaticPick2Binding">
- </wsdl:port>
- </wsdl:service>
-
- <wsdl:binding name="TestStaticPick3Binding" type="tns:TestStaticPick3PT">
- <wsdl:operation name="request">
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="TestStaticPick3Service">
- <wsdl:port name="TestStaticPick3Port"
binding="tns:TestStaticPick3Binding">
- </wsdl:port>
- </wsdl:service>
-
<plnk:partnerLinkType name="TestStaticPick1Request">
<plnk:role name="TestStaticPick1Service" portType="TestStaticPick1PT"/>
- </plnk:partnerLinkType>
-
- <plnk:partnerLinkType name="TestStaticPick2Request">
- <plnk:role name="TestStaticPick2Service" portType="TestStaticPick2PT"/>
- </plnk:partnerLinkType>
-
- <plnk:partnerLinkType name="TestStaticPick3Request">
- <plnk:role name="TestStaticPick3Service" portType="TestStaticPick3PT"/>
</plnk:partnerLinkType>
<plnk:partnerLinkType name="probeRequest">
Modified:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/deploy.xml
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/deploy.xml?view=diff&rev=452704&r1=452703&r2=452704
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/deploy.xml
(original)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/deploy.xml
Tue Oct 3 20:11:48 2006
@@ -8,11 +8,5 @@
<provide partnerLink="request1">
<service name="wns:TestStaticPick1Service"
port="wns:TestStaticPick1Port"/>
</provide>
- <provide partnerLink="request2">
- <service name="wns:TestStaticPick2Service"
port="wns:TestStaticPick2Port"/>
- </provide>
- <provide partnerLink="request3">
- <service name="wns:TestStaticPick3Service"
port="wns:TestStaticPick3Port"/>
- </provide>
</process>
</deploy>
Modified:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test1.properties
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test1.properties?view=diff&rev=452704&r1=452703&r2=452704
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test1.properties
(original)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test1.properties
Tue Oct 3 20:11:48 2006
@@ -1,5 +1,5 @@
namespace=http://ode/bpel/unit-test/TestStaticPick.wsdl
service=TestStaticPick1Service
operation=request
-request1=<message><requestID>Start
TestStaticPick</requestID><requestText>TestStaticPick
Request1</requestText></message>
+request1=<message><requestID>TestStaticPick1</requestID><requestText>TestStaticPick
Request1</requestText></message>
response1=ASYNC
Modified:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test2.properties
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test2.properties?view=diff&rev=452704&r1=452703&r2=452704
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test2.properties
(original)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test2.properties
Tue Oct 3 20:11:48 2006
@@ -1,5 +1,5 @@
namespace=http://ode/bpel/unit-test/TestStaticPick.wsdl
-service=TestStaticPick2Service
-operation=request
-request1=<message><requestID>Continue
TestStaticPick</requestID><requestText>TestStaticPick
Request2</requestText></message>
-response1=.*test.*
+service=TestStaticPick1Service
+operation=continue1
+request1=<message><requestID>TestStaticPick1</requestID><requestText>TestStaticPick
Request2</requestText></message>
+response1=.*TestStaticPick Request1 -> block for next message -> pick
branch one invoked -> process complete.*
Modified:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test3.properties
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test3.properties?view=diff&rev=452704&r1=452703&r2=452704
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test3.properties
(original)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test3.properties
Tue Oct 3 20:11:48 2006
@@ -1,5 +1,5 @@
namespace=http://ode/bpel/unit-test/TestStaticPick.wsdl
service=TestStaticPick1Service
operation=request
-request1=<message><requestID>Start
TestStaticPick</requestID><requestText>TestStaticPick
Request1</requestText></message>
+request1=<message><requestID>TestStaticPick2</requestID><requestText>TestStaticPick
Request1</requestText></message>
response1=ASYNC
Modified:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test4.properties
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test4.properties?view=diff&rev=452704&r1=452703&r2=452704
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test4.properties
(original)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test4.properties
Tue Oct 3 20:11:48 2006
@@ -1,5 +1,5 @@
namespace=http://ode/bpel/unit-test/TestStaticPick.wsdl
-service=TestStaticPick3Service
-operation=request
-request1=<message><requestID>Continue
TestStaticPick</requestID><requestText>TestStaticPick
Request3</requestText></message>
-response1=.*test.*
+service=TestStaticPick1Service
+operation=continue2
+request1=<message><requestID>TestStaticPick2</requestID><requestText>TestStaticPick
Request3</requestText></message>
+response1=.*TestStaticPick Request1 -> block for next message -> pick
branch two invoked -> process complete.*
