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 17:46:12 UTC
svn commit: r649153 - in /ode/branches/APACHE_ODE_1.1/bpel-test/src/test:
java/org/apache/ode/test/ resources/bpel/2.0/TestInstantiatingPick/
resources/bpel/2.0/TestStaticOnMessage/ resources/bpel/2.0/TestStaticPick/
Author: mriou
Date: Thu Apr 17 08:46:04 2008
New Revision: 649153
URL: http://svn.apache.org/viewvc?rev=649153&view=rev
Log:
Resurrected 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/TestInstantiatingPick/TestInstantiatingPick.bpel
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestInstantiatingPick/TestInstantiatingPick.wsdl
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestInstantiatingPick/deploy.xml
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/TestStaticOnMessage.bpel
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/TestStaticOnMessage.wsdl
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/deploy.xml
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/test1.properties
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/test2.properties
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/test3.properties
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/test4.properties
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/test5.properties
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.bpel
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.wsdl
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/deploy.xml
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test1.properties
ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/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=649153&r1=649152&r2=649153&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 08:46:04 2008
@@ -40,15 +40,15 @@
go("/bpel/2.0/TestDynamicPick");
}
- @Ignore("fix test bed for handling ASYNC mex") @Test public void testInstPick() throws Throwable {
+ @Test public void testInstPick() throws Throwable {
go("/bpel/2.0/TestInstantiatingPick");
}
- @Ignore("fix test bed for handling ASYNC mex") @Test public void testStaticOnMessage() throws Throwable {
+ @Test public void testStaticOnMessage() throws Throwable {
go("/bpel/2.0/TestStaticOnMessage");
}
- @Ignore("fix test bed for handling ASYNC mex") @Test public void testStaticPick() throws Throwable {
+ @Test public void testStaticPick() throws Throwable {
go("/bpel/2.0/TestStaticPick");
}
Modified: ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestInstantiatingPick/TestInstantiatingPick.bpel
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestInstantiatingPick/TestInstantiatingPick.bpel?rev=649153&r1=649152&r2=649153&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestInstantiatingPick/TestInstantiatingPick.bpel (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestInstantiatingPick/TestInstantiatingPick.bpel Thu Apr 17 08:46:04 2008
@@ -1,186 +1,183 @@
-<!--
- ~ 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/TestInstantiatingPick"
- xmlns:wns="http://ode/bpel/unit-test/TestInstantiatingPick.wsdl"
- xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
- xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
- name="TestInstantiatingPick"
- targetNamespace="http://ode/bpel/unit-test/TestInstantiatingPick"
- queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
- expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
- suppressJoinFailure="yes">
-
-<!-- Unit test process instantiating pick -->
- <import location="TestInstantiatingPick.wsdl"
- namespace="http://ode/bpel/unit-test/TestInstantiatingPick.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/"/>
-
-
- <partnerLinks>
- <partnerLink name="request1" partnerLinkType="wns:testInstPick1Request" myRole="testInstPick1Service"/>
- <partnerLink name="request2" partnerLinkType="wns:testInstPick2Request" myRole="testInstPick2Service"/>
- <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>
-
-
- <pick name="testPick" createInstance="yes">
- <onMessage partnerLink="request1"
- portType="wns:testInstPick1PT" operation="request" variable="request">
- <sequence>
- <assign name="assign1">
- <copy>
- <from variable="request" property="wns:testProbeID"/>
- <to variable="probeInput" part="probeName"/>
- </copy>
- <copy>
- <from variable="request" part="requestText"/>
- <to variable="probeInput" part="probeData"/>
- </copy>
- </assign>
-
- <assign>
- <copy>
- <from>
- <literal><![CDATA[pick branch one invoked]]></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>
- <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="request1" portType="wns:testInstPick1PT"
- operation="request" variable="reply">
- </reply>
-
- </sequence>
- </onMessage>
- <onMessage partnerLink="request2"
- portType="wns:testInstPick2PT" operation="request" variable="request">
- <sequence>
- <assign name="assign1">
- <copy>
- <from variable="request" property="wns:testProbeID"/>
- <to variable="probeInput" part="probeName"/>
- </copy>
- <copy>
- <from variable="request" part="requestText"/>
- <to variable="probeInput" part="probeData"/>
- </copy>
- </assign>
-
- <assign>
- <copy>
- <from>
- <literal><![CDATA[pick branch two invoked]]></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>
- <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="request2" portType="wns:testInstPick2PT"
- operation="request" variable="reply">
- </reply>
-
- </sequence>
- </onMessage>
- </pick>
-
+<!--
+ ~ 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/TestInstantiatingPick"
+ xmlns:wns="http://ode/bpel/unit-test/TestInstantiatingPick.wsdl"
+ xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
+ xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+ name="TestInstantiatingPick"
+ targetNamespace="http://ode/bpel/unit-test/TestInstantiatingPick"
+ queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+ expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+ suppressJoinFailure="yes">
+
+ <!-- Unit test process instantiating pick -->
+ <import location="TestInstantiatingPick.wsdl"
+ namespace="http://ode/bpel/unit-test/TestInstantiatingPick.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/"/>
+
+
+ <partnerLinks>
+ <partnerLink name="request1" partnerLinkType="wns:testInstPick1Request" myRole="testInstPick1Service"/>
+ <partnerLink name="request2" partnerLinkType="wns:testInstPick2Request" myRole="testInstPick2Service"/>
+ <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>
+
+
+ <pick name="testPick" createInstance="yes">
+ <onMessage partnerLink="request1"
+ portType="wns:testInstPick1PT" operation="request" variable="request">
+ <sequence>
+ <assign name="assign1">
+ <copy>
+ <from variable="request" property="wns:testProbeID"/>
+ <to variable="probeInput" part="probeName"/>
+ </copy>
+ <copy>
+ <from variable="request" part="requestText"/>
+ <to variable="probeInput" part="probeData"/>
+ </copy>
+ </assign>
+
+ <assign>
+ <copy>
+ <from>
+ <literal><![CDATA[pick branch one invoked]]></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>
+ <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="request1" portType="wns:testInstPick1PT"
+ operation="request" variable="reply">
+ </reply>
+
+ </sequence>
+ </onMessage>
+ <onMessage partnerLink="request2"
+ portType="wns:testInstPick2PT" operation="request" variable="request">
+ <sequence>
+ <assign name="assign1">
+ <copy>
+ <from variable="request" property="wns:testProbeID"/>
+ <to variable="probeInput" part="probeName"/>
+ </copy>
+ <copy>
+ <from variable="request" part="requestText"/>
+ <to variable="probeInput" part="probeData"/>
+ </copy>
+ </assign>
+
+ <assign>
+ <copy>
+ <from>
+ <literal><![CDATA[pick branch two invoked]]></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>
+ <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="request2" portType="wns:testInstPick2PT"
+ operation="request" variable="reply">
+ </reply>
+
+ </sequence>
+ </onMessage>
+ </pick>
+
</process>
Modified: ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestInstantiatingPick/TestInstantiatingPick.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestInstantiatingPick/TestInstantiatingPick.wsdl?rev=649153&r1=649152&r2=649153&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestInstantiatingPick/TestInstantiatingPick.wsdl (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestInstantiatingPick/TestInstantiatingPick.wsdl Thu Apr 17 08:46:04 2008
@@ -25,8 +25,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:message name="requestMessage">
<wsdl:part name="requestID" type="xsd:string"/>
@@ -38,7 +38,6 @@
<wsdl:part name="replyText" type="xsd:string"/>
</wsdl:message>
-
<wsdl:portType name="testInstPick1PT">
<wsdl:operation name="request">
<wsdl:input message="requestMessage"/>
@@ -82,10 +81,8 @@
<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="requestID"/>
-
+
+ <prop:property name="testProbeID" type="xsd:string"/>
+ <prop:propertyAlias propertyName="tns:testProbeID" messageType="tns:requestMessage" part="requestID"/>
</wsdl:definitions>
Modified: ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestInstantiatingPick/deploy.xml
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestInstantiatingPick/deploy.xml?rev=649153&r1=649152&r2=649153&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestInstantiatingPick/deploy.xml (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestInstantiatingPick/deploy.xml Thu Apr 17 08:46:04 2008
@@ -19,6 +19,7 @@
<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
xmlns:pns="http://ode/bpel/unit-test/TestInstantiatingPick"
+ xmlns:prns="http://ode/bpel/unit-test/ProbeService.wsdl"
xmlns:wns="http://ode/bpel/unit-test/TestInstantiatingPick.wsdl">
@@ -30,5 +31,8 @@
<provide partnerLink="request2">
<service name="wns:testInstPick2Service" port="wns:testInstPick2Port"/>
</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/TestStaticOnMessage/TestStaticOnMessage.bpel
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/TestStaticOnMessage.bpel?rev=649153&r1=649152&r2=649153&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/TestStaticOnMessage.bpel (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/TestStaticOnMessage.bpel Thu Apr 17 08:46:04 2008
@@ -18,7 +18,7 @@
-->
<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"
+ 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/TestStaticOnMessage"
xmlns:wns="http://ode/bpel/unit-test/TestStaticOnMessage.wsdl"
xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
Modified: ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/TestStaticOnMessage.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/TestStaticOnMessage.wsdl?rev=649153&r1=649152&r2=649153&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/TestStaticOnMessage.wsdl (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/TestStaticOnMessage.wsdl Thu Apr 17 08:46:04 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>
@@ -90,20 +91,19 @@
</wsdl:port>
</wsdl:service>
- <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>
<plnk:partnerLinkType name="TestStaticOnMessage1Request">
<plnk:role name="TestStaticOnMessage1Service" portType="TestStaticOnMessage1PT"/>
Modified: ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/deploy.xml
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/deploy.xml?rev=649153&r1=649152&r2=649153&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/deploy.xml (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/deploy.xml Thu Apr 17 08:46:04 2008
@@ -19,6 +19,7 @@
<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
xmlns:pns="http://ode/bpel/unit-test/TestStaticOnMessage"
+ xmlns:prns="http://ode/bpel/unit-test/ProbeService.wsdl"
xmlns:wns="http://ode/bpel/unit-test/TestStaticOnMessage.wsdl">
@@ -27,5 +28,8 @@
<provide partnerLink="request1">
<service name="wns:TestStaticOnMessage1Service" port="wns:TestStaticOnMessage1Port"/>
</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/TestStaticOnMessage/test1.properties
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/test1.properties?rev=649153&r1=649152&r2=649153&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/test1.properties (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/test1.properties Thu Apr 17 08:46:04 2008
@@ -18,5 +18,4 @@
namespace=http://ode/bpel/unit-test/TestStaticOnMessage.wsdl
service=TestStaticOnMessage1Service
operation=request
-request1=<message><requestMessageData><testMessage><requestID>Test Static OnMessage</requestID><requestText>Event Start Test Static OnMessage</requestText></testMessage></requestMessageData></message>
-response1=ASYNC
+request1=<message><requestMessageData><requestID>Test Static OnMessage</requestID><requestText>Event Start Test Static OnMessage</requestText></requestMessageData></message>
Modified: ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/test2.properties
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/test2.properties?rev=649153&r1=649152&r2=649153&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/test2.properties (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/test2.properties Thu Apr 17 08:46:04 2008
@@ -18,5 +18,4 @@
namespace=http://ode/bpel/unit-test/TestStaticOnMessage.wsdl
service=TestStaticOnMessage1Service
operation=event1
-request1=<message><requestMessageData><testMessage><requestID>Test Static OnMessage</requestID><requestText>Event OnMessage PT3</requestText></testMessage></requestMessageData></message>
-response1=ASYNC
+request1=<message><requestMessageData><requestID>Test Static OnMessage</requestID><requestText>Event OnMessage PT3</requestText></requestMessageData></message>
Modified: ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/test3.properties
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/test3.properties?rev=649153&r1=649152&r2=649153&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/test3.properties (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/test3.properties Thu Apr 17 08:46:04 2008
@@ -18,5 +18,4 @@
namespace=http://ode/bpel/unit-test/TestStaticOnMessage.wsdl
service=TestStaticOnMessage1Service
operation=event2
-request1=<message><requestMessageData><testMessage><requestID>Test Static OnMessage</requestID><requestText>Event OnMessage PT4</requestText></testMessage></requestMessageData></message>
-response1=ASYNC
+request1=<message><requestMessageData><requestID>Test Static OnMessage</requestID><requestText>Event OnMessage PT4</requestText></requestMessageData></message>
Modified: ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/test4.properties
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/test4.properties?rev=649153&r1=649152&r2=649153&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/test4.properties (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/test4.properties Thu Apr 17 08:46:04 2008
@@ -18,5 +18,4 @@
namespace=http://ode/bpel/unit-test/TestStaticOnMessage.wsdl
service=TestStaticOnMessage1Service
operation=continue1
-request1=<message><requestMessageData><testMessage><requestID>Test Static OnMessage</requestID><requestText>Event Receive PT2</requestText></testMessage></requestMessageData></message>
-response1=ASYNC
+request1=<message><requestMessageData><requestID>Test Static OnMessage</requestID><requestText>Event Receive PT2</requestText></requestMessageData></message>
Modified: ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/test5.properties
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/test5.properties?rev=649153&r1=649152&r2=649153&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/test5.properties (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/test5.properties Thu Apr 17 08:46:04 2008
@@ -18,5 +18,5 @@
namespace=http://ode/bpel/unit-test/TestStaticOnMessage.wsdl
service=TestStaticOnMessage1Service
operation=continue2
-request1=<message><requestMessageData><testMessage><requestID>Test Static OnMessage</requestID><requestText>Event Continue PT2</requestText></testMessage></requestMessageData></message>
+request1=<message><requestMessageData><requestID>Test Static OnMessage</requestID><requestText>Event Continue PT2</requestText></requestMessageData></message>
response1=.*Event Start Test Static OnMessage -> block for next message -> (received event on TestStaticOnMessage(3|4)PT -> )?(received event on TestStaticOnMessage(3|4)PT -> )?block for final message -> process complete.*
Modified: ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.bpel
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.bpel?rev=649153&r1=649152&r2=649153&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.bpel (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.bpel Thu Apr 17 08:46:04 2008
@@ -1,210 +1,209 @@
-<!--
- ~ 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/TestStaticPick"
- xmlns:wns="http://ode/bpel/unit-test/TestStaticPick.wsdl"
- xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
- xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
- name="TestStaticPick"
- targetNamespace="http://ode/bpel/unit-test/TestStaticPick"
- 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="TestStaticPick.wsdl"
- namespace="http://ode/bpel/unit-test/TestStaticPick.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/"/>
-
-
-<!-- Unit test pick with blocking static key -->
-
- <partnerLinks>
- <partnerLink name="request1" partnerLinkType="wns:TestStaticPick1Request" myRole="TestStaticPick1Service"/>
- <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="request1"
- portType="wns:TestStaticPick1PT"
- operation="request" variable="request"
- createInstance="yes">
- <correlations>
- <correlation set="testCorr1" initiate="yes"/>
- </correlations>
- </receive>
-
- <assign name="assign1">
- <copy>
- <from variable="request" property="wns:testProbeID"/>
- <to variable="probeInput" part="probeName"/>
- </copy>
- <copy>
- <from variable="request" part="requestText"/>
- <to variable="probeInput" part="probeData"/>
- </copy>
- </assign>
-
-
- <assign>
- <copy>
- <from>
- <literal><![CDATA[block for next 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>
-
- <pick name="testPick">
- <onMessage partnerLink="request1"
- portType="wns:TestStaticPick1PT" operation="continue1" variable="request">
- <correlations>
- <correlation set="testCorr1"/>
- </correlations>
- <sequence>
- <assign>
- <copy>
- <from>
- <literal><![CDATA[pick branch one invoked]]></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>
- <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="request1" portType="wns:TestStaticPick1PT"
- operation="continue1" variable="reply">
- </reply>
-
- </sequence>
- </onMessage>
- <onMessage partnerLink="request1"
- portType="wns:TestStaticPick1PT" operation="continue2" variable="request">
- <correlations>
- <correlation set="testCorr1"/>
- </correlations>
- <sequence>
- <assign>
- <copy>
- <from>
- <literal><![CDATA[pick branch two invoked]]></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>
- <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="request1" portType="wns:TestStaticPick1PT"
- operation="continue2" variable="reply">
- </reply>
-
- </sequence>
- </onMessage>
- </pick>
- </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/TestStaticPick"
+ xmlns:wns="http://ode/bpel/unit-test/TestStaticPick.wsdl"
+ xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
+ xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+ name="TestStaticPick"
+ targetNamespace="http://ode/bpel/unit-test/TestStaticPick"
+ 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="TestStaticPick.wsdl"
+ namespace="http://ode/bpel/unit-test/TestStaticPick.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/"/>
+
+ <!-- Unit test pick with blocking static key -->
+
+ <partnerLinks>
+ <partnerLink name="request1" partnerLinkType="wns:TestStaticPick1Request" myRole="TestStaticPick1Service"/>
+ <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="request1"
+ portType="wns:TestStaticPick1PT"
+ operation="request" variable="request"
+ createInstance="yes">
+ <correlations>
+ <correlation set="testCorr1" initiate="yes"/>
+ </correlations>
+ </receive>
+
+ <assign name="assign1">
+ <copy>
+ <from variable="request" property="wns:testProbeID"/>
+ <to variable="probeInput" part="probeName"/>
+ </copy>
+ <copy>
+ <from variable="request" part="requestText"/>
+ <to variable="probeInput" part="probeData"/>
+ </copy>
+ </assign>
+
+
+ <assign>
+ <copy>
+ <from>
+ <literal><![CDATA[block for next 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>
+
+ <pick name="testPick">
+ <onMessage partnerLink="request1"
+ portType="wns:TestStaticPick1PT" operation="continue1" variable="request">
+ <correlations>
+ <correlation set="testCorr1"/>
+ </correlations>
+ <sequence>
+ <assign>
+ <copy>
+ <from>
+ <literal><![CDATA[pick branch one invoked]]></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>
+ <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="request1" portType="wns:TestStaticPick1PT"
+ operation="continue1" variable="reply">
+ </reply>
+
+ </sequence>
+ </onMessage>
+ <onMessage partnerLink="request1"
+ portType="wns:TestStaticPick1PT" operation="continue2" variable="request">
+ <correlations>
+ <correlation set="testCorr1"/>
+ </correlations>
+ <sequence>
+ <assign>
+ <copy>
+ <from>
+ <literal><![CDATA[pick branch two invoked]]></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>
+ <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="request1" portType="wns:TestStaticPick1PT"
+ operation="continue2" variable="reply">
+ </reply>
+
+ </sequence>
+ </onMessage>
+ </pick>
+ </sequence>
</process>
Modified: ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.wsdl?rev=649153&r1=649152&r2=649153&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.wsdl (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.wsdl Thu Apr 17 08:46:04 2008
@@ -25,7 +25,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:message name="requestMessage">
@@ -43,7 +44,7 @@
<wsdl:operation name="request">
<wsdl:input message="requestMessage"/>
</wsdl:operation>
- <wsdl:operation name="continue1">
+ <wsdl:operation name="continue1">
<wsdl:input message="requestMessage"/>
<wsdl:output message="replyMessage"/>
</wsdl:operation>
@@ -55,12 +56,9 @@
<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:operation name="request"/>
+ <wsdl:operation name="continue1"/>
+ <wsdl:operation name="continue2"/>
</wsdl:binding>
<wsdl:service name="TestStaticPick1Service">
<wsdl:port name="TestStaticPick1Port" binding="tns:TestStaticPick1Binding">
@@ -75,7 +73,7 @@
<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="requestID"/>
+ <prop:property name="testProbeID" type="xsd:string"/>
+ <prop:propertyAlias propertyName="tns:testProbeID" messageType="tns:requestMessage" part="requestID"/>
</wsdl:definitions>
Modified: ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/deploy.xml
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/deploy.xml?rev=649153&r1=649152&r2=649153&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/deploy.xml (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/deploy.xml Thu Apr 17 08:46:04 2008
@@ -19,13 +19,17 @@
<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
xmlns:pns="http://ode/bpel/unit-test/TestStaticPick"
+ xmlns:prns="http://ode/bpel/unit-test/ProbeService.wsdl"
xmlns:wns="http://ode/bpel/unit-test/TestStaticPick.wsdl">
-
<process name="pns:TestStaticPick">
<active>true</active>
<provide partnerLink="request1">
<service name="wns:TestStaticPick1Service" port="wns:TestStaticPick1Port"/>
</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/TestStaticPick/test1.properties
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test1.properties?rev=649153&r1=649152&r2=649153&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test1.properties (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test1.properties Thu Apr 17 08:46:04 2008
@@ -19,4 +19,3 @@
service=TestStaticPick1Service
operation=request
request1=<message><requestID>TestStaticPick1</requestID><requestText>TestStaticPick Request1</requestText></message>
-response1=ASYNC
Modified: ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test3.properties
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test3.properties?rev=649153&r1=649152&r2=649153&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test3.properties (original)
+++ ode/branches/APACHE_ODE_1.1/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/test3.properties Thu Apr 17 08:46:04 2008
@@ -19,4 +19,3 @@
service=TestStaticPick1Service
operation=request
request1=<message><requestID>TestStaticPick2</requestID><requestText>TestStaticPick Request1</requestText></message>
-response1=ASYNC