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 2009/01/24 00:53:21 UTC

svn commit: r737256 [3/12] - in /ode/branches/APACHE_ODE_1.X: bpel-test/src/test/resources/ bpel-test/src/test/resources/bpel/2.0/TestAlarm/ bpel-test/src/test/resources/bpel/2.0/TestAssignComplex/ bpel-test/src/test/resources/bpel/2.0/TestAssignDate/ ...

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationJoinReceive/testCorrelation.bpel
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationJoinReceive/testCorrelation.bpel?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationJoinReceive/testCorrelation.bpel (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationJoinReceive/testCorrelation.bpel Fri Jan 23 23:53:17 2009
@@ -1,125 +1,125 @@
-<!--
-	~ Licensed to the Apache Software Foundation (ASF) under one
-	~ or more contributor license agreements.  See the NOTICE file
-	~ distributed with this work for additional information
-	~ regarding copyright ownership.  The ASF licenses this file
-	~ to you under the Apache License, Version 2.0 (the
-	~ "License"); you may not use this file except in compliance
-	~ with the License.  You may obtain a copy of the License at
-	~
-	~    http://www.apache.org/licenses/LICENSE-2.0
-	~
-	~ Unless required by applicable law or agreed to in writing,
-	~ software distributed under the License is distributed on an
-	~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-	~ KIND, either express or implied.  See the License for the
-	~ specific language governing permissions and limitations
-	~ under the License.
--->
-
-<process xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://docs.oasis-open.org/wsbpel/2.0/process/executable ../../../../../../../bpel-schemas/src/main/resources/wsbpel_executable.xsd"
- xmlns:tns="http://ode/bpel/unit-test/testCorrelation"
- xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
- xmlns:wns="http://ode/bpel/unit-test/testCorrelation.wsdl"
- xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
- name="TestCorrelationProcess"
- targetNamespace="http://ode/bpel/unit-test/testCorrelation"
- queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
- expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
- suppressJoinFailure="yes">
-	
-	<import location="testCorrelation.wsdl"
-		namespace="http://ode/bpel/unit-test/testCorrelation.wsdl"
-		importType="http://schemas.xmlsoap.org/wsdl/" />
-	<import location="../ProbeService/probeService.wsdl"
-		namespace="http://ode/bpel/unit-test/ProbeService.wsdl"
-		importType="http://schemas.xmlsoap.org/wsdl/"/>
-	
-	<!-- test correlated receive -->
-	<partnerLinks>
-		<partnerLink name="request" partnerLinkType="wns:testCorrelationRequest" myRole="testCorrelationService"/>
-		<partnerLink name="probe" partnerLinkType="wns:probeRequest" partnerRole="probeService" initializePartnerRole="yes"/>
-	</partnerLinks>
-	<variables>
-		<variable name="request" messageType="wns:requestMessage"/>
-		<variable name="probeInput" messageType="prb:probeMessage"/>
-		<variable name="reply" messageType="wns:replyMessage"/>
-	</variables>
-	<correlationSets>
-		<correlationSet name="testCorr1" properties="wns:testProbeID"/>
-		<correlationSet name="testCorr2" properties="wns:testProbeID"/>
-	</correlationSets>
-	<sequence>
-		<receive name="receive1" partnerLink="request" portType="wns:testCorrelationPT" operation="request" variable="request" createInstance="yes">
-			<correlations>
-				<correlation set="testCorr1" initiate="join"/>
-			</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">
-			<correlations>
-				<correlation set="testCorr2" initiate="join" pattern="out"/>
-			</correlations>
-		</invoke>
-		<while>
-			<condition>$request.requestMessageData/requestEnd = 'no'</condition>
-			<sequence>
-				<receive name="receive2" partnerLink="request" portType="wns:testCorrelationPT" operation="continue" variable="request">
-					<correlations>
-						<correlation set="testCorr2" initiate="join"/>
-					</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>
+<!--
+	~ Licensed to the Apache Software Foundation (ASF) under one
+	~ or more contributor license agreements.  See the NOTICE file
+	~ distributed with this work for additional information
+	~ regarding copyright ownership.  The ASF licenses this file
+	~ to you under the Apache License, Version 2.0 (the
+	~ "License"); you may not use this file except in compliance
+	~ with the License.  You may obtain a copy of the License at
+	~
+	~    http://www.apache.org/licenses/LICENSE-2.0
+	~
+	~ Unless required by applicable law or agreed to in writing,
+	~ software distributed under the License is distributed on an
+	~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+	~ KIND, either express or implied.  See the License for the
+	~ specific language governing permissions and limitations
+	~ under the License.
+-->
+
+<process xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://docs.oasis-open.org/wsbpel/2.0/process/executable ../../../../../../../bpel-schemas/src/main/resources/wsbpel_executable.xsd"
+ xmlns:tns="http://ode/bpel/unit-test/testCorrelation"
+ xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
+ xmlns:wns="http://ode/bpel/unit-test/testCorrelation.wsdl"
+ xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+ name="TestCorrelationProcess"
+ targetNamespace="http://ode/bpel/unit-test/testCorrelation"
+ queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+ expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+ suppressJoinFailure="yes">
+	
+	<import location="testCorrelation.wsdl"
+		namespace="http://ode/bpel/unit-test/testCorrelation.wsdl"
+		importType="http://schemas.xmlsoap.org/wsdl/" />
+	<import location="../ProbeService/probeService.wsdl"
+		namespace="http://ode/bpel/unit-test/ProbeService.wsdl"
+		importType="http://schemas.xmlsoap.org/wsdl/"/>
+	
+	<!-- test correlated receive -->
+	<partnerLinks>
+		<partnerLink name="request" partnerLinkType="wns:testCorrelationRequest" myRole="testCorrelationService"/>
+		<partnerLink name="probe" partnerLinkType="wns:probeRequest" partnerRole="probeService" initializePartnerRole="yes"/>
+	</partnerLinks>
+	<variables>
+		<variable name="request" messageType="wns:requestMessage"/>
+		<variable name="probeInput" messageType="prb:probeMessage"/>
+		<variable name="reply" messageType="wns:replyMessage"/>
+	</variables>
+	<correlationSets>
+		<correlationSet name="testCorr1" properties="wns:testProbeID"/>
+		<correlationSet name="testCorr2" properties="wns:testProbeID"/>
+	</correlationSets>
+	<sequence>
+		<receive name="receive1" partnerLink="request" portType="wns:testCorrelationPT" operation="request" variable="request" createInstance="yes">
+			<correlations>
+				<correlation set="testCorr1" initiate="join"/>
+			</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">
+			<correlations>
+				<correlation set="testCorr2" initiate="join" pattern="out"/>
+			</correlations>
+		</invoke>
+		<while>
+			<condition>$request.requestMessageData/requestEnd = 'no'</condition>
+			<sequence>
+				<receive name="receive2" partnerLink="request" portType="wns:testCorrelationPT" operation="continue" variable="request">
+					<correlations>
+						<correlation set="testCorr2" initiate="join"/>
+					</correlations>
+				</receive>
+				<assign>
+					<copy>
+						<from>
+							<literal><![CDATA[received message]]></literal>
+						</from>
+						<to variable="probeInput" part="probeName"/>
+					</copy>
+				</assign>
+				<invoke name="probe" partnerLink="probe" portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput" outputVariable="probeInput"> </invoke>
+			</sequence>
+		</while>
+		<assign>
+			<copy>
+				<from>
+					<literal><![CDATA[process complete]]></literal>
+				</from>
+				<to variable="probeInput" part="probeName"/>
+			</copy>
+		</assign>
+		<invoke name="probe" partnerLink="probe" portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput" outputVariable="probeInput"> </invoke>
+		<assign name="assign2">
+			<copy>
+				<from variable="probeInput" part="probeName"/>
+				<to variable="reply" part="replyID"/>
+			</copy>
+			<copy>
+				<from variable="probeInput" part="probeData"/>
+				<to variable="reply" part="replyText"/>
+			</copy>
+		</assign>
+		<reply name="reply" partnerLink="request" portType="wns:testCorrelationPT" operation="request" variable="reply"> </reply>
+	</sequence>
+</process>

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationJoinReceive/testCorrelation.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationJoinReceive/testCorrelation.wsdl?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationJoinReceive/testCorrelation.wsdl (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationJoinReceive/testCorrelation.wsdl Fri Jan 23 23:53:17 2009
@@ -1,108 +1,108 @@
-<!--
-  ~ 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.
--->
-
-<wsdl:definitions
-        targetNamespace="http://ode/bpel/unit-test/testCorrelation.wsdl"
-        xmlns:tns="http://ode/bpel/unit-test/testCorrelation.wsdl"
-        xmlns:typens="http://ode/bpel/unit-test/testCorrelation.wsdl.types"
-        xmlns="http://ode/bpel/unit-test/testCorrelation.wsdl"
-        xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
-        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-        xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
-        xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
-        xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-        xmlns:prop="http://docs.oasis-open.org/wsbpel/2.0/varprop">
-
-
-    <!-- type defs -->
-    <wsdl:types>
-        <xsd:schema
-                targetNamespace="http://ode/bpel/unit-test/testCorrelation.wsdl.types"
-                xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-            <xsd:complexType name="testMessage">
-                <xsd:sequence>
-                    <xsd:element name="requestID" type="xsd:string"/>
-                    <xsd:element name="requestText" type="xsd:string"/>
-                    <xsd:element name="requestEnd" type="xsd:string"/>
-                </xsd:sequence>
-            </xsd:complexType>
-        </xsd:schema>
-    </wsdl:types>
-
-
-    <wsdl:message name="requestMessage">
-        <wsdl:part name="requestMessageData" type="typens:testMessage"/>
-    </wsdl:message>
-
-    <wsdl:message name="replyMessage">
-        <wsdl:part name="replyID" type="xsd:string"/>
-        <wsdl:part name="replyText" type="xsd:string"/>
-    </wsdl:message>
-
-
-    <wsdl:portType name="testCorrelationPT">
-        <wsdl:operation name="request">
-            <wsdl:input message="requestMessage"/>
-            <wsdl:output message="replyMessage"/>
-        </wsdl:operation>
-        <wsdl:operation name="continue">
-            <wsdl:input message="requestMessage"/>
-        </wsdl:operation>
-    </wsdl:portType>
-
-    <wsdl:binding name="TestCorrelationBinding" type="tns:testCorrelationPT">
-        <wsdl:operation name="request">
-        </wsdl:operation>
-        <wsdl:operation name="continue">
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="TestCorrelationService">
-        <wsdl:port name="TestCorrelationPort" binding="tns:TestCorrelationBinding">
-        </wsdl:port>
-    </wsdl:service>
-
-    <plnk:partnerLinkType name="testCorrelationRequest">
-        <plnk:role name="testCorrelationService" portType="testCorrelationPT"/>
-    </plnk:partnerLinkType>
-
-    <plnk:partnerLinkType name="probeRequest">
-        <plnk:role name="probeService" portType="prb:probeMessagePT"/>
-    </plnk:partnerLinkType>
-
-    <prop:property name="testProbeID" type="xsd:string"/>
-    <prop:propertyAlias propertyName="tns:testProbeID" messageType="tns:requestMessage" part="requestMessageData">
-        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-            requestID
-        </prop:query>
-    </prop:propertyAlias>
-    <prop:propertyAlias propertyName="tns:testProbeID" messageType="prb:probeMessage" part="probeName">
-        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-            .
-        </prop:query>
-    </prop:propertyAlias>
-
-    <prop:property name="testProbeData" type="xsd:string"/>
-    <prop:propertyAlias propertyName="tns:testProbeData" messageType="tns:requestMessage" part="requestMessageData">
-        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-            requestText
-        </prop:query>
-    </prop:propertyAlias>
-
-</wsdl:definitions>
+<!--
+  ~ 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.
+-->
+
+<wsdl:definitions
+        targetNamespace="http://ode/bpel/unit-test/testCorrelation.wsdl"
+        xmlns:tns="http://ode/bpel/unit-test/testCorrelation.wsdl"
+        xmlns:typens="http://ode/bpel/unit-test/testCorrelation.wsdl.types"
+        xmlns="http://ode/bpel/unit-test/testCorrelation.wsdl"
+        xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
+        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+        xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
+        xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+        xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+        xmlns:prop="http://docs.oasis-open.org/wsbpel/2.0/varprop">
+
+
+    <!-- type defs -->
+    <wsdl:types>
+        <xsd:schema
+                targetNamespace="http://ode/bpel/unit-test/testCorrelation.wsdl.types"
+                xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+            <xsd:complexType name="testMessage">
+                <xsd:sequence>
+                    <xsd:element name="requestID" type="xsd:string"/>
+                    <xsd:element name="requestText" type="xsd:string"/>
+                    <xsd:element name="requestEnd" type="xsd:string"/>
+                </xsd:sequence>
+            </xsd:complexType>
+        </xsd:schema>
+    </wsdl:types>
+
+
+    <wsdl:message name="requestMessage">
+        <wsdl:part name="requestMessageData" type="typens:testMessage"/>
+    </wsdl:message>
+
+    <wsdl:message name="replyMessage">
+        <wsdl:part name="replyID" type="xsd:string"/>
+        <wsdl:part name="replyText" type="xsd:string"/>
+    </wsdl:message>
+
+
+    <wsdl:portType name="testCorrelationPT">
+        <wsdl:operation name="request">
+            <wsdl:input message="requestMessage"/>
+            <wsdl:output message="replyMessage"/>
+        </wsdl:operation>
+        <wsdl:operation name="continue">
+            <wsdl:input message="requestMessage"/>
+        </wsdl:operation>
+    </wsdl:portType>
+
+    <wsdl:binding name="TestCorrelationBinding" type="tns:testCorrelationPT">
+        <wsdl:operation name="request">
+        </wsdl:operation>
+        <wsdl:operation name="continue">
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:service name="TestCorrelationService">
+        <wsdl:port name="TestCorrelationPort" binding="tns:TestCorrelationBinding">
+        </wsdl:port>
+    </wsdl:service>
+
+    <plnk:partnerLinkType name="testCorrelationRequest">
+        <plnk:role name="testCorrelationService" portType="testCorrelationPT"/>
+    </plnk:partnerLinkType>
+
+    <plnk:partnerLinkType name="probeRequest">
+        <plnk:role name="probeService" portType="prb:probeMessagePT"/>
+    </plnk:partnerLinkType>
+
+    <prop:property name="testProbeID" type="xsd:string"/>
+    <prop:propertyAlias propertyName="tns:testProbeID" messageType="tns:requestMessage" part="requestMessageData">
+        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+            requestID
+        </prop:query>
+    </prop:propertyAlias>
+    <prop:propertyAlias propertyName="tns:testProbeID" messageType="prb:probeMessage" part="probeName">
+        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+            .
+        </prop:query>
+    </prop:propertyAlias>
+
+    <prop:property name="testProbeData" type="xsd:string"/>
+    <prop:propertyAlias propertyName="tns:testProbeData" messageType="tns:requestMessage" part="requestMessageData">
+        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+            requestText
+        </prop:query>
+    </prop:propertyAlias>
+
+</wsdl:definitions>

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationJoinReply/testCorrelation.bpel
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationJoinReply/testCorrelation.bpel?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationJoinReply/testCorrelation.bpel (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationJoinReply/testCorrelation.bpel Fri Jan 23 23:53:17 2009
@@ -1,122 +1,122 @@
-<!--
-	~ Licensed to the Apache Software Foundation (ASF) under one
-	~ or more contributor license agreements.  See the NOTICE file
-	~ distributed with this work for additional information
-	~ regarding copyright ownership.  The ASF licenses this file
-	~ to you under the Apache License, Version 2.0 (the
-	~ "License"); you may not use this file except in compliance
-	~ with the License.  You may obtain a copy of the License at
-	~
-	~    http://www.apache.org/licenses/LICENSE-2.0
-	~
-	~ Unless required by applicable law or agreed to in writing,
-	~ software distributed under the License is distributed on an
-	~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-	~ KIND, either express or implied.  See the License for the
-	~ specific language governing permissions and limitations
-	~ under the License.
--->
-
-<process xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://docs.oasis-open.org/wsbpel/2.0/process/executable ../../../../../../../bpel-schemas/src/main/resources/wsbpel_executable.xsd"
- xmlns:tns="http://ode/bpel/unit-test/testCorrelation"
- xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
- xmlns:wns="http://ode/bpel/unit-test/testCorrelation.wsdl"
- xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
- name="TestCorrelationProcess"
- targetNamespace="http://ode/bpel/unit-test/testCorrelation"
- queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
- expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
- suppressJoinFailure="yes">
-	
-	<import location="testCorrelation.wsdl"
-		namespace="http://ode/bpel/unit-test/testCorrelation.wsdl"
-		importType="http://schemas.xmlsoap.org/wsdl/" />
-	<import location="../ProbeService/probeService.wsdl"
-		namespace="http://ode/bpel/unit-test/ProbeService.wsdl"
-		importType="http://schemas.xmlsoap.org/wsdl/"/>
-	
-	<!-- test correlated receive -->
-	<partnerLinks>
-		<partnerLink name="request" partnerLinkType="wns:testCorrelationRequest" myRole="testCorrelationService"/>
-		<partnerLink name="probe" partnerLinkType="wns:probeRequest" partnerRole="probeService" initializePartnerRole="yes"/>
-	</partnerLinks>
-	<variables>
-		<variable name="request" messageType="wns:requestMessage"/>
-		<variable name="probeInput" messageType="prb:probeMessage"/>
-		<variable name="reply" messageType="wns:replyMessage"/>
-	</variables>
-	<correlationSets>
-		<correlationSet name="testCorr1" properties="wns:testProbeID"/>
-	</correlationSets>
-	<sequence>
-		<receive name="receive1" partnerLink="request" portType="wns:testCorrelationPT" operation="request" variable="request" createInstance="yes">
-			<correlations>
-				<correlation set="testCorr1" initiate="join"/>
-			</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" initiate="join"/>
-					</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">
-			<correlations>
-				<correlation set="testCorr1" initiate="join"/>
-			</correlations>
-		</reply>
-	</sequence>
-</process>
+<!--
+	~ Licensed to the Apache Software Foundation (ASF) under one
+	~ or more contributor license agreements.  See the NOTICE file
+	~ distributed with this work for additional information
+	~ regarding copyright ownership.  The ASF licenses this file
+	~ to you under the Apache License, Version 2.0 (the
+	~ "License"); you may not use this file except in compliance
+	~ with the License.  You may obtain a copy of the License at
+	~
+	~    http://www.apache.org/licenses/LICENSE-2.0
+	~
+	~ Unless required by applicable law or agreed to in writing,
+	~ software distributed under the License is distributed on an
+	~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+	~ KIND, either express or implied.  See the License for the
+	~ specific language governing permissions and limitations
+	~ under the License.
+-->
+
+<process xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://docs.oasis-open.org/wsbpel/2.0/process/executable ../../../../../../../bpel-schemas/src/main/resources/wsbpel_executable.xsd"
+ xmlns:tns="http://ode/bpel/unit-test/testCorrelation"
+ xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
+ xmlns:wns="http://ode/bpel/unit-test/testCorrelation.wsdl"
+ xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+ name="TestCorrelationProcess"
+ targetNamespace="http://ode/bpel/unit-test/testCorrelation"
+ queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+ expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+ suppressJoinFailure="yes">
+	
+	<import location="testCorrelation.wsdl"
+		namespace="http://ode/bpel/unit-test/testCorrelation.wsdl"
+		importType="http://schemas.xmlsoap.org/wsdl/" />
+	<import location="../ProbeService/probeService.wsdl"
+		namespace="http://ode/bpel/unit-test/ProbeService.wsdl"
+		importType="http://schemas.xmlsoap.org/wsdl/"/>
+	
+	<!-- test correlated receive -->
+	<partnerLinks>
+		<partnerLink name="request" partnerLinkType="wns:testCorrelationRequest" myRole="testCorrelationService"/>
+		<partnerLink name="probe" partnerLinkType="wns:probeRequest" partnerRole="probeService" initializePartnerRole="yes"/>
+	</partnerLinks>
+	<variables>
+		<variable name="request" messageType="wns:requestMessage"/>
+		<variable name="probeInput" messageType="prb:probeMessage"/>
+		<variable name="reply" messageType="wns:replyMessage"/>
+	</variables>
+	<correlationSets>
+		<correlationSet name="testCorr1" properties="wns:testProbeID"/>
+	</correlationSets>
+	<sequence>
+		<receive name="receive1" partnerLink="request" portType="wns:testCorrelationPT" operation="request" variable="request" createInstance="yes">
+			<correlations>
+				<correlation set="testCorr1" initiate="join"/>
+			</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" initiate="join"/>
+					</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">
+			<correlations>
+				<correlation set="testCorr1" initiate="join"/>
+			</correlations>
+		</reply>
+	</sequence>
+</process>

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationJoinReply/testCorrelation.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationJoinReply/testCorrelation.wsdl?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationJoinReply/testCorrelation.wsdl (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationJoinReply/testCorrelation.wsdl Fri Jan 23 23:53:17 2009
@@ -1,113 +1,113 @@
-<!--
-  ~ 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.
--->
-
-<wsdl:definitions
-        targetNamespace="http://ode/bpel/unit-test/testCorrelation.wsdl"
-        xmlns:tns="http://ode/bpel/unit-test/testCorrelation.wsdl"
-        xmlns:typens="http://ode/bpel/unit-test/testCorrelation.wsdl.types"
-        xmlns="http://ode/bpel/unit-test/testCorrelation.wsdl"
-        xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
-        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-        xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
-        xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
-        xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-        xmlns:prop="http://docs.oasis-open.org/wsbpel/2.0/varprop">
-
-
-    <!-- type defs -->
-    <wsdl:types>
-        <xsd:schema
-                targetNamespace="http://ode/bpel/unit-test/testCorrelation.wsdl.types"
-                xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-            <xsd:complexType name="testMessage">
-                <xsd:sequence>
-                    <xsd:element name="requestID" type="xsd:string"/>
-                    <xsd:element name="requestText" type="xsd:string"/>
-                    <xsd:element name="requestEnd" type="xsd:string"/>
-                </xsd:sequence>
-            </xsd:complexType>
-        </xsd:schema>
-    </wsdl:types>
-
-
-    <wsdl:message name="requestMessage">
-        <wsdl:part name="requestMessageData" type="typens:testMessage"/>
-    </wsdl:message>
-
-    <wsdl:message name="replyMessage">
-        <wsdl:part name="replyID" type="xsd:string"/>
-        <wsdl:part name="replyText" type="xsd:string"/>
-    </wsdl:message>
-
-
-    <wsdl:portType name="testCorrelationPT">
-        <wsdl:operation name="request">
-            <wsdl:input message="requestMessage"/>
-            <wsdl:output message="replyMessage"/>
-        </wsdl:operation>
-        <wsdl:operation name="continue">
-            <wsdl:input message="requestMessage"/>
-        </wsdl:operation>
-    </wsdl:portType>
-
-    <wsdl:binding name="TestCorrelationBinding" type="tns:testCorrelationPT">
-        <wsdl:operation name="request">
-        </wsdl:operation>
-        <wsdl:operation name="continue">
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="TestCorrelationService">
-        <wsdl:port name="TestCorrelationPort" binding="tns:TestCorrelationBinding">
-        </wsdl:port>
-    </wsdl:service>
-
-    <plnk:partnerLinkType name="testCorrelationRequest">
-        <plnk:role name="testCorrelationService" portType="testCorrelationPT"/>
-    </plnk:partnerLinkType>
-
-    <plnk:partnerLinkType name="probeRequest">
-        <plnk:role name="probeService" portType="prb:probeMessagePT"/>
-    </plnk:partnerLinkType>
-
-    <prop:property name="testProbeID" type="xsd:string"/>
-    <prop:propertyAlias propertyName="tns:testProbeID" messageType="tns:requestMessage" part="requestMessageData">
-        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-            requestID
-        </prop:query>
-    </prop:propertyAlias>
-    <prop:propertyAlias propertyName="tns:testProbeID" messageType="tns:replyMessage" part="replyID">
-        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-            .
-        </prop:query>
-    </prop:propertyAlias>
-    <prop:propertyAlias propertyName="tns:testProbeID" messageType="prb:probeMessage" part="probeName">
-        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-            .
-        </prop:query>
-    </prop:propertyAlias>
-
-    <prop:property name="testProbeData" type="xsd:string"/>
-    <prop:propertyAlias propertyName="tns:testProbeData" messageType="tns:requestMessage" part="requestMessageData">
-        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-            requestText
-        </prop:query>
-    </prop:propertyAlias>
-
-</wsdl:definitions>
+<!--
+  ~ 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.
+-->
+
+<wsdl:definitions
+        targetNamespace="http://ode/bpel/unit-test/testCorrelation.wsdl"
+        xmlns:tns="http://ode/bpel/unit-test/testCorrelation.wsdl"
+        xmlns:typens="http://ode/bpel/unit-test/testCorrelation.wsdl.types"
+        xmlns="http://ode/bpel/unit-test/testCorrelation.wsdl"
+        xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
+        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+        xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
+        xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+        xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+        xmlns:prop="http://docs.oasis-open.org/wsbpel/2.0/varprop">
+
+
+    <!-- type defs -->
+    <wsdl:types>
+        <xsd:schema
+                targetNamespace="http://ode/bpel/unit-test/testCorrelation.wsdl.types"
+                xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+            <xsd:complexType name="testMessage">
+                <xsd:sequence>
+                    <xsd:element name="requestID" type="xsd:string"/>
+                    <xsd:element name="requestText" type="xsd:string"/>
+                    <xsd:element name="requestEnd" type="xsd:string"/>
+                </xsd:sequence>
+            </xsd:complexType>
+        </xsd:schema>
+    </wsdl:types>
+
+
+    <wsdl:message name="requestMessage">
+        <wsdl:part name="requestMessageData" type="typens:testMessage"/>
+    </wsdl:message>
+
+    <wsdl:message name="replyMessage">
+        <wsdl:part name="replyID" type="xsd:string"/>
+        <wsdl:part name="replyText" type="xsd:string"/>
+    </wsdl:message>
+
+
+    <wsdl:portType name="testCorrelationPT">
+        <wsdl:operation name="request">
+            <wsdl:input message="requestMessage"/>
+            <wsdl:output message="replyMessage"/>
+        </wsdl:operation>
+        <wsdl:operation name="continue">
+            <wsdl:input message="requestMessage"/>
+        </wsdl:operation>
+    </wsdl:portType>
+
+    <wsdl:binding name="TestCorrelationBinding" type="tns:testCorrelationPT">
+        <wsdl:operation name="request">
+        </wsdl:operation>
+        <wsdl:operation name="continue">
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:service name="TestCorrelationService">
+        <wsdl:port name="TestCorrelationPort" binding="tns:TestCorrelationBinding">
+        </wsdl:port>
+    </wsdl:service>
+
+    <plnk:partnerLinkType name="testCorrelationRequest">
+        <plnk:role name="testCorrelationService" portType="testCorrelationPT"/>
+    </plnk:partnerLinkType>
+
+    <plnk:partnerLinkType name="probeRequest">
+        <plnk:role name="probeService" portType="prb:probeMessagePT"/>
+    </plnk:partnerLinkType>
+
+    <prop:property name="testProbeID" type="xsd:string"/>
+    <prop:propertyAlias propertyName="tns:testProbeID" messageType="tns:requestMessage" part="requestMessageData">
+        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+            requestID
+        </prop:query>
+    </prop:propertyAlias>
+    <prop:propertyAlias propertyName="tns:testProbeID" messageType="tns:replyMessage" part="replyID">
+        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+            .
+        </prop:query>
+    </prop:propertyAlias>
+    <prop:propertyAlias propertyName="tns:testProbeID" messageType="prb:probeMessage" part="probeName">
+        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+            .
+        </prop:query>
+    </prop:propertyAlias>
+
+    <prop:property name="testProbeData" type="xsd:string"/>
+    <prop:propertyAlias propertyName="tns:testProbeData" messageType="tns:requestMessage" part="requestMessageData">
+        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+            requestText
+        </prop:query>
+    </prop:propertyAlias>
+
+</wsdl:definitions>

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMulti/testCorrelation.bpel
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMulti/testCorrelation.bpel?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMulti/testCorrelation.bpel (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMulti/testCorrelation.bpel Fri Jan 23 23:53:17 2009
@@ -1,87 +1,87 @@
-<!--
-	~ Licensed to the Apache Software Foundation (ASF) under one
-	~ or more contributor license agreements.  See the NOTICE file
-	~ distributed with this work for additional information
-	~ regarding copyright ownership.  The ASF licenses this file
-	~ to you under the Apache License, Version 2.0 (the
-	~ "License"); you may not use this file except in compliance
-	~ with the License.  You may obtain a copy of the License at
-	~
-	~    http://www.apache.org/licenses/LICENSE-2.0
-	~
-	~ Unless required by applicable law or agreed to in writing,
-	~ software distributed under the License is distributed on an
-	~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-	~ KIND, either express or implied.  See the License for the
-	~ specific language governing permissions and limitations
-	~ under the License.
--->
-
-<process xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://docs.oasis-open.org/wsbpel/2.0/process/executable ../../../../../../../bpel-schemas/src/main/resources/wsbpel_executable.xsd"
- xmlns:tns="http://ode/bpel/unit-test/testCorrelation"
- xmlns:wns="http://ode/bpel/unit-test/testCorrelation.wsdl"
- xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
- name="TestCorrelationProcess"
- targetNamespace="http://ode/bpel/unit-test/testCorrelation"
- queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
- expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
- suppressJoinFailure="yes">
-	
-	<import location="testCorrelation.wsdl"
-		namespace="http://ode/bpel/unit-test/testCorrelation.wsdl"
-		importType="http://schemas.xmlsoap.org/wsdl/" />
-	
-	<!-- test correlated receive -->
-	<partnerLinks>
-		<partnerLink name="request" partnerLinkType="wns:testCorrelationRequest" myRole="testCorrelationService"/>
-	</partnerLinks>
-	<variables>
-		<variable name="request" messageType="wns:requestMessage"/>
-		<variable name="reply" messageType="wns:replyMessage"/>
-	</variables>
-	<correlationSets>
-		<correlationSet name="testCorr1" properties="wns:testCorrelationID1"/>
-		<correlationSet name="testCorr2" properties="wns:testCorrelationID2"/>
-		<correlationSet name="testCorr3" properties="wns:testCorrelationID3"/>
-	</correlationSets>
-	<sequence>
-		<receive name="receive1" partnerLink="request" portType="wns:testCorrelationPT" operation="request" variable="request" createInstance="yes">
-			<correlations>
-				<correlation set="testCorr1" initiate="yes"/>
-				<correlation set="testCorr2" initiate="yes"/>
-			</correlations>
-		</receive>
-		<!-- Copy input variables to internal accumulators -->
-		<assign name="assign1">
-			<copy>
-				<from variable="request" property="wns:testCorrelationID1"/>
-				<to variable="reply" part="replyID"/>
-			</copy>
-			<copy>
-				<from>
-					$request.requestMessageData/requestText
-				</from>
-				<to variable="reply" part="replyText"/>
-			</copy>
-		</assign>
-
-		<receive name="receive2" partnerLink="request" portType="wns:testCorrelationPT" operation="continue" variable="request">
-			<correlations>
-				<correlation set="testCorr1" initiate="no"/>
-				<correlation set="testCorr2" initiate="no"/>
-				<correlation set="testCorr3" initiate="yes"/>
-			</correlations>
-		</receive>
-		<assign>
-			<copy>
-				<from>
-					concat($reply.replyText, $request.requestMessageData/requestText)
-				</from>
-				<to variable="reply" part="replyText"/>
-			</copy>
-		</assign>
-
-		<reply name="reply" partnerLink="request" portType="wns:testCorrelationPT" operation="request" variable="reply"> </reply>
-	</sequence>
-</process>
+<!--
+	~ Licensed to the Apache Software Foundation (ASF) under one
+	~ or more contributor license agreements.  See the NOTICE file
+	~ distributed with this work for additional information
+	~ regarding copyright ownership.  The ASF licenses this file
+	~ to you under the Apache License, Version 2.0 (the
+	~ "License"); you may not use this file except in compliance
+	~ with the License.  You may obtain a copy of the License at
+	~
+	~    http://www.apache.org/licenses/LICENSE-2.0
+	~
+	~ Unless required by applicable law or agreed to in writing,
+	~ software distributed under the License is distributed on an
+	~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+	~ KIND, either express or implied.  See the License for the
+	~ specific language governing permissions and limitations
+	~ under the License.
+-->
+
+<process xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://docs.oasis-open.org/wsbpel/2.0/process/executable ../../../../../../../bpel-schemas/src/main/resources/wsbpel_executable.xsd"
+ xmlns:tns="http://ode/bpel/unit-test/testCorrelation"
+ xmlns:wns="http://ode/bpel/unit-test/testCorrelation.wsdl"
+ xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+ name="TestCorrelationProcess"
+ targetNamespace="http://ode/bpel/unit-test/testCorrelation"
+ queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+ expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+ suppressJoinFailure="yes">
+	
+	<import location="testCorrelation.wsdl"
+		namespace="http://ode/bpel/unit-test/testCorrelation.wsdl"
+		importType="http://schemas.xmlsoap.org/wsdl/" />
+	
+	<!-- test correlated receive -->
+	<partnerLinks>
+		<partnerLink name="request" partnerLinkType="wns:testCorrelationRequest" myRole="testCorrelationService"/>
+	</partnerLinks>
+	<variables>
+		<variable name="request" messageType="wns:requestMessage"/>
+		<variable name="reply" messageType="wns:replyMessage"/>
+	</variables>
+	<correlationSets>
+		<correlationSet name="testCorr1" properties="wns:testCorrelationID1"/>
+		<correlationSet name="testCorr2" properties="wns:testCorrelationID2"/>
+		<correlationSet name="testCorr3" properties="wns:testCorrelationID3"/>
+	</correlationSets>
+	<sequence>
+		<receive name="receive1" partnerLink="request" portType="wns:testCorrelationPT" operation="request" variable="request" createInstance="yes">
+			<correlations>
+				<correlation set="testCorr1" initiate="yes"/>
+				<correlation set="testCorr2" initiate="yes"/>
+			</correlations>
+		</receive>
+		<!-- Copy input variables to internal accumulators -->
+		<assign name="assign1">
+			<copy>
+				<from variable="request" property="wns:testCorrelationID1"/>
+				<to variable="reply" part="replyID"/>
+			</copy>
+			<copy>
+				<from>
+					$request.requestMessageData/requestText
+				</from>
+				<to variable="reply" part="replyText"/>
+			</copy>
+		</assign>
+
+		<receive name="receive2" partnerLink="request" portType="wns:testCorrelationPT" operation="continue" variable="request">
+			<correlations>
+				<correlation set="testCorr1" initiate="no"/>
+				<correlation set="testCorr2" initiate="no"/>
+				<correlation set="testCorr3" initiate="yes"/>
+			</correlations>
+		</receive>
+		<assign>
+			<copy>
+				<from>
+					concat($reply.replyText, $request.requestMessageData/requestText)
+				</from>
+				<to variable="reply" part="replyText"/>
+			</copy>
+		</assign>
+
+		<reply name="reply" partnerLink="request" portType="wns:testCorrelationPT" operation="request" variable="reply"> </reply>
+	</sequence>
+</process>

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMulti/testCorrelation.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMulti/testCorrelation.wsdl?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMulti/testCorrelation.wsdl (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMulti/testCorrelation.wsdl Fri Jan 23 23:53:17 2009
@@ -1,106 +1,106 @@
-<!--
-  ~ 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.
--->
-
-<wsdl:definitions
-        targetNamespace="http://ode/bpel/unit-test/testCorrelation.wsdl"
-        xmlns:tns="http://ode/bpel/unit-test/testCorrelation.wsdl"
-        xmlns:typens="http://ode/bpel/unit-test/testCorrelation.wsdl.types"
-        xmlns="http://ode/bpel/unit-test/testCorrelation.wsdl"
-        xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
-        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-        xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
-        xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-        xmlns:prop="http://docs.oasis-open.org/wsbpel/2.0/varprop">
-
-
-    <!-- type defs -->
-    <wsdl:types>
-        <xsd:schema
-                targetNamespace="http://ode/bpel/unit-test/testCorrelation.wsdl.types"
-                xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-            <xsd:complexType name="testMessage">
-                <xsd:sequence>
-                    <xsd:element name="correlationID1" type="xsd:string"/>
-                    <xsd:element name="correlationID2" type="xsd:string"/>
-                    <xsd:element name="correlationID3" type="xsd:string"/>
-                    <xsd:element name="requestText" type="xsd:string"/>
-                    <xsd:element name="requestEnd" type="xsd:string"/>
-                </xsd:sequence>
-            </xsd:complexType>
-        </xsd:schema>
-    </wsdl:types>
-
-
-    <wsdl:message name="requestMessage">
-        <wsdl:part name="requestMessageData" type="typens:testMessage"/>
-    </wsdl:message>
-
-    <wsdl:message name="replyMessage">
-        <wsdl:part name="replyID" type="xsd:string"/>
-        <wsdl:part name="replyText" type="xsd:string"/>
-    </wsdl:message>
-
-
-    <wsdl:portType name="testCorrelationPT">
-        <wsdl:operation name="request">
-            <wsdl:input message="requestMessage"/>
-            <wsdl:output message="replyMessage"/>
-        </wsdl:operation>
-        <wsdl:operation name="continue">
-            <wsdl:input message="requestMessage"/>
-        </wsdl:operation>
-    </wsdl:portType>
-
-    <wsdl:binding name="TestCorrelationBinding" type="tns:testCorrelationPT">
-        <wsdl:operation name="request">
-        </wsdl:operation>
-        <wsdl:operation name="continue">
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="TestCorrelationService">
-        <wsdl:port name="TestCorrelationPort" binding="tns:TestCorrelationBinding">
-        </wsdl:port>
-    </wsdl:service>
-
-    <plnk:partnerLinkType name="testCorrelationRequest">
-        <plnk:role name="testCorrelationService" portType="testCorrelationPT"/>
-    </plnk:partnerLinkType>
-
-    <prop:property name="testCorrelationID1" type="xsd:string"/>
-    <prop:propertyAlias propertyName="tns:testCorrelationID1" messageType="tns:requestMessage" part="requestMessageData">
-        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-            correlationID1
-        </prop:query>
-    </prop:propertyAlias>
-
-    <prop:property name="testCorrelationID2" type="xsd:string"/>
-    <prop:propertyAlias propertyName="tns:testCorrelationID2" messageType="tns:requestMessage" part="requestMessageData">
-        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-            correlationID2
-        </prop:query>
-    </prop:propertyAlias>
-
-    <prop:property name="testCorrelationID3" type="xsd:string"/>
-    <prop:propertyAlias propertyName="tns:testCorrelationID3" messageType="tns:requestMessage" part="requestMessageData">
-        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-            correlationID3
-        </prop:query>
-    </prop:propertyAlias>
+<!--
+  ~ 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.
+-->
+
+<wsdl:definitions
+        targetNamespace="http://ode/bpel/unit-test/testCorrelation.wsdl"
+        xmlns:tns="http://ode/bpel/unit-test/testCorrelation.wsdl"
+        xmlns:typens="http://ode/bpel/unit-test/testCorrelation.wsdl.types"
+        xmlns="http://ode/bpel/unit-test/testCorrelation.wsdl"
+        xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
+        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+        xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+        xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+        xmlns:prop="http://docs.oasis-open.org/wsbpel/2.0/varprop">
+
+
+    <!-- type defs -->
+    <wsdl:types>
+        <xsd:schema
+                targetNamespace="http://ode/bpel/unit-test/testCorrelation.wsdl.types"
+                xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+            <xsd:complexType name="testMessage">
+                <xsd:sequence>
+                    <xsd:element name="correlationID1" type="xsd:string"/>
+                    <xsd:element name="correlationID2" type="xsd:string"/>
+                    <xsd:element name="correlationID3" type="xsd:string"/>
+                    <xsd:element name="requestText" type="xsd:string"/>
+                    <xsd:element name="requestEnd" type="xsd:string"/>
+                </xsd:sequence>
+            </xsd:complexType>
+        </xsd:schema>
+    </wsdl:types>
+
+
+    <wsdl:message name="requestMessage">
+        <wsdl:part name="requestMessageData" type="typens:testMessage"/>
+    </wsdl:message>
+
+    <wsdl:message name="replyMessage">
+        <wsdl:part name="replyID" type="xsd:string"/>
+        <wsdl:part name="replyText" type="xsd:string"/>
+    </wsdl:message>
+
+
+    <wsdl:portType name="testCorrelationPT">
+        <wsdl:operation name="request">
+            <wsdl:input message="requestMessage"/>
+            <wsdl:output message="replyMessage"/>
+        </wsdl:operation>
+        <wsdl:operation name="continue">
+            <wsdl:input message="requestMessage"/>
+        </wsdl:operation>
+    </wsdl:portType>
+
+    <wsdl:binding name="TestCorrelationBinding" type="tns:testCorrelationPT">
+        <wsdl:operation name="request">
+        </wsdl:operation>
+        <wsdl:operation name="continue">
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:service name="TestCorrelationService">
+        <wsdl:port name="TestCorrelationPort" binding="tns:TestCorrelationBinding">
+        </wsdl:port>
+    </wsdl:service>
+
+    <plnk:partnerLinkType name="testCorrelationRequest">
+        <plnk:role name="testCorrelationService" portType="testCorrelationPT"/>
+    </plnk:partnerLinkType>
+
+    <prop:property name="testCorrelationID1" type="xsd:string"/>
+    <prop:propertyAlias propertyName="tns:testCorrelationID1" messageType="tns:requestMessage" part="requestMessageData">
+        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+            correlationID1
+        </prop:query>
+    </prop:propertyAlias>
+
+    <prop:property name="testCorrelationID2" type="xsd:string"/>
+    <prop:propertyAlias propertyName="tns:testCorrelationID2" messageType="tns:requestMessage" part="requestMessageData">
+        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+            correlationID2
+        </prop:query>
+    </prop:propertyAlias>
+
+    <prop:property name="testCorrelationID3" type="xsd:string"/>
+    <prop:propertyAlias propertyName="tns:testCorrelationID3" messageType="tns:requestMessage" part="requestMessageData">
+        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+            correlationID3
+        </prop:query>
+    </prop:propertyAlias>
 </wsdl:definitions>
\ No newline at end of file

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMultiComplex/testCorrelation.bpel
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMultiComplex/testCorrelation.bpel?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMultiComplex/testCorrelation.bpel (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMultiComplex/testCorrelation.bpel Fri Jan 23 23:53:17 2009
@@ -1,179 +1,179 @@
-<!--
-	~ Licensed to the Apache Software Foundation (ASF) under one
-	~ or more contributor license agreements.  See the NOTICE file
-	~ distributed with this work for additional information
-	~ regarding copyright ownership.  The ASF licenses this file
-	~ to you under the Apache License, Version 2.0 (the
-	~ "License"); you may not use this file except in compliance
-	~ with the License.  You may obtain a copy of the License at
-	~
-	~    http://www.apache.org/licenses/LICENSE-2.0
-	~
-	~ Unless required by applicable law or agreed to in writing,
-	~ software distributed under the License is distributed on an
-	~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-	~ KIND, either express or implied.  See the License for the
-	~ specific language governing permissions and limitations
-	~ under the License.
--->
-
-<process xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://docs.oasis-open.org/wsbpel/2.0/process/executable ../../../../../../../bpel-schemas/src/main/resources/wsbpel_executable.xsd"
- xmlns:tns="http://ode/bpel/unit-test/testCorrelation"
- xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
- xmlns:wns="http://ode/bpel/unit-test/testCorrelation.wsdl"
- xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
- name="TestCorrelationProcess"
- targetNamespace="http://ode/bpel/unit-test/testCorrelation"
- queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
- expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
- suppressJoinFailure="yes">
-	
-	<import location="../ProbeService/probeService.wsdl"
-		namespace="http://ode/bpel/unit-test/ProbeService.wsdl"
-		importType="http://schemas.xmlsoap.org/wsdl/"/>
-	<import location="testCorrelation.wsdl"
-		namespace="http://ode/bpel/unit-test/testCorrelation.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:testCorrelationID1"/>
-		<correlationSet name="testCorr2" properties="wns:testCorrelationID2"/>
-		<correlationSet name="testCorr3" properties="wns:testCorrelationID3"/>
-		<correlationSet name="testCorr4" properties="wns:testCorrelationID4"/>
-		<correlationSet name="testCorr5" properties="wns:testCorrelationID5"/>
-	</correlationSets>
-	<sequence>
-		<receive name="receive1" partnerLink="request" portType="wns:testCorrelationPT" operation="request" variable="request" createInstance="yes">
-			<correlations>
-				<correlation set="testCorr1" initiate="yes"/>
-				<correlation set="testCorr2" initiate="yes"/>
-			</correlations>
-		</receive>
-		<!-- Copy input variables to internal accumulators -->
-		<assign name="assign1">
-			<copy>
-				<from variable="request" property="wns:testCorrelationID1"/>
-				<to variable="reply" part="replyID"/>
-			</copy>
-			<copy>
-				<from>
-					$request.requestMessageData/requestText
-				</from>
-				<to variable="reply" part="replyText"/>
-			</copy>
-		</assign>
-
-		<scope name="subprocess">
-	      	<eventHandlers>
-	        	<onEvent partnerLink="request" portType="wns:testCorrelationPT" operation="receive2" variable="request" messageType="wns:requestMessage">
-            		<correlations>
-						<correlation set="testCorr1" initiate="no"/>
-						<correlation set="testCorr2" initiate="yes"/>
-            		</correlations>
-	          		<scope name="receive3">
-	            		<sequence>
-							<assign>
-								<copy>
-									<from>
-										concat($reply.replyText, $request.requestMessageData/requestText)
-									</from>
-									<to variable="reply" part="replyText"/>
-								</copy>
-							</assign>
-	            		</sequence>
-	          		</scope>
-	        	</onEvent>
-	      	</eventHandlers>
-	      	<sequence>
-	        	<pick>
-	          		<onMessage partnerLink="request" portType="wns:testCorrelationPT" operation="receive_never" variable="request">
-	            		<correlations>
-							<correlation set="testCorr1" initiate="no"/>
-							<correlation set="testCorr2" initiate="no"/>
-							<correlation set="testCorr3" initiate="yes"/>
-		            	</correlations>
-		            	<sequence>
-		              		<empty name="donothing"/>
-		            	</sequence>
-	          		</onMessage>
-	          		<onMessage partnerLink="request" portType="wns:testCorrelationPT" operation="receive3" variable="request">
-	            		<correlations>
-							<correlation set="testCorr1" initiate="no"/>
-							<correlation set="testCorr2" initiate="no"/>
-							<correlation set="testCorr3" initiate="yes"/>
-	            		</correlations>
-	            		<sequence>
-							<assign>
-								<copy>
-									<from>
-										concat($reply.replyText, $request.requestMessageData/requestText)
-									</from>
-									<to variable="reply" part="replyText"/>
-								</copy>
-							</assign>
-	            		</sequence>
-	          		</onMessage>
-	        	</pick>
-				<receive name="receive4" partnerLink="request" portType="wns:testCorrelationPT" operation="receive4" variable="request" createInstance="yes">
-					<correlations>
-						<correlation set="testCorr1" initiate="join"/>
-						<correlation set="testCorr2" initiate="join"/>
-						<correlation set="testCorr3" initiate="join"/>
-					</correlations>
-				</receive>
-				<!-- Copy input variables to internal accumulators -->
-				<assign name="assign4">
-					<copy>
-						<from>
-							concat($reply.replyText, $request.requestMessageData/requestText)
-						</from>
-						<to variable="reply" part="replyText"/>
-					</copy>
-				</assign>
-				
-				<assign name="assign5">
-					<copy>
-						<from>$request.requestMessageData/correlationID1</from>
-						<to variable="probeInput" part="probeName"/>
-					</copy>
-					<copy>
-						<from>$request.requestMessageData/requestText</from>
-						<to variable="probeInput" part="probeData"/>
-					</copy>
-				</assign>
-				<invoke name="probe" partnerLink="probe" portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput" outputVariable="probeInput"> 
-					<correlations>
-						<correlation set="testCorr1" initiate="join"/>
-						<correlation set="testCorr2" initiate="join"/>
-						<correlation set="testCorr4" initiate="join"/>
-						<correlation set="testCorr5" initiate="join"/>
-					</correlations>
-				</invoke>
-				<assign name="assign6">
-					<copy>
-						<from>concat($reply.replyText, $probeInput.probeData)</from>
-						<to variable="reply" part="replyText"/>
-					</copy>
-				</assign>
-				
-				<reply name="reply" partnerLink="request" portType="wns:testCorrelationPT" operation="request" variable="reply">
-					<correlations>
-						<correlation set="testCorr4" initiate="join"/>
-						<correlation set="testCorr5" initiate="join"/>
-					</correlations>
-				</reply>
-	        </sequence>
-    	</scope>
-	</sequence>
-</process>
+<!--
+	~ Licensed to the Apache Software Foundation (ASF) under one
+	~ or more contributor license agreements.  See the NOTICE file
+	~ distributed with this work for additional information
+	~ regarding copyright ownership.  The ASF licenses this file
+	~ to you under the Apache License, Version 2.0 (the
+	~ "License"); you may not use this file except in compliance
+	~ with the License.  You may obtain a copy of the License at
+	~
+	~    http://www.apache.org/licenses/LICENSE-2.0
+	~
+	~ Unless required by applicable law or agreed to in writing,
+	~ software distributed under the License is distributed on an
+	~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+	~ KIND, either express or implied.  See the License for the
+	~ specific language governing permissions and limitations
+	~ under the License.
+-->
+
+<process xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://docs.oasis-open.org/wsbpel/2.0/process/executable ../../../../../../../bpel-schemas/src/main/resources/wsbpel_executable.xsd"
+ xmlns:tns="http://ode/bpel/unit-test/testCorrelation"
+ xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
+ xmlns:wns="http://ode/bpel/unit-test/testCorrelation.wsdl"
+ xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+ name="TestCorrelationProcess"
+ targetNamespace="http://ode/bpel/unit-test/testCorrelation"
+ queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+ expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+ suppressJoinFailure="yes">
+	
+	<import location="../ProbeService/probeService.wsdl"
+		namespace="http://ode/bpel/unit-test/ProbeService.wsdl"
+		importType="http://schemas.xmlsoap.org/wsdl/"/>
+	<import location="testCorrelation.wsdl"
+		namespace="http://ode/bpel/unit-test/testCorrelation.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:testCorrelationID1"/>
+		<correlationSet name="testCorr2" properties="wns:testCorrelationID2"/>
+		<correlationSet name="testCorr3" properties="wns:testCorrelationID3"/>
+		<correlationSet name="testCorr4" properties="wns:testCorrelationID4"/>
+		<correlationSet name="testCorr5" properties="wns:testCorrelationID5"/>
+	</correlationSets>
+	<sequence>
+		<receive name="receive1" partnerLink="request" portType="wns:testCorrelationPT" operation="request" variable="request" createInstance="yes">
+			<correlations>
+				<correlation set="testCorr1" initiate="yes"/>
+				<correlation set="testCorr2" initiate="yes"/>
+			</correlations>
+		</receive>
+		<!-- Copy input variables to internal accumulators -->
+		<assign name="assign1">
+			<copy>
+				<from variable="request" property="wns:testCorrelationID1"/>
+				<to variable="reply" part="replyID"/>
+			</copy>
+			<copy>
+				<from>
+					$request.requestMessageData/requestText
+				</from>
+				<to variable="reply" part="replyText"/>
+			</copy>
+		</assign>
+
+		<scope name="subprocess">
+	      	<eventHandlers>
+	        	<onEvent partnerLink="request" portType="wns:testCorrelationPT" operation="receive2" variable="request" messageType="wns:requestMessage">
+            		<correlations>
+						<correlation set="testCorr1" initiate="no"/>
+						<correlation set="testCorr2" initiate="yes"/>
+            		</correlations>
+	          		<scope name="receive3">
+	            		<sequence>
+							<assign>
+								<copy>
+									<from>
+										concat($reply.replyText, $request.requestMessageData/requestText)
+									</from>
+									<to variable="reply" part="replyText"/>
+								</copy>
+							</assign>
+	            		</sequence>
+	          		</scope>
+	        	</onEvent>
+	      	</eventHandlers>
+	      	<sequence>
+	        	<pick>
+	          		<onMessage partnerLink="request" portType="wns:testCorrelationPT" operation="receive_never" variable="request">
+	            		<correlations>
+							<correlation set="testCorr1" initiate="no"/>
+							<correlation set="testCorr2" initiate="no"/>
+							<correlation set="testCorr3" initiate="yes"/>
+		            	</correlations>
+		            	<sequence>
+		              		<empty name="donothing"/>
+		            	</sequence>
+	          		</onMessage>
+	          		<onMessage partnerLink="request" portType="wns:testCorrelationPT" operation="receive3" variable="request">
+	            		<correlations>
+							<correlation set="testCorr1" initiate="no"/>
+							<correlation set="testCorr2" initiate="no"/>
+							<correlation set="testCorr3" initiate="yes"/>
+	            		</correlations>
+	            		<sequence>
+							<assign>
+								<copy>
+									<from>
+										concat($reply.replyText, $request.requestMessageData/requestText)
+									</from>
+									<to variable="reply" part="replyText"/>
+								</copy>
+							</assign>
+	            		</sequence>
+	          		</onMessage>
+	        	</pick>
+				<receive name="receive4" partnerLink="request" portType="wns:testCorrelationPT" operation="receive4" variable="request" createInstance="yes">
+					<correlations>
+						<correlation set="testCorr1" initiate="join"/>
+						<correlation set="testCorr2" initiate="join"/>
+						<correlation set="testCorr3" initiate="join"/>
+					</correlations>
+				</receive>
+				<!-- Copy input variables to internal accumulators -->
+				<assign name="assign4">
+					<copy>
+						<from>
+							concat($reply.replyText, $request.requestMessageData/requestText)
+						</from>
+						<to variable="reply" part="replyText"/>
+					</copy>
+				</assign>
+				
+				<assign name="assign5">
+					<copy>
+						<from>$request.requestMessageData/correlationID1</from>
+						<to variable="probeInput" part="probeName"/>
+					</copy>
+					<copy>
+						<from>$request.requestMessageData/requestText</from>
+						<to variable="probeInput" part="probeData"/>
+					</copy>
+				</assign>
+				<invoke name="probe" partnerLink="probe" portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput" outputVariable="probeInput"> 
+					<correlations>
+						<correlation set="testCorr1" initiate="join"/>
+						<correlation set="testCorr2" initiate="join"/>
+						<correlation set="testCorr4" initiate="join"/>
+						<correlation set="testCorr5" initiate="join"/>
+					</correlations>
+				</invoke>
+				<assign name="assign6">
+					<copy>
+						<from>concat($reply.replyText, $probeInput.probeData)</from>
+						<to variable="reply" part="replyText"/>
+					</copy>
+				</assign>
+				
+				<reply name="reply" partnerLink="request" portType="wns:testCorrelationPT" operation="request" variable="reply">
+					<correlations>
+						<correlation set="testCorr4" initiate="join"/>
+						<correlation set="testCorr5" initiate="join"/>
+					</correlations>
+				</reply>
+	        </sequence>
+    	</scope>
+	</sequence>
+</process>