Author: lwaterman
Date: Wed Sep 27 10:27:58 2006
New Revision: 450513
URL: http://svn.apache.org/viewvc?view=rev&rev=450513
Log:
Add async correlation test
Added:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationAsync/
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationAsync/deploy.xml
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationAsync/test1.properties
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationAsync/test2.properties
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationAsync/testCorrelation.bpel
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationAsync/testCorrelation.wsdl
Modified:
incubator/ode/trunk/bpel-test/src/main/java/org/apache/ode/test/MessageExchangeContextImpl.java
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BPELTest.java
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/TestAssign.bpel
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/TestAssign.wsdl
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/deploy.xml
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/test.properties
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/TestAssign.bpel
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/TestAssign.wsdl
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/deploy.xml
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/test.properties
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/test1.properties
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/testCorrelation.wsdl
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/TestActivityFlow.bpel
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/TestActivityFlow.wsdl
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/deploy.xml
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/test.properties
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/TestActivityFlow.bpel
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/TestActivityFlow.wsdl
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/deploy.xml
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/test.properties
Modified:
incubator/ode/trunk/bpel-test/src/main/java/org/apache/ode/test/MessageExchangeContextImpl.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/main/java/org/apache/ode/test/MessageExchangeContextImpl.java?view=diff&rev=450513&r1=450512&r2=450513
==============================================================================
---
incubator/ode/trunk/bpel-test/src/main/java/org/apache/ode/test/MessageExchangeContextImpl.java
(original)
+++
incubator/ode/trunk/bpel-test/src/main/java/org/apache/ode/test/MessageExchangeContextImpl.java
Wed Sep 27 10:27:58 2006
@@ -84,8 +84,9 @@
currentResponse = myRoleMex.getResponse();
- String resp =
DOMUtils.domToString(getCurrentResponse().getMessage());
- System.out.println(resp);
+
+ //String resp =
DOMUtils.domToString(getCurrentResponse().getMessage());
+ //System.out.println(resp);
}
Modified:
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BPELTest.java
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BPELTest.java?view=diff&rev=450513&r1=450512&r2=450513
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BPELTest.java
(original)
+++
incubator/ode/trunk/bpel-test/src/test/java/org/apache/ode/test/BPELTest.java
Wed Sep 27 10:27:58 2006
@@ -107,8 +107,10 @@
*
* Where N is a monotonic integer beginning with 1.
*
- * If no response is expected use:
- * responseN=null
+ * If a specific MEP is expected in lieu of a response
message use:
+ * responseN=ASYNC
+ * responseN=ONE_WAY
+ * responseN=COMPLETED_OK
*
*/
@@ -128,17 +130,20 @@
switch (mex.getStatus()) {
case RESPONSE:
- Message response = mex.getResponse();
- String resp =
DOMUtils.domToString(response.getMessage());
- System.out.println(resp);
-
assertTrue(Pattern.compile(responsePattern,Pattern.DOTALL).matcher(resp).matches());
+
testResponsePattern(mex.getResponse(),responsePattern);
// TODO: test for response fault
break;
- case ASYNC:
- // TODO: handle Async
- if ( !responsePattern.equals("null"))
+ case ASYNC:
+ if ( !responsePattern.equals("ASYNC"))
assertTrue(false);
break;
+ case ONE_WAY:
+ if ( !responsePattern.equals("ONE_WAY"))
+ assertTrue(false);
+ case COMPLETED_OK:
+ if (
!responsePattern.equals("COMPLETED_OK"))
+
testResponsePattern(mexContext.getCurrentResponse(),responsePattern);
+ break;
case FAULT:
// TODO: handle Fault
assertTrue(false);
@@ -153,6 +158,12 @@
testPropsFile = new
File(deployDir+"/test"+propsFileCnt+".properties");
}
}
+
+ private void testResponsePattern(Message response, String
responsePattern){
+ String resp = DOMUtils.domToString(response.getMessage());
+ //System.out.println(resp);
+
assertTrue(Pattern.compile(responsePattern,Pattern.DOTALL).matcher(resp).matches());
+ }
public void testHelloWorld2() throws Exception {
go("target/test-classes/bpel/2.0/HelloWorld2");
@@ -179,6 +190,9 @@
}
public void testCorrelation() throws Exception {
go("target/test-classes/bpel/2.0/testCorrelation");
+ }
+ public void testCorrelationAsync() throws Exception {
+ go("target/test-classes/bpel/2.0/testCorrelationAsync");
}
/** These tests compile however they fail at runtime */
Modified:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/TestAssign.bpel
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/TestAssign.bpel?view=diff&rev=450513&r1=450512&r2=450513
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/TestAssign.bpel
(original)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/TestAssign.bpel
Wed Sep 27 10:27:58 2006
@@ -18,17 +18,17 @@
-->
<process name="TestAssign"
- targetNamespace="http://ode/bpel/unit-test";
+ targetNamespace="http://ode/bpel/unit-testAssign1";
xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/";
xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/";
- xmlns:tns="http://ode/bpel/unit-test";
+ xmlns:tns="http://ode/bpel/unit-testAssign1";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
- xmlns:test="http://ode/bpel/unit-test.wsdl";
+ xmlns:test="http://ode/bpel/unit-testAssign1.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="TestAssign.wsdl"
- namespace="http://ode/bpel/unit-test.wsdl";
+ namespace="http://ode/bpel/unit-testAssign1.wsdl";
importType="http://schemas.xmlsoap.org/wsdl/"; />
<partnerLinks>
Modified:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/TestAssign.wsdl
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/TestAssign.wsdl?view=diff&rev=450513&r1=450512&r2=450513
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/TestAssign.wsdl
(original)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/TestAssign.wsdl
Wed Sep 27 10:27:58 2006
@@ -20,9 +20,9 @@
-->
<wsdl:definitions
- targetNamespace="http://ode/bpel/unit-test.wsdl";
+ targetNamespace="http://ode/bpel/unit-testAssign1.wsdl";
xmlns="http://schemas.xmlsoap.org/wsdl/";
- xmlns:tns="http://ode/bpel/unit-test.wsdl";
+ xmlns:tns="http://ode/bpel/unit-testAssign1.wsdl";
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";
Modified:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/deploy.xml
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/deploy.xml?view=diff&rev=450513&r1=450512&r2=450513
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/deploy.xml
(original)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/deploy.xml
Wed Sep 27 10:27:58 2006
@@ -18,8 +18,8 @@
-->
<deploy xmlns="http://ode.fivesight.com/schemas/2006/06/27/dd";
- xmlns:pns="http://ode/bpel/unit-test";
- xmlns:wns="http://ode/bpel/unit-test.wsdl";>
+ xmlns:pns="http://ode/bpel/unit-testAssign1";
+ xmlns:wns="http://ode/bpel/unit-testAssign1.wsdl";>
<process name="pns:TestAssign">
Modified:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/test.properties
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/test.properties?view=diff&rev=450513&r1=450512&r2=450513
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/test.properties
(original)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity1/test.properties
Wed Sep 27 10:27:58 2006
@@ -1,4 +1,4 @@
-namespace=http://ode/bpel/unit-test.wsdl
+namespace=http://ode/bpel/unit-testAssign1.wsdl
service=TestAssignService
operation=testAssign
request1=<message><TestPart>Hello</TestPart></message>
Modified:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/TestAssign.bpel
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/TestAssign.bpel?view=diff&rev=450513&r1=450512&r2=450513
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/TestAssign.bpel
(original)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/TestAssign.bpel
Wed Sep 27 10:27:58 2006
@@ -18,17 +18,17 @@
-->
<process name="TestAssign"
- targetNamespace="http://ode/bpel/unit-test";
+ targetNamespace="http://ode/bpel/unit-testAssign2";
xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/";
xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/";
- xmlns:tns="http://ode/bpel/unit-test";
+ xmlns:tns="http://ode/bpel/unit-testAssign2";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
- xmlns:test="http://ode/bpel/unit-test.wsdl";
+ xmlns:test="http://ode/bpel/unit-testAssign2.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="TestAssign.wsdl"
- namespace="http://ode/bpel/unit-test.wsdl";
+ namespace="http://ode/bpel/unit-testAssign2.wsdl";
importType="http://schemas.xmlsoap.org/wsdl/"; />
<partnerLinks>
Modified:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/TestAssign.wsdl
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/TestAssign.wsdl?view=diff&rev=450513&r1=450512&r2=450513
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/TestAssign.wsdl
(original)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/TestAssign.wsdl
Wed Sep 27 10:27:58 2006
@@ -20,9 +20,9 @@
-->
<wsdl:definitions
- targetNamespace="http://ode/bpel/unit-test.wsdl";
+ targetNamespace="http://ode/bpel/unit-testAssign2.wsdl";
xmlns="http://schemas.xmlsoap.org/wsdl/";
- xmlns:tns="http://ode/bpel/unit-test.wsdl";
+ xmlns:tns="http://ode/bpel/unit-testAssign2.wsdl";
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";
Modified:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/deploy.xml
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/deploy.xml?view=diff&rev=450513&r1=450512&r2=450513
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/deploy.xml
(original)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/deploy.xml
Wed Sep 27 10:27:58 2006
@@ -18,8 +18,8 @@
-->
<deploy xmlns="http://ode.fivesight.com/schemas/2006/06/27/dd";
- xmlns:pns="http://ode/bpel/unit-test";
- xmlns:wns="http://ode/bpel/unit-test.wsdl";>
+ xmlns:pns="http://ode/bpel/unit-testAssign2";
+ xmlns:wns="http://ode/bpel/unit-testAssign2.wsdl";>
<process name="pns:TestAssign">
Modified:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/test.properties
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/test.properties?view=diff&rev=450513&r1=450512&r2=450513
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/test.properties
(original)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestAssignActivity2/test.properties
Wed Sep 27 10:27:58 2006
@@ -1,4 +1,4 @@
-namespace=http://ode/bpel/unit-test.wsdl
+namespace=http://ode/bpel/unit-testAssign2.wsdl
service=TestAssignService
operation=testAssign
request1=<message><TestPart>Hello</TestPart></message>
Modified:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/test1.properties
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/test1.properties?view=diff&rev=450513&r1=450512&r2=450513
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/test1.properties
(original)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/test1.properties
Wed Sep 27 10:27:58 2006
@@ -2,4 +2,4 @@
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=null
\ No newline at end of file
+response1=ONE_WAY
\ No newline at end of file
Modified:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/testCorrelation.wsdl
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/testCorrelation.wsdl?view=diff&rev=450513&r1=450512&r2=450513
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/testCorrelation.wsdl
(original)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/testCorrelation.wsdl
Wed Sep 27 10:27:58 2006
@@ -37,12 +37,10 @@
<wsdl:part name="replyText" type="xsd:string"/>
</wsdl:message>
- <!-- portType supported by the test2 process -->
-
+
<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"/>
Added:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationAsync/deploy.xml
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationAsync/deploy.xml?view=auto&rev=450513
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationAsync/deploy.xml
(added)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationAsync/deploy.xml
Wed Sep 27 10:27:58 2006
@@ -0,0 +1,12 @@
+<deploy xmlns="http://ode.fivesight.com/schemas/2006/06/27/dd";
+ xmlns:pns="http://ode/bpel/unit-test/testCorrelationAsync";
+ xmlns:wns="http://ode/bpel/unit-test/testCorrelationAsync.wsdl";>
+
+
+ <process name="pns:TestCorrelationProcess">
+ <active>true</active>
+ <provide partnerLink="request">
+ <service name="wns:testCorrelationService"
port="wns:testCorrelationPort"/>
+ </provide>
+ </process>
+</deploy>
Added:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationAsync/test1.properties
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationAsync/test1.properties?view=auto&rev=450513
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationAsync/test1.properties
(added)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationAsync/test1.properties
Wed Sep 27 10:27:58 2006
@@ -0,0 +1,5 @@
+namespace=http://ode/bpel/unit-test/testCorrelationAsync.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
Added:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationAsync/test2.properties
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationAsync/test2.properties?view=auto&rev=450513
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationAsync/test2.properties
(added)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationAsync/test2.properties
Wed Sep 27 10:27:58 2006
@@ -0,0 +1,5 @@
+namespace=http://ode/bpel/unit-test/testCorrelationAsync.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.*
Added:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationAsync/testCorrelation.bpel
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationAsync/testCorrelation.bpel?view=auto&rev=450513
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationAsync/testCorrelation.bpel
(added)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationAsync/testCorrelation.bpel
Wed Sep 27 10:27:58 2006
@@ -0,0 +1,99 @@
+<process xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://schemas.xmlsoap.org/ws/2004/03/business-process/
../../../../../../../bpel-schemas/src/main/resources/wsbpel_main-draft-Apr-29-2006.xsd"
+ xmlns:tns="http://ode/bpel/unit-test/testCorrelationAsync";
+ xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl";
+ xmlns:wns="http://ode/bpel/unit-test/testCorrelationAsync.wsdl";
+ xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/";
+ name="TestCorrelationProcess"
+ targetNamespace="http://ode/bpel/unit-test/testCorrelationAsync";
+ 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/testCorrelationAsync.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>
Added:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationAsync/testCorrelation.wsdl
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationAsync/testCorrelation.wsdl?view=auto&rev=450513
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationAsync/testCorrelation.wsdl
(added)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCorrelationAsync/testCorrelation.wsdl
Wed Sep 27 10:27:58 2006
@@ -0,0 +1,85 @@
+
+<wsdl:definitions
+ targetNamespace="http://ode/bpel/unit-test/testCorrelationAsync.wsdl";
+ xmlns:tns="http://ode/bpel/unit-test/testCorrelationAsync.wsdl";
+ xmlns:typens="http://ode/bpel/unit-test/testCorrelationAsync.wsdl.types";
+ xmlns="http://ode/bpel/unit-test/testCorrelationAsync.wsdl";
+ xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/";
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+ xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl";
+ xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/";
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";>
+
+
+ <!-- type defs -->
+ <wsdl:types>
+ <xsd:schema
+
targetNamespace="http://ode/bpel/unit-test/testCorrelationAsync.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>
+
+ <!-- portType supported by the test2 process -->
+
+ <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>
+
+ <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>
+
+</wsdl:definitions>
Modified:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/TestActivityFlow.bpel
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/TestActivityFlow.bpel?view=diff&rev=450513&r1=450512&r2=450513
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/TestActivityFlow.bpel
(original)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/TestActivityFlow.bpel
Wed Sep 27 10:27:58 2006
@@ -1,12 +1,12 @@
<process xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://schemas.xmlsoap.org/ws/2004/03/business-process/
../../../../../../../bpel-schemas/src/main/resources/wsbpel_main-draft-Apr-29-2006.xsd"
- xmlns:tns="http://ode/bpel/unit-test/testFlowActivity";
- xmlns:wns="http://ode/bpel/unit-test/testFlowActivity.wsdl";
+ xmlns:tns="http://ode/bpel/unit-test/testFlowActivity1";
+ xmlns:wns="http://ode/bpel/unit-test/testFlowActivity1.wsdl";
xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl";
xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/";
xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/";
name="TestActivityFlow"
- targetNamespace="http://ode/bpel/unit-test/testFlowActivity";
+ targetNamespace="http://ode/bpel/unit-test/testFlowActivity1";
suppressJoinFailure="yes"
queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
@@ -14,7 +14,7 @@
<!-- Test Flow using XPath 20 -->
<import location="TestActivityFlow.wsdl"
- namespace="http://ode/bpel/unit-test/testFlowActivity.wsdl";
+ namespace="http://ode/bpel/unit-test/testFlowActivity1.wsdl";
importType="http://schemas.xmlsoap.org/wsdl/"; />
<import location="../ProbeService/probeService.wsdl"
namespace="http://ode/bpel/unit-test/ProbeService.wsdl";
Modified:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/TestActivityFlow.wsdl
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/TestActivityFlow.wsdl?view=diff&rev=450513&r1=450512&r2=450513
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/TestActivityFlow.wsdl
(original)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/TestActivityFlow.wsdl
Wed Sep 27 10:27:58 2006
@@ -1,9 +1,9 @@
<wsdl:definitions
- targetNamespace="http://ode/bpel/unit-test/testFlowActivity.wsdl";
- xmlns:tns="http://ode/bpel/unit-test/testFlowActivity.wsdl";
- xmlns="http://ode/bpel/unit-test/testFlowActivity.wsdl";
- xmlns:typens="http://ode/bpel/unit-test/testFlowActivity.wsdl.types";
+ targetNamespace="http://ode/bpel/unit-test/testFlowActivity1.wsdl";
+ xmlns:tns="http://ode/bpel/unit-test/testFlowActivity1.wsdl";
+ xmlns="http://ode/bpel/unit-test/testFlowActivity1.wsdl";
+ xmlns:typens="http://ode/bpel/unit-test/testFlowActivity1.wsdl.types";
xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl";
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/";
@@ -13,7 +13,7 @@
<!-- type defs -->
<wsdl:types>
<xsd:schema
- targetNamespace="http://ode/bpel/unit-test/testFlowActivity.wsdl.types";
+ targetNamespace="http://ode/bpel/unit-test/testFlowActivity1.wsdl.types";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
<xsd:complexType name="flowIndicator">
<xsd:sequence>
Modified:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/deploy.xml
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/deploy.xml?view=diff&rev=450513&r1=450512&r2=450513
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/deploy.xml
(original)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/deploy.xml
Wed Sep 27 10:27:58 2006
@@ -1,6 +1,6 @@
<deploy xmlns="http://ode.fivesight.com/schemas/2006/06/27/dd";
- xmlns:pns="http://ode/bpel/unit-test/testFlowActivity";
- xmlns:wns="http://ode/bpel/unit-test/testFlowActivity.wsdl";>
+ xmlns:pns="http://ode/bpel/unit-test/testFlowActivity1";
+ xmlns:wns="http://ode/bpel/unit-test/testFlowActivity1.wsdl";>
<process name="pns:TestActivityFlow">
Modified:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/test.properties
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/test.properties?view=diff&rev=450513&r1=450512&r2=450513
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/test.properties
(original)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/test.properties
Wed Sep 27 10:27:58 2006
@@ -1,4 +1,4 @@
-namespace=http://ode/bpel/unit-test/testFlowActivity.wsdl
+namespace=http://ode/bpel/unit-test/testFlowActivity1.wsdl
service=TestFlowActivityService
operation=request
request1=<message><requestMessageData><testMessage><requestID>Start
Test1.1</requestID><requestText>Event Start
Test1.1</requestText><flowIndicators><indicatorOne>yes</indicatorOne><indicatorTwo>yes</indicatorTwo></flowIndicators><loopIndicator>min</loopIndicator></testMessage></requestMessageData></message>
Modified:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/TestActivityFlow.bpel
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/TestActivityFlow.bpel?view=diff&rev=450513&r1=450512&r2=450513
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/TestActivityFlow.bpel
(original)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/TestActivityFlow.bpel
Wed Sep 27 10:27:58 2006
@@ -1,18 +1,18 @@
<process xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xsi:schemaLocation="http://schemas.xmlsoap.org/ws/2004/03/business-process/
../../../../../../../bpel-schemas/src/main/resources/wsbpel_main-draft-Apr-29-2006.xsd"
- xmlns:tns="http://ode/bpel/unit-test/testFlowActivity";
- xmlns:wns="http://ode/bpel/unit-test/testFlowActivity.wsdl";
+ xmlns:tns="http://ode/bpel/unit-test/testFlowActivity2";
+ xmlns:wns="http://ode/bpel/unit-test/testFlowActivity2.wsdl";
xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl";
xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/";
xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/";
name="TestActivityFlow"
- targetNamespace="http://ode/bpel/unit-test/testFlowActivity";
+ targetNamespace="http://ode/bpel/unit-test/testFlowActivity2";
suppressJoinFailure="yes">
<!-- Test Flow using XPath 10 -->
<import location="TestActivityFlow.wsdl"
- namespace="http://ode/bpel/unit-test/testFlowActivity.wsdl";
+ namespace="http://ode/bpel/unit-test/testFlowActivity2.wsdl";
importType="http://schemas.xmlsoap.org/wsdl/"; />
<import location="../ProbeService/probeService.wsdl"
namespace="http://ode/bpel/unit-test/ProbeService.wsdl";
Modified:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/TestActivityFlow.wsdl
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/TestActivityFlow.wsdl?view=diff&rev=450513&r1=450512&r2=450513
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/TestActivityFlow.wsdl
(original)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/TestActivityFlow.wsdl
Wed Sep 27 10:27:58 2006
@@ -1,9 +1,9 @@
<wsdl:definitions
- targetNamespace="http://ode/bpel/unit-test/testFlowActivity.wsdl";
- xmlns:tns="http://ode/bpel/unit-test/testFlowActivity.wsdl";
- xmlns="http://ode/bpel/unit-test/testFlowActivity.wsdl";
- xmlns:typens="http://ode/bpel/unit-test/testFlowActivity.wsdl.types";
+ targetNamespace="http://ode/bpel/unit-test/testFlowActivity2.wsdl";
+ xmlns:tns="http://ode/bpel/unit-test/testFlowActivity2.wsdl";
+ xmlns="http://ode/bpel/unit-test/testFlowActivity2.wsdl";
+ xmlns:typens="http://ode/bpel/unit-test/testFlowActivity2.wsdl.types";
xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl";
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/";
@@ -13,7 +13,7 @@
<!-- type defs -->
<wsdl:types>
<xsd:schema
- targetNamespace="http://ode/bpel/unit-test/testFlowActivity.wsdl.types";
+ targetNamespace="http://ode/bpel/unit-test/testFlowActivity2.wsdl.types";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";>
<xsd:complexType name="flowIndicator">
<xsd:sequence>
Modified:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/deploy.xml
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/deploy.xml?view=diff&rev=450513&r1=450512&r2=450513
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/deploy.xml
(original)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/deploy.xml
Wed Sep 27 10:27:58 2006
@@ -1,6 +1,6 @@
<deploy xmlns="http://ode.fivesight.com/schemas/2006/06/27/dd";
- xmlns:pns="http://ode/bpel/unit-test/testFlowActivity";
- xmlns:wns="http://ode/bpel/unit-test/testFlowActivity.wsdl";>
+ xmlns:pns="http://ode/bpel/unit-test/testFlowActivity2";
+ xmlns:wns="http://ode/bpel/unit-test/testFlowActivity2.wsdl";>
<process name="pns:TestActivityFlow">
Modified:
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/test.properties
URL:
http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/test.properties?view=diff&rev=450513&r1=450512&r2=450513
==============================================================================
---
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/test.properties
(original)
+++
incubator/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/test.properties
Wed Sep 27 10:27:58 2006
@@ -1,4 +1,4 @@
-namespace=http://ode/bpel/unit-test/testFlowActivity.wsdl
+namespace=http://ode/bpel/unit-test/testFlowActivity2.wsdl
service=TestFlowActivityService
operation=request
request1=<message><requestMessageData><testMessage><requestID>Start
Test1.1</requestID><requestText>Event Start
Test1.1</requestText><flowIndicators><indicatorOne>yes</indicatorOne><indicatorTwo>yes</indicatorTwo></flowIndicators><loopIndicator>min</loopIndicator></testMessage></requestMessageData></message>
