svn commit: r737256 [2/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/ ...

[mr...@apache.org]

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCompensationHandlers/testCompensationHandlers.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCompensationHandlers/testCompensationHandlers.wsdl?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCompensationHandlers/testCompensationHandlers.wsdl (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCompensationHandlers/testCompensationHandlers.wsdl Fri Jan 23 23:53:17 2009
@@ -1,67 +1,67 @@
-<!--
-   ~ 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/testCompensationHandlers.wsdl"
-   xmlns="http://ode/bpel/unit-test/testCompensationHandlers.wsdl"
-   xmlns:tns="http://ode/bpel/unit-test/testCompensationHandlers.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:wsdl="http://schemas.xmlsoap.org/wsdl/">
-
-   <wsdl:message name="requestMessage">
-      <wsdl:part name="requestID" type="xsd:string"/>
-      <wsdl:part name="requestText" type="xsd:string"/>
-      <wsdl:part name="faultIndicator1" type="xsd:string"/>
-      <wsdl:part name="faultIndicator2" type="xsd:string"/>
-   </wsdl:message>
-   
-   <wsdl:message name="replyMessage">
-      <wsdl:part name="replyID" type="xsd:string"/>
-      <wsdl:part name="replyText" type="xsd:string"/>
-   </wsdl:message>
-
-   <!-- portType supported by the test2 process -->
-
-   <wsdl:portType name="testCompensationHandlersPT">
-      <wsdl:operation name="request">
-         <wsdl:input message="requestMessage"/>
-         <wsdl:output message="replyMessage"/>
-         </wsdl:operation>
-   </wsdl:portType>
-   
-   <wsdl:binding name="testCompensationHandlersBinding" type="tns:testCompensationHandlersPT">
-      <wsdl:operation name="request">
-      </wsdl:operation>
-   </wsdl:binding>
-   <wsdl:service name="testCompensationHandlersService">
-      <wsdl:port name="testCompensationHandlersPort" binding="tns:testCompensationHandlersBinding">
-      </wsdl:port>
-   </wsdl:service>
-
-   <plnk:partnerLinkType name="testCompensationHandlersRequest">
-      <plnk:role name="testCompensationHandlersService" portType="testCompensationHandlersPT"/>
-   </plnk:partnerLinkType>
-
-   <plnk:partnerLinkType name="probeRequest">
-      <plnk:role name="probeService" portType="prb:probeMessagePT"/>
-   </plnk:partnerLinkType>
-
-</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/testCompensationHandlers.wsdl"
+   xmlns="http://ode/bpel/unit-test/testCompensationHandlers.wsdl"
+   xmlns:tns="http://ode/bpel/unit-test/testCompensationHandlers.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:wsdl="http://schemas.xmlsoap.org/wsdl/">
+
+   <wsdl:message name="requestMessage">
+      <wsdl:part name="requestID" type="xsd:string"/>
+      <wsdl:part name="requestText" type="xsd:string"/>
+      <wsdl:part name="faultIndicator1" type="xsd:string"/>
+      <wsdl:part name="faultIndicator2" type="xsd:string"/>
+   </wsdl:message>
+   
+   <wsdl:message name="replyMessage">
+      <wsdl:part name="replyID" type="xsd:string"/>
+      <wsdl:part name="replyText" type="xsd:string"/>
+   </wsdl:message>
+
+   <!-- portType supported by the test2 process -->
+
+   <wsdl:portType name="testCompensationHandlersPT">
+      <wsdl:operation name="request">
+         <wsdl:input message="requestMessage"/>
+         <wsdl:output message="replyMessage"/>
+         </wsdl:operation>
+   </wsdl:portType>
+   
+   <wsdl:binding name="testCompensationHandlersBinding" type="tns:testCompensationHandlersPT">
+      <wsdl:operation name="request">
+      </wsdl:operation>
+   </wsdl:binding>
+   <wsdl:service name="testCompensationHandlersService">
+      <wsdl:port name="testCompensationHandlersPort" binding="tns:testCompensationHandlersBinding">
+      </wsdl:port>
+   </wsdl:service>
+
+   <plnk:partnerLinkType name="testCompensationHandlersRequest">
+      <plnk:role name="testCompensationHandlersService" portType="testCompensationHandlersPT"/>
+   </plnk:partnerLinkType>
+
+   <plnk:partnerLinkType name="probeRequest">
+      <plnk:role name="probeService" portType="prb:probeMessagePT"/>
+   </plnk:partnerLinkType>
+
+</wsdl:definitions>

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/testCorrelation.bpel
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/testCorrelation.bpel?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/testCorrelation.bpel (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/testCorrelation.bpel Fri Jan 23 23:53:17 2009
@@ -1,118 +1,118 @@
-<!--
-	~ 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="yes"/>
-			</correlations>
-		</receive>
-		<!-- Copy input variables to internal accumulators -->
-		<assign name="assign1">
-			<copy>
-				<from variable="request" property="wns:testProbeID"/>
-				<to variable="probeInput" part="probeName"/>
-			</copy>
-			<copy>
-				<from variable="request" property="wns:testProbeData"/>
-				<to variable="probeInput" part="probeData"/>
-			</copy>
-		</assign>
-		<assign>
-			<copy>
-				<from>
-					<literal><![CDATA[loop on receive until message includes requestEnd = yes]]></literal>
-				</from>
-				<to variable="probeInput" part="probeName"/>
-			</copy>
-		</assign>
-		<invoke name="probe" partnerLink="probe" portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput" outputVariable="probeInput"> </invoke>
-		<while>
-			<condition>$request.requestMessageData/requestEnd = 'no'</condition>
-			<sequence>
-				<receive name="receive2" partnerLink="request" portType="wns:testCorrelationPT" operation="continue" variable="request">
-					<correlations>
-						<correlation set="testCorr1"/>
-					</correlations>
-				</receive>
-				<assign>
-					<copy>
-						<from>
-							<literal><![CDATA[received message]]></literal>
-						</from>
-						<to variable="probeInput" part="probeName"/>
-					</copy>
-				</assign>
-				<invoke name="probe" partnerLink="probe" portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput" outputVariable="probeInput"> </invoke>
-			</sequence>
-		</while>
-		<assign>
-			<copy>
-				<from>
-					<literal><![CDATA[process complete]]></literal>
-				</from>
-				<to variable="probeInput" part="probeName"/>
-			</copy>
-		</assign>
-		<invoke name="probe" partnerLink="probe" portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput" outputVariable="probeInput"> </invoke>
-		<assign name="assign2">
-			<copy>
-				<from variable="probeInput" part="probeName"/>
-				<to variable="reply" part="replyID"/>
-			</copy>
-			<copy>
-				<from variable="probeInput" part="probeData"/>
-				<to variable="reply" part="replyText"/>
-			</copy>
-		</assign>
-		<reply name="reply" partnerLink="request" portType="wns:testCorrelationPT" operation="request" variable="reply"> </reply>
-	</sequence>
-</process>
+<!--
+	~ 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="yes"/>
+			</correlations>
+		</receive>
+		<!-- Copy input variables to internal accumulators -->
+		<assign name="assign1">
+			<copy>
+				<from variable="request" property="wns:testProbeID"/>
+				<to variable="probeInput" part="probeName"/>
+			</copy>
+			<copy>
+				<from variable="request" property="wns:testProbeData"/>
+				<to variable="probeInput" part="probeData"/>
+			</copy>
+		</assign>
+		<assign>
+			<copy>
+				<from>
+					<literal><![CDATA[loop on receive until message includes requestEnd = yes]]></literal>
+				</from>
+				<to variable="probeInput" part="probeName"/>
+			</copy>
+		</assign>
+		<invoke name="probe" partnerLink="probe" portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput" outputVariable="probeInput"> </invoke>
+		<while>
+			<condition>$request.requestMessageData/requestEnd = 'no'</condition>
+			<sequence>
+				<receive name="receive2" partnerLink="request" portType="wns:testCorrelationPT" operation="continue" variable="request">
+					<correlations>
+						<correlation set="testCorr1"/>
+					</correlations>
+				</receive>
+				<assign>
+					<copy>
+						<from>
+							<literal><![CDATA[received message]]></literal>
+						</from>
+						<to variable="probeInput" part="probeName"/>
+					</copy>
+				</assign>
+				<invoke name="probe" partnerLink="probe" portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput" outputVariable="probeInput"> </invoke>
+			</sequence>
+		</while>
+		<assign>
+			<copy>
+				<from>
+					<literal><![CDATA[process complete]]></literal>
+				</from>
+				<to variable="probeInput" part="probeName"/>
+			</copy>
+		</assign>
+		<invoke name="probe" partnerLink="probe" portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput" outputVariable="probeInput"> </invoke>
+		<assign name="assign2">
+			<copy>
+				<from variable="probeInput" part="probeName"/>
+				<to variable="reply" part="replyID"/>
+			</copy>
+			<copy>
+				<from variable="probeInput" part="probeData"/>
+				<to variable="reply" part="replyText"/>
+			</copy>
+		</assign>
+		<reply name="reply" partnerLink="request" portType="wns:testCorrelationPT" operation="request" variable="reply"> </reply>
+	</sequence>
+</process>

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/testCorrelation.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/testCorrelation.wsdl?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/testCorrelation.wsdl (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelation/testCorrelation.wsdl Fri Jan 23 23:53:17 2009
@@ -1,103 +1,103 @@
-<!--
-  ~ 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: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: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/TestCorrelation1/TestCorrelation1.bpel
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/TestCorrelation1.bpel?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/TestCorrelation1.bpel (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/TestCorrelation1.bpel Fri Jan 23 23:53:17 2009
@@ -1,86 +1,86 @@
-<!--
-  ~ 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.
--->
-
-<bpel:process xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://docs.oasis-open.org/wsbpel/2.0/process/executable ../../../../../../../bpel-schemas/src/main/resources/wsbpel_executable.xsd"
-  xmlns:tns="http://ode/bpel/unit-test/testCorrelation1"
-  targetNamespace="http://ode/bpel/unit-test/testCorrelation1"
-  xmlns:wns="http://ode/bpel/unit-test/testCorrelation1.wsdl"
- xmlns:ns0="http://www.w3schools.com"
- xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
- name="TestCorrelation1"
-  queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
-  expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
-  suppressJoinFailure="yes">
-  
-  <bpel:import location="TestCorrelation1.wsdl"
-    namespace="http://ode/bpel/unit-test/testCorrelation1.wsdl"
-    importType="http://schemas.xmlsoap.org/wsdl/" />
-  
-  <bpel:partnerLinks>
-    <bpel:partnerLink name="testCorrelation1PL" partnerLinkType="wns:testCorrelation1Request" myRole="testCorrelation1Service"/>
-  </bpel:partnerLinks>
-  <bpel:scope name="scope1">
-    <bpel:variables>
-      <bpel:variable messageType="wns:operation1Request" name="input1"/>
-      <bpel:variable messageType="wns:operation2Request" name="input2"/>
-      <bpel:variable messageType="wns:operation3Request" name="input3"/>
-      <bpel:variable messageType="wns:operation3Response" name="output3"/>
-    </bpel:variables>
-    <bpel:correlationSets>
-      <bpel:correlationSet name="correlationSet1" properties="wns:testCorrelation1Variable1"/>
-    </bpel:correlationSets>
-    <bpel:flow>
-      <bpel:sequence>
-        <bpel:receive name="receive1" createInstance="yes" operation="operation1" partnerLink="testCorrelation1PL" portType="wns:testCorrelation1PT" variable="input1">
-          <bpel:correlations>
-            <bpel:correlation set="correlationSet1" initiate="yes"></bpel:correlation>
-          </bpel:correlations>
-        </bpel:receive>
-        <bpel:scope name="scope2">
-          <bpel:correlationSets>
-            <bpel:correlationSet name="correlationSet2" properties="wns:testCorrelation1Variable1"/>
-         </bpel:correlationSets>
-          <bpel:flow>
-            <bpel:sequence>
-              <bpel:receive name="receive2" createInstance="no" operation="operation2" partnerLink="testCorrelation1PL" portType="wns:testCorrelation1PT" variable="input2">
-                <bpel:correlations>
-                  <bpel:correlation set="correlationSet1" initiate="no"></bpel:correlation>
-                  <bpel:correlation initiate="yes" set="correlationSet2"/>
-                </bpel:correlations>
-              </bpel:receive>
-              <bpel:receive name="receive3" createInstance="no" operation="operation3" partnerLink="testCorrelation1PL" portType="wns:testCorrelation1PT" variable="input3">
-                <bpel:correlations>
-                  <bpel:correlation initiate="no" set="correlationSet2"/>
-                </bpel:correlations>
-              </bpel:receive>
-              <bpel:assign name="assign1">
-                <bpel:copy>
-                  <bpel:from>$input2.newParameter1/ns0:from</bpel:from>
-                  <bpel:to part="newParameter2" variable="output3"/>
-                </bpel:copy>
-              </bpel:assign>
-              <bpel:reply name="reply" operation="operation3" partnerLink="testCorrelation1PL" portType="wns:testCorrelation1PT" variable="output3"/>
-            </bpel:sequence>
-          </bpel:flow>
-        </bpel:scope>
-      </bpel:sequence>
-    </bpel:flow>
-  </bpel:scope>
+<!--
+  ~ 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.
+-->
+
+<bpel:process xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://docs.oasis-open.org/wsbpel/2.0/process/executable ../../../../../../../bpel-schemas/src/main/resources/wsbpel_executable.xsd"
+  xmlns:tns="http://ode/bpel/unit-test/testCorrelation1"
+  targetNamespace="http://ode/bpel/unit-test/testCorrelation1"
+  xmlns:wns="http://ode/bpel/unit-test/testCorrelation1.wsdl"
+ xmlns:ns0="http://www.w3schools.com"
+ xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+ name="TestCorrelation1"
+  queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+  expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+  suppressJoinFailure="yes">
+  
+  <bpel:import location="TestCorrelation1.wsdl"
+    namespace="http://ode/bpel/unit-test/testCorrelation1.wsdl"
+    importType="http://schemas.xmlsoap.org/wsdl/" />
+  
+  <bpel:partnerLinks>
+    <bpel:partnerLink name="testCorrelation1PL" partnerLinkType="wns:testCorrelation1Request" myRole="testCorrelation1Service"/>
+  </bpel:partnerLinks>
+  <bpel:scope name="scope1">
+    <bpel:variables>
+      <bpel:variable messageType="wns:operation1Request" name="input1"/>
+      <bpel:variable messageType="wns:operation2Request" name="input2"/>
+      <bpel:variable messageType="wns:operation3Request" name="input3"/>
+      <bpel:variable messageType="wns:operation3Response" name="output3"/>
+    </bpel:variables>
+    <bpel:correlationSets>
+      <bpel:correlationSet name="correlationSet1" properties="wns:testCorrelation1Variable1"/>
+    </bpel:correlationSets>
+    <bpel:flow>
+      <bpel:sequence>
+        <bpel:receive name="receive1" createInstance="yes" operation="operation1" partnerLink="testCorrelation1PL" portType="wns:testCorrelation1PT" variable="input1">
+          <bpel:correlations>
+            <bpel:correlation set="correlationSet1" initiate="yes"></bpel:correlation>
+          </bpel:correlations>
+        </bpel:receive>
+        <bpel:scope name="scope2">
+          <bpel:correlationSets>
+            <bpel:correlationSet name="correlationSet2" properties="wns:testCorrelation1Variable1"/>
+         </bpel:correlationSets>
+          <bpel:flow>
+            <bpel:sequence>
+              <bpel:receive name="receive2" createInstance="no" operation="operation2" partnerLink="testCorrelation1PL" portType="wns:testCorrelation1PT" variable="input2">
+                <bpel:correlations>
+                  <bpel:correlation set="correlationSet1" initiate="no"></bpel:correlation>
+                  <bpel:correlation initiate="yes" set="correlationSet2"/>
+                </bpel:correlations>
+              </bpel:receive>
+              <bpel:receive name="receive3" createInstance="no" operation="operation3" partnerLink="testCorrelation1PL" portType="wns:testCorrelation1PT" variable="input3">
+                <bpel:correlations>
+                  <bpel:correlation initiate="no" set="correlationSet2"/>
+                </bpel:correlations>
+              </bpel:receive>
+              <bpel:assign name="assign1">
+                <bpel:copy>
+                  <bpel:from>$input2.newParameter1/ns0:from</bpel:from>
+                  <bpel:to part="newParameter2" variable="output3"/>
+                </bpel:copy>
+              </bpel:assign>
+              <bpel:reply name="reply" operation="operation3" partnerLink="testCorrelation1PL" portType="wns:testCorrelation1PT" variable="output3"/>
+            </bpel:sequence>
+          </bpel:flow>
+        </bpel:scope>
+      </bpel:sequence>
+    </bpel:flow>
+  </bpel:scope>
 </bpel:process>
\ No newline at end of file

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/TestCorrelation1.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/TestCorrelation1.wsdl?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/TestCorrelation1.wsdl (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelation1/TestCorrelation1.wsdl Fri Jan 23 23:53:17 2009
@@ -1,97 +1,97 @@
-<!--
-  ~ 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/testCorrelation1.wsdl" xmlns:tns="http://ode/bpel/unit-test/testCorrelation1.wsdl" xmlns="http://ode/bpel/unit-test/testCorrelation1.wsdl"
-                  xmlns:ns0="http://www.w3schools.com" xmlns:ns1="http://ode/bpel/unit-test/testCorrelation1.wsdl.types" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
-                  xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-                  xmlns:prop="http://docs.oasis-open.org/wsbpel/2.0/varprop">
-
-    <wsdl:types>
-        <xsd:schema targetNamespace="http://ode/bpel/unit-test/testCorrelation1.wsdl.types" xmlns="http://ode/bpel/unit-test/testCorrelation1.wsdl.types" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-            <xsd:element name="simpleString" type="xsd:string"/>
-        </xsd:schema>
-        <xs:schema elementFormDefault="qualified" targetNamespace="http://www.w3schools.com" xmlns="http://www.w3schools.com" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
-            <xs:element name="note">
-                <xs:complexType>
-                    <xs:sequence>
-                        <xs:element name="to" type="xs:string"/>
-                        <xs:element name="from" type="xs:string"/>
-                        <xs:element name="heading" type="xs:string"/>
-                        <xs:element name="body" type="xs:string"/>
-                    </xs:sequence>
-                </xs:complexType>
-            </xs:element>
-
-        </xs:schema>
-    </wsdl:types>
-    <wsdl:message name="operation2Request">
-        <wsdl:part name="newParameter1" element="ns0:note"/>
-    </wsdl:message>
-    <wsdl:message name="operation3Request">
-        <wsdl:part name="newParameter1" element="ns1:simpleString"/>
-    </wsdl:message>
-    <wsdl:message name="operation1Request">
-        <wsdl:part name="newParameter1" type="xsd:string"/>
-    </wsdl:message>
-    <wsdl:message name="operation3Response">
-        <wsdl:part name="newParameter2" type="xsd:string"/>
-    </wsdl:message>
-    <wsdl:portType name="testCorrelation1PT">
-        <wsdl:operation name="operation3">
-            <wsdl:input name="operation3Input" message="tns:operation3Request"/>
-            <wsdl:output name="operation3Output" message="tns:operation3Response"/>
-        </wsdl:operation>
-        <wsdl:operation name="operation2">
-            <wsdl:input name="operation2Input" message="tns:operation2Request"/>
-        </wsdl:operation>
-        <wsdl:operation name="operation1">
-            <wsdl:input name="operation1Input" message="tns:operation1Request"/>
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="testCorrelation1Binding" type="tns:testCorrelation1PT">
-        <wsdl:operation name="operation3">
-            <wsdl:input name="operation3Input"> </wsdl:input>
-            <wsdl:output name="operation3Output"> </wsdl:output>
-        </wsdl:operation>
-        <wsdl:operation name="operation2">
-            <wsdl:input name="operation2Input"> </wsdl:input>
-        </wsdl:operation>
-        <wsdl:operation name="operation1">
-            <wsdl:input name="operation1Input"> </wsdl:input>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="testCorrelation1Service">
-        <wsdl:port name="testCorrelation1Port" binding="tns:testCorrelation1Binding"> </wsdl:port>
-    </wsdl:service>
-
-    <plnk:partnerLinkType name="testCorrelation1Request">
-        <plnk:role name="testCorrelation1Service" portType="testCorrelation1PT"/>
-    </plnk:partnerLinkType>
-
-    <prop:property name="testCorrelation1Variable1" type="xsd:string"/>
-    <prop:propertyAlias messageType="tns:operation2Request" part="newParameter1" propertyName="tns:testCorrelation1Variable1">
-        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">ns0:to</prop:query>
-    </prop:propertyAlias>
-    <prop:propertyAlias messageType="tns:operation3Request" part="newParameter1" propertyName="tns:testCorrelation1Variable1">
-    </prop:propertyAlias>
-    <prop:propertyAlias messageType="tns:operation1Request" part="newParameter1" propertyName="tns:testCorrelation1Variable1">
-    </prop:propertyAlias>
-</wsdl:definitions>
+<!--
+  ~ 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/testCorrelation1.wsdl" xmlns:tns="http://ode/bpel/unit-test/testCorrelation1.wsdl" xmlns="http://ode/bpel/unit-test/testCorrelation1.wsdl"
+                  xmlns:ns0="http://www.w3schools.com" xmlns:ns1="http://ode/bpel/unit-test/testCorrelation1.wsdl.types" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
+                  xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+                  xmlns:prop="http://docs.oasis-open.org/wsbpel/2.0/varprop">
+
+    <wsdl:types>
+        <xsd:schema targetNamespace="http://ode/bpel/unit-test/testCorrelation1.wsdl.types" xmlns="http://ode/bpel/unit-test/testCorrelation1.wsdl.types" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+            <xsd:element name="simpleString" type="xsd:string"/>
+        </xsd:schema>
+        <xs:schema elementFormDefault="qualified" targetNamespace="http://www.w3schools.com" xmlns="http://www.w3schools.com" xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+            <xs:element name="note">
+                <xs:complexType>
+                    <xs:sequence>
+                        <xs:element name="to" type="xs:string"/>
+                        <xs:element name="from" type="xs:string"/>
+                        <xs:element name="heading" type="xs:string"/>
+                        <xs:element name="body" type="xs:string"/>
+                    </xs:sequence>
+                </xs:complexType>
+            </xs:element>
+
+        </xs:schema>
+    </wsdl:types>
+    <wsdl:message name="operation2Request">
+        <wsdl:part name="newParameter1" element="ns0:note"/>
+    </wsdl:message>
+    <wsdl:message name="operation3Request">
+        <wsdl:part name="newParameter1" element="ns1:simpleString"/>
+    </wsdl:message>
+    <wsdl:message name="operation1Request">
+        <wsdl:part name="newParameter1" type="xsd:string"/>
+    </wsdl:message>
+    <wsdl:message name="operation3Response">
+        <wsdl:part name="newParameter2" type="xsd:string"/>
+    </wsdl:message>
+    <wsdl:portType name="testCorrelation1PT">
+        <wsdl:operation name="operation3">
+            <wsdl:input name="operation3Input" message="tns:operation3Request"/>
+            <wsdl:output name="operation3Output" message="tns:operation3Response"/>
+        </wsdl:operation>
+        <wsdl:operation name="operation2">
+            <wsdl:input name="operation2Input" message="tns:operation2Request"/>
+        </wsdl:operation>
+        <wsdl:operation name="operation1">
+            <wsdl:input name="operation1Input" message="tns:operation1Request"/>
+        </wsdl:operation>
+    </wsdl:portType>
+    <wsdl:binding name="testCorrelation1Binding" type="tns:testCorrelation1PT">
+        <wsdl:operation name="operation3">
+            <wsdl:input name="operation3Input"> </wsdl:input>
+            <wsdl:output name="operation3Output"> </wsdl:output>
+        </wsdl:operation>
+        <wsdl:operation name="operation2">
+            <wsdl:input name="operation2Input"> </wsdl:input>
+        </wsdl:operation>
+        <wsdl:operation name="operation1">
+            <wsdl:input name="operation1Input"> </wsdl:input>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:service name="testCorrelation1Service">
+        <wsdl:port name="testCorrelation1Port" binding="tns:testCorrelation1Binding"> </wsdl:port>
+    </wsdl:service>
+
+    <plnk:partnerLinkType name="testCorrelation1Request">
+        <plnk:role name="testCorrelation1Service" portType="testCorrelation1PT"/>
+    </plnk:partnerLinkType>
+
+    <prop:property name="testCorrelation1Variable1" type="xsd:string"/>
+    <prop:propertyAlias messageType="tns:operation2Request" part="newParameter1" propertyName="tns:testCorrelation1Variable1">
+        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">ns0:to</prop:query>
+    </prop:propertyAlias>
+    <prop:propertyAlias messageType="tns:operation3Request" part="newParameter1" propertyName="tns:testCorrelation1Variable1">
+    </prop:propertyAlias>
+    <prop:propertyAlias messageType="tns:operation1Request" part="newParameter1" propertyName="tns:testCorrelation1Variable1">
+    </prop:propertyAlias>
+</wsdl:definitions>

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationJoin/testCorrelation.bpel
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationJoin/testCorrelation.bpel?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationJoin/testCorrelation.bpel (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationJoin/testCorrelation.bpel Fri Jan 23 23:53:17 2009
@@ -1,118 +1,118 @@
-<!--
-	~ 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"> </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"> </reply>
+	</sequence>
+</process>

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationJoin/testCorrelation.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationJoin/testCorrelation.wsdl?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationJoin/testCorrelation.wsdl (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationJoin/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/TestCorrelationJoinInvoke/testCorrelation.bpel
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationJoinInvoke/testCorrelation.bpel?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationJoinInvoke/testCorrelation.bpel (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationJoinInvoke/testCorrelation.bpel Fri Jan 23 23:53:17 2009
@@ -1,127 +1,127 @@
-<!--
-	~ 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: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="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">
-					<correlations>
-						<correlation set="testCorr2" initiate="join" pattern="out"/>
-					</correlations>
-				</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="../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: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="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">
+					<correlations>
+						<correlation set="testCorr2" initiate="join" pattern="out"/>
+					</correlations>
+				</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/TestCorrelationJoinInvoke/testCorrelation.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationJoinInvoke/testCorrelation.wsdl?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationJoinInvoke/testCorrelation.wsdl (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationJoinInvoke/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>