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 [6/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/TestFlowActivity2/TestActivityFlow.bpel
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/TestActivityFlow.bpel?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/TestActivityFlow.bpel (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/TestActivityFlow.bpel Fri Jan 23 23:53:17 2009
@@ -1,306 +1,306 @@
-<!--
-	~ 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/testFlowActivity2"
-	xmlns:wns="http://ode/bpel/unit-test/testFlowActivity2.wsdl"
-	xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
- xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
-	xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
- name="TestActivityFlow"
-	targetNamespace="http://ode/bpel/unit-test/testFlowActivity2"
- suppressJoinFailure="yes">
- 
- <!-- Test Flow using XPath 10 -->
- 
-	<import location="TestActivityFlow.wsdl"
-		namespace="http://ode/bpel/unit-test/testFlowActivity2.wsdl"
-		importType="http://schemas.xmlsoap.org/wsdl/" />
-	<import location="../ProbeService/probeService.wsdl"
-		namespace="http://ode/bpel/unit-test/ProbeService.wsdl"
-		importType="http://schemas.xmlsoap.org/wsdl/"/>
-		
-	<!-- test control flow elements -->
-	<!--	sequence 				-->
-	<!--	flow ( links ) 			-->
-	<!--	swith 					-->
-	<!--	while 					-->
-	<partnerLinks>
-		<partnerLink name="request" partnerLinkType="wns:testFlowActivityRequest" myRole="testFlowActivityService"/>
-		<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"/>
-		<variable name="internalState" messageType="wns:internalProcessData"/>
-	</variables>
-	<sequence>
-		<flow>
-			<links>
-				<link name="receive-to-assign1"/>
-				<link name="assign1-to-probe1"/>
-				<link name="assign1-to-probe2"/>
-				<link name="probe1-to-probe3"/>
-				<link name="probe2-to-probe3"/>
-			</links>
-			<receive name="receive1" partnerLink="request" portType="wns:testFlowActivityPT"
-				operation="request" variable="request" createInstance="yes">
-				<sources>
-					<source linkName="receive-to-assign1"/>
-				</sources>
-			</receive>
-			<!-- Copy input variables to internal accumulators -->
-			<!-- After the copy the process splits into two execution paths -->
-			<sequence>
-				<targets>
-					<target linkName="receive-to-assign1"/>
-				</targets>
-				<sources>
-					<source linkName="assign1-to-probe1"/>
-					<source linkName="assign1-to-probe2"/>
-				</sources>
-				<assign name="assign1">
-					<copy>
-						<from>$request.requestMessageData/requestID</from>
-						<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[root process splits into A and B]]></literal>
-						</from>
-						<to variable="probeInput" part="probeName"/>
-					</copy>
-				</assign>
-				<invoke name="probe2" partnerLink="probe" portType="prb:probeMessagePT"
-					operation="probe" inputVariable="probeInput" outputVariable="probeInput"
-				> </invoke>
-			</sequence>
-			<!-- probe1 outbound status is dependent on the request input testFlow1 -->
-			<sequence>
-				<targets>
-					<target linkName="assign1-to-probe1"/>
-				</targets>
-				<sources>
-					<source linkName="probe1-to-probe3">
-						<transitionCondition>bpws:getVariableProperty("request", "wns:testFlow1") =
-							'yes'</transitionCondition>
-					</source>
-				</sources>
-				<assign>
-					<copy>
-						<from>
-							<literal><![CDATA[process A completes]]></literal>
-						</from>
-						<to variable="probeInput" part="probeName"/>
-					</copy>
-				</assign>
-				<invoke name="probe3" partnerLink="probe" portType="prb:probeMessagePT"
-					operation="probe" inputVariable="probeInput" outputVariable="probeInput"
-				> </invoke>
-			</sequence>
-			<!-- probe2 outbound status is dependent on the request input testFlow2 -->
-			<sequence>
-				<targets>
-					<target linkName="assign1-to-probe2"/>
-				</targets>
-				<sources>
-					<source linkName="probe2-to-probe3">
-						<transitionCondition>$request.requestMessageData/flowIndicators/indicatorTwo =
-							'yes'</transitionCondition>
-					</source>
-				</sources>
-				<assign>
-					<copy>
-						<from>
-							<literal><![CDATA[process B completes]]></literal>
-						</from>
-						<to variable="probeInput" part="probeName"/>
-					</copy>
-				</assign>
-				<invoke name="probe4" partnerLink="probe" portType="prb:probeMessagePT"
-					operation="probe" inputVariable="probeInput" outputVariable="probeInput"
-				> </invoke>
-			</sequence>
-			<!-- The split execution path from assign1 joins on probe3 -->
-			<!-- Probe3 will only fire if the transition condition from probe1 and probe2 both evaluate to true -->
-			<sequence>
-				<targets>
-					<joinCondition>$probe1-to-probe3 and $probe2-to-probe3</joinCondition>
-					<target linkName="probe1-to-probe3"/>
-					<target linkName="probe2-to-probe3"/>
-				</targets>
-				<assign>
-					<copy>
-						<from>
-							<literal><![CDATA[processes A and B merge on process C]]></literal>
-						</from>
-						<to variable="probeInput" part="probeName"/>
-					</copy>
-				</assign>
-				<invoke name="probe5" partnerLink="probe" portType="prb:probeMessagePT"
-					operation="probe" inputVariable="probeInput" outputVariable="probeInput"
-				> </invoke>
-			</sequence>
-		</flow>
-		<assign>
-			<copy>
-				<from>
-					<literal><![CDATA[merge into root process]]></literal>
-				</from>
-				<to variable="probeInput" part="probeName"/>
-			</copy>
-		</assign>
-		<invoke name="probe6" partnerLink="probe" portType="prb:probeMessagePT" operation="probe"
-			inputVariable="probeInput" outputVariable="probeInput"> </invoke>
-		<!-- from the input data loopIndicator set the number of loop interations -->
-		<assign>
-			<copy>
-				<from>
-					<literal><![CDATA[test switch statement]]></literal>
-				</from>
-				<to variable="probeInput" part="probeName"/>
-			</copy>
-		</assign>
-		<invoke name="probe7" partnerLink="probe" portType="prb:probeMessagePT" operation="probe"
-			inputVariable="probeInput" outputVariable="probeInput"> </invoke>
-		<if>
-			<condition>bpws:getVariableProperty("request", "wns:loopInd") = 'min'</condition>
-            <sequence>
-                <assign name="flow1-min-assign">
-                    <copy>
-                        <from>5</from>
-                        <to variable="internalState" part="loop1"/>
-                    </copy>
-                    <copy>
-                        <from>
-                            <literal><![CDATA[case min: set loop iterations = 5]]></literal>
-                        </from>
-                        <to variable="probeInput" part="probeName"/>
-                    </copy>
-                </assign>
-                <invoke name="probe8" partnerLink="probe" portType="prb:probeMessagePT"
-                    operation="probe" inputVariable="probeInput" outputVariable="probeInput"
-                > </invoke>
-            </sequence>
-			<elseif>
-				<condition>$request.requestMessageData/loopIndicator = 'max'</condition>
-				<sequence>
-					<assign name="flow1-max-assign">
-						<copy>
-							<from>10</from>
-							<to variable="internalState" part="loop1"/>
-						</copy>
-						<copy>
-							<from>
-								<literal><![CDATA[case max: set loop iterations = 10]]></literal>
-							</from>
-							<to variable="probeInput" part="probeName"/>
-						</copy>
-					</assign>
-					<invoke name="probe9" partnerLink="probe" portType="prb:probeMessagePT"
-						operation="probe" inputVariable="probeInput" outputVariable="probeInput"
-						> </invoke>
-				</sequence>
-			</elseif>
-			<else>
-				<sequence>
-					<assign name="flow1-default-assign">
-						<copy>
-							<from>0</from>
-							<to variable="internalState" part="loop1"/>
-						</copy>
-						<copy>
-							<from>
-								<literal><![CDATA[otherwise: set loop iterations = 0]]></literal>
-							</from>
-							<to variable="probeInput" part="probeName"/>
-						</copy>
-					</assign>
-					<invoke name="probe10" partnerLink="probe" portType="prb:probeMessagePT"
-						operation="probe" inputVariable="probeInput" outputVariable="probeInput"
-					> </invoke>
-				</sequence>
-			</else>
-		</if>
-		
-		<assign name="while-increment-initialize">
-			<copy>
-				<from>0</from>
-				<to variable="internalState" part="loop1Counter"></to>
-			</copy>
-			<copy>
-				<from>
-					<literal><![CDATA[test loop iterations]]></literal>
-				</from>
-				<to variable="probeInput" part="probeName"/>
-			</copy>
-		</assign>
-		<invoke name="probe10" partnerLink="probe" portType="prb:probeMessagePT" operation="probe"
-			inputVariable="probeInput" outputVariable="probeInput"> </invoke>
-		<while>
-			<condition>$internalState.loop1Counter &lt; $internalState.loop1</condition>
-			<sequence>
-				<assign name="while-increment">
-					<copy>
-						<from>$internalState.loop1Counter + 1</from>
-						<to variable="internalState" part="loop1Counter"/>
-					</copy>
-					<copy>
-						<from>$internalState.loop1Counter + 1</from>
-						<to variable="probeInput" part="probeName"/>
-					</copy>
-				</assign>
-				<invoke name="probe11" partnerLink="probe" portType="prb:probeMessagePT"
-					operation="probe" inputVariable="probeInput" outputVariable="probeInput"/>
-
-			</sequence>
-		</while>
-		<!-- copy internal accumulators to the reply message -->
-		<assign>
-			<copy>
-				<from>
-					<literal><![CDATA[test1Process complete]]></literal>
-				</from>
-				<to variable="probeInput" part="probeName"/>
-			</copy>
-		</assign>
-		<invoke name="probe12" 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:testFlowActivityPT" 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/testFlowActivity2"
+	xmlns:wns="http://ode/bpel/unit-test/testFlowActivity2.wsdl"
+	xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
+ xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+	xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+ name="TestActivityFlow"
+	targetNamespace="http://ode/bpel/unit-test/testFlowActivity2"
+ suppressJoinFailure="yes">
+ 
+ <!-- Test Flow using XPath 10 -->
+ 
+	<import location="TestActivityFlow.wsdl"
+		namespace="http://ode/bpel/unit-test/testFlowActivity2.wsdl"
+		importType="http://schemas.xmlsoap.org/wsdl/" />
+	<import location="../ProbeService/probeService.wsdl"
+		namespace="http://ode/bpel/unit-test/ProbeService.wsdl"
+		importType="http://schemas.xmlsoap.org/wsdl/"/>
+		
+	<!-- test control flow elements -->
+	<!--	sequence 				-->
+	<!--	flow ( links ) 			-->
+	<!--	swith 					-->
+	<!--	while 					-->
+	<partnerLinks>
+		<partnerLink name="request" partnerLinkType="wns:testFlowActivityRequest" myRole="testFlowActivityService"/>
+		<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"/>
+		<variable name="internalState" messageType="wns:internalProcessData"/>
+	</variables>
+	<sequence>
+		<flow>
+			<links>
+				<link name="receive-to-assign1"/>
+				<link name="assign1-to-probe1"/>
+				<link name="assign1-to-probe2"/>
+				<link name="probe1-to-probe3"/>
+				<link name="probe2-to-probe3"/>
+			</links>
+			<receive name="receive1" partnerLink="request" portType="wns:testFlowActivityPT"
+				operation="request" variable="request" createInstance="yes">
+				<sources>
+					<source linkName="receive-to-assign1"/>
+				</sources>
+			</receive>
+			<!-- Copy input variables to internal accumulators -->
+			<!-- After the copy the process splits into two execution paths -->
+			<sequence>
+				<targets>
+					<target linkName="receive-to-assign1"/>
+				</targets>
+				<sources>
+					<source linkName="assign1-to-probe1"/>
+					<source linkName="assign1-to-probe2"/>
+				</sources>
+				<assign name="assign1">
+					<copy>
+						<from>$request.requestMessageData/requestID</from>
+						<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[root process splits into A and B]]></literal>
+						</from>
+						<to variable="probeInput" part="probeName"/>
+					</copy>
+				</assign>
+				<invoke name="probe2" partnerLink="probe" portType="prb:probeMessagePT"
+					operation="probe" inputVariable="probeInput" outputVariable="probeInput"
+				> </invoke>
+			</sequence>
+			<!-- probe1 outbound status is dependent on the request input testFlow1 -->
+			<sequence>
+				<targets>
+					<target linkName="assign1-to-probe1"/>
+				</targets>
+				<sources>
+					<source linkName="probe1-to-probe3">
+						<transitionCondition>bpws:getVariableProperty("request", "wns:testFlow1") =
+							'yes'</transitionCondition>
+					</source>
+				</sources>
+				<assign>
+					<copy>
+						<from>
+							<literal><![CDATA[process A completes]]></literal>
+						</from>
+						<to variable="probeInput" part="probeName"/>
+					</copy>
+				</assign>
+				<invoke name="probe3" partnerLink="probe" portType="prb:probeMessagePT"
+					operation="probe" inputVariable="probeInput" outputVariable="probeInput"
+				> </invoke>
+			</sequence>
+			<!-- probe2 outbound status is dependent on the request input testFlow2 -->
+			<sequence>
+				<targets>
+					<target linkName="assign1-to-probe2"/>
+				</targets>
+				<sources>
+					<source linkName="probe2-to-probe3">
+						<transitionCondition>$request.requestMessageData/flowIndicators/indicatorTwo =
+							'yes'</transitionCondition>
+					</source>
+				</sources>
+				<assign>
+					<copy>
+						<from>
+							<literal><![CDATA[process B completes]]></literal>
+						</from>
+						<to variable="probeInput" part="probeName"/>
+					</copy>
+				</assign>
+				<invoke name="probe4" partnerLink="probe" portType="prb:probeMessagePT"
+					operation="probe" inputVariable="probeInput" outputVariable="probeInput"
+				> </invoke>
+			</sequence>
+			<!-- The split execution path from assign1 joins on probe3 -->
+			<!-- Probe3 will only fire if the transition condition from probe1 and probe2 both evaluate to true -->
+			<sequence>
+				<targets>
+					<joinCondition>$probe1-to-probe3 and $probe2-to-probe3</joinCondition>
+					<target linkName="probe1-to-probe3"/>
+					<target linkName="probe2-to-probe3"/>
+				</targets>
+				<assign>
+					<copy>
+						<from>
+							<literal><![CDATA[processes A and B merge on process C]]></literal>
+						</from>
+						<to variable="probeInput" part="probeName"/>
+					</copy>
+				</assign>
+				<invoke name="probe5" partnerLink="probe" portType="prb:probeMessagePT"
+					operation="probe" inputVariable="probeInput" outputVariable="probeInput"
+				> </invoke>
+			</sequence>
+		</flow>
+		<assign>
+			<copy>
+				<from>
+					<literal><![CDATA[merge into root process]]></literal>
+				</from>
+				<to variable="probeInput" part="probeName"/>
+			</copy>
+		</assign>
+		<invoke name="probe6" partnerLink="probe" portType="prb:probeMessagePT" operation="probe"
+			inputVariable="probeInput" outputVariable="probeInput"> </invoke>
+		<!-- from the input data loopIndicator set the number of loop interations -->
+		<assign>
+			<copy>
+				<from>
+					<literal><![CDATA[test switch statement]]></literal>
+				</from>
+				<to variable="probeInput" part="probeName"/>
+			</copy>
+		</assign>
+		<invoke name="probe7" partnerLink="probe" portType="prb:probeMessagePT" operation="probe"
+			inputVariable="probeInput" outputVariable="probeInput"> </invoke>
+		<if>
+			<condition>bpws:getVariableProperty("request", "wns:loopInd") = 'min'</condition>
+            <sequence>
+                <assign name="flow1-min-assign">
+                    <copy>
+                        <from>5</from>
+                        <to variable="internalState" part="loop1"/>
+                    </copy>
+                    <copy>
+                        <from>
+                            <literal><![CDATA[case min: set loop iterations = 5]]></literal>
+                        </from>
+                        <to variable="probeInput" part="probeName"/>
+                    </copy>
+                </assign>
+                <invoke name="probe8" partnerLink="probe" portType="prb:probeMessagePT"
+                    operation="probe" inputVariable="probeInput" outputVariable="probeInput"
+                > </invoke>
+            </sequence>
+			<elseif>
+				<condition>$request.requestMessageData/loopIndicator = 'max'</condition>
+				<sequence>
+					<assign name="flow1-max-assign">
+						<copy>
+							<from>10</from>
+							<to variable="internalState" part="loop1"/>
+						</copy>
+						<copy>
+							<from>
+								<literal><![CDATA[case max: set loop iterations = 10]]></literal>
+							</from>
+							<to variable="probeInput" part="probeName"/>
+						</copy>
+					</assign>
+					<invoke name="probe9" partnerLink="probe" portType="prb:probeMessagePT"
+						operation="probe" inputVariable="probeInput" outputVariable="probeInput"
+						> </invoke>
+				</sequence>
+			</elseif>
+			<else>
+				<sequence>
+					<assign name="flow1-default-assign">
+						<copy>
+							<from>0</from>
+							<to variable="internalState" part="loop1"/>
+						</copy>
+						<copy>
+							<from>
+								<literal><![CDATA[otherwise: set loop iterations = 0]]></literal>
+							</from>
+							<to variable="probeInput" part="probeName"/>
+						</copy>
+					</assign>
+					<invoke name="probe10" partnerLink="probe" portType="prb:probeMessagePT"
+						operation="probe" inputVariable="probeInput" outputVariable="probeInput"
+					> </invoke>
+				</sequence>
+			</else>
+		</if>
+		
+		<assign name="while-increment-initialize">
+			<copy>
+				<from>0</from>
+				<to variable="internalState" part="loop1Counter"></to>
+			</copy>
+			<copy>
+				<from>
+					<literal><![CDATA[test loop iterations]]></literal>
+				</from>
+				<to variable="probeInput" part="probeName"/>
+			</copy>
+		</assign>
+		<invoke name="probe10" partnerLink="probe" portType="prb:probeMessagePT" operation="probe"
+			inputVariable="probeInput" outputVariable="probeInput"> </invoke>
+		<while>
+			<condition>$internalState.loop1Counter &lt; $internalState.loop1</condition>
+			<sequence>
+				<assign name="while-increment">
+					<copy>
+						<from>$internalState.loop1Counter + 1</from>
+						<to variable="internalState" part="loop1Counter"/>
+					</copy>
+					<copy>
+						<from>$internalState.loop1Counter + 1</from>
+						<to variable="probeInput" part="probeName"/>
+					</copy>
+				</assign>
+				<invoke name="probe11" partnerLink="probe" portType="prb:probeMessagePT"
+					operation="probe" inputVariable="probeInput" outputVariable="probeInput"/>
+
+			</sequence>
+		</while>
+		<!-- copy internal accumulators to the reply message -->
+		<assign>
+			<copy>
+				<from>
+					<literal><![CDATA[test1Process complete]]></literal>
+				</from>
+				<to variable="probeInput" part="probeName"/>
+			</copy>
+		</assign>
+		<invoke name="probe12" 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:testFlowActivityPT" operation="request"
+			variable="reply"> </reply>
+	</sequence>
+</process>

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/TestActivityFlow.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/TestActivityFlow.wsdl?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/TestActivityFlow.wsdl (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/TestActivityFlow.wsdl Fri Jan 23 23:53:17 2009
@@ -1,123 +1,123 @@
-<!--
-  ~ 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/testFlowActivity2.wsdl"
-  xmlns:tns="http://ode/bpel/unit-test/testFlowActivity2.wsdl"
-  xmlns="http://ode/bpel/unit-test/testFlowActivity2.wsdl"
-  xmlns:typens="http://ode/bpel/unit-test/testFlowActivity2.wsdl.types"
-  xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
-  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-  xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"      
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop">
-    
-  <!-- type defs -->
-  <wsdl:types>
-    <xsd:schema
-      targetNamespace="http://ode/bpel/unit-test/testFlowActivity2.wsdl.types"
-                xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-      <xsd:complexType name="flowIndicator">
-	  <xsd:sequence>
-	    <xsd:element name="indicatorOne" type="xsd:boolean"/>
-	    <xsd:element name="indicatorTwo" type="xsd:boolean"/>
-        </xsd:sequence>
-	</xsd:complexType>
-
-      <xsd:complexType name="testMessage">
-        <xsd:sequence>
-          <xsd:element name="requestID" type="xsd:string"/>
-          <xsd:element name="requestText" type="xsd:string"/>
-          <xsd:element name="flowIndicators" type="typens:flowIndicator"/>
-	    <xsd:element name="loopIndicator" 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:message name="internalProcessData">
-    <wsdl:part name="loop1Counter" type="xsd:int"/>
-    <wsdl:part name="loop1" type="xsd:int"/>
-  </wsdl:message>
-
-   <!-- portType supported by the test process -->
-
-  <wsdl:portType name="testFlowActivityPT">
-    <wsdl:operation name="request">
-      <wsdl:input message="requestMessage"/>
-      <wsdl:output message="replyMessage"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  
-  <wsdl:binding name="TestFlowActivityBinding" type="tns:testFlowActivityPT">
-    <wsdl:operation name="request">
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="TestFlowActivityService">
-    <wsdl:port name="TestFlowActivityPort" binding="tns:TestFlowActivityBinding">
-    </wsdl:port>
-  </wsdl:service>
-
-   <plnk:partnerLinkType name="testFlowActivityRequest">
-	<plnk:role name="testFlowActivityService" portType="tns:testFlowActivityPT"/>
-   </plnk:partnerLinkType>
-
-   <plnk:partnerLinkType name="probeRequest">
-	<plnk:role name="probeService" portType="prb:probeMessagePT"/>
-   </plnk:partnerLinkType>
-   
-  <vprop:property name="testProbeData" type="xsd:string"/>
-  <vprop:propertyAlias propertyName="tns:testProbeData" messageType="tns:requestMessage" part="requestMessageData">
-    <vprop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-      requestText
-    </vprop:query>
-  </vprop:propertyAlias>
-  
-  <vprop:property name="testFlow1" type="xsd:boolean"/>
+<!--
+  ~ 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/testFlowActivity2.wsdl"
+  xmlns:tns="http://ode/bpel/unit-test/testFlowActivity2.wsdl"
+  xmlns="http://ode/bpel/unit-test/testFlowActivity2.wsdl"
+  xmlns:typens="http://ode/bpel/unit-test/testFlowActivity2.wsdl.types"
+  xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
+  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+  xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"      
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+  xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop">
+    
+  <!-- type defs -->
+  <wsdl:types>
+    <xsd:schema
+      targetNamespace="http://ode/bpel/unit-test/testFlowActivity2.wsdl.types"
+                xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+      <xsd:complexType name="flowIndicator">
+	  <xsd:sequence>
+	    <xsd:element name="indicatorOne" type="xsd:boolean"/>
+	    <xsd:element name="indicatorTwo" type="xsd:boolean"/>
+        </xsd:sequence>
+	</xsd:complexType>
+
+      <xsd:complexType name="testMessage">
+        <xsd:sequence>
+          <xsd:element name="requestID" type="xsd:string"/>
+          <xsd:element name="requestText" type="xsd:string"/>
+          <xsd:element name="flowIndicators" type="typens:flowIndicator"/>
+	    <xsd:element name="loopIndicator" 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:message name="internalProcessData">
+    <wsdl:part name="loop1Counter" type="xsd:int"/>
+    <wsdl:part name="loop1" type="xsd:int"/>
+  </wsdl:message>
+
+   <!-- portType supported by the test process -->
+
+  <wsdl:portType name="testFlowActivityPT">
+    <wsdl:operation name="request">
+      <wsdl:input message="requestMessage"/>
+      <wsdl:output message="replyMessage"/>
+    </wsdl:operation>
+  </wsdl:portType>
+  
+  <wsdl:binding name="TestFlowActivityBinding" type="tns:testFlowActivityPT">
+    <wsdl:operation name="request">
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:service name="TestFlowActivityService">
+    <wsdl:port name="TestFlowActivityPort" binding="tns:TestFlowActivityBinding">
+    </wsdl:port>
+  </wsdl:service>
+
+   <plnk:partnerLinkType name="testFlowActivityRequest">
+	<plnk:role name="testFlowActivityService" portType="tns:testFlowActivityPT"/>
+   </plnk:partnerLinkType>
+
+   <plnk:partnerLinkType name="probeRequest">
+	<plnk:role name="probeService" portType="prb:probeMessagePT"/>
+   </plnk:partnerLinkType>
+   
+  <vprop:property name="testProbeData" type="xsd:string"/>
+  <vprop:propertyAlias propertyName="tns:testProbeData" messageType="tns:requestMessage" part="requestMessageData">
+    <vprop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+      requestText
+    </vprop:query>
+  </vprop:propertyAlias>
+  
+  <vprop:property name="testFlow1" type="xsd:boolean"/>
   <vprop:propertyAlias propertyName="tns:testFlow1" messageType="tns:requestMessage" part="requestMessageData">
- 
-    <vprop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-      flowIndicators/indicatorOne
-    </vprop:query> 
-  
-  </vprop:propertyAlias>
-
-  
-  <vprop:property name="loopInd" type="xsd:string"/>
+ 
+    <vprop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+      flowIndicators/indicatorOne
+    </vprop:query> 
+  
+  </vprop:propertyAlias>
+
+  
+  <vprop:property name="loopInd" type="xsd:string"/>
   <vprop:propertyAlias propertyName="tns:loopInd" messageType="tns:requestMessage" part="requestMessageData">
-
-    <vprop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-      loopIndicator
-    </vprop:query>  
+
+    <vprop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+      loopIndicator
+    </vprop:query>  
+   
+  </vprop:propertyAlias>
+  
    
-  </vprop:propertyAlias>
-  
-   
-
-</wsdl:definitions>
+
+</wsdl:definitions>

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFlowLinks/TestCase.bpel
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFlowLinks/TestCase.bpel?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFlowLinks/TestCase.bpel (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFlowLinks/TestCase.bpel Fri Jan 23 23:53:17 2009
@@ -1,92 +1,92 @@
-<?xml version="1.0"?>
-<bpel:process  xmlns:wsa="http://schemas.xmlsoap.org/ws/2003/03/addressing"
-               xmlns:saw="workflowns"
-               xmlns:xs="http://www.w3.org/2001/XMLSchema"
-               name="TestCase" targetNamespace="workflowns"
-               queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
-               expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
-               suppressJoinFailure="no" exitOnStandardFault="no" xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
-    <bpel:import namespace="workflowns" location="TestCase.wsdl" importType="http://schemas.xmlsoap.org/wsdl/" />
-    <bpel:partnerLinks>
-        <bpel:partnerLink name="TestCase" partnerLinkType="saw:TestCase" myRole="WorkflowRole" />
-    </bpel:partnerLinks>
-    <bpel:variables>
-        <bpel:variable name="In" messageType="saw:ExecuteWorkflowSoapIn" />
-    </bpel:variables>
-    <bpel:sequence name="Outer_Workflow">
-        <bpel:receive name="Receive" partnerLink="TestCase" portType="saw:Workflow" operation="ExecuteWorkflow" variable="In" createInstance="yes"/>
-        <bpel:flow name="EndlessRunningFlowOfPain">
-            <bpel:links>
-                <bpel:link name="transition1"/>
-                <bpel:link name="transition2"/>
-                <bpel:link name="transition3"/>
-                <bpel:link name="transition4" />
-                <bpel:link name="test_foo" />
-            </bpel:links>
-            <bpel:sequence name="State-Actioning_Start">
-                <bpel:sources>
-                    <bpel:source linkName="transition1" />
-                </bpel:sources>
-                <bpel:empty/>
-            </bpel:sequence>
-            <bpel:if name="TransitionResolver">
-                <bpel:targets>
-                    <bpel:target linkName="transition1" />
-                </bpel:targets>
-                <bpel:condition>false()</bpel:condition>
-                <bpel:empty>
-                    <bpel:sources>
-                        <bpel:source linkName="transition2" />
-                    </bpel:sources>
-                </bpel:empty>
-                <bpel:elseif>
-                    <bpel:condition>true()</bpel:condition>
-                    <bpel:empty>
-                        <bpel:sources>
-                            <bpel:source linkName="test_foo" />
-                        </bpel:sources>
-                    </bpel:empty>
-                </bpel:elseif>
-                <bpel:else>
-                    <bpel:throw faultName="saw:TransitionConditionOutOfRangeException" />
-                </bpel:else>
-            </bpel:if>
-            <bpel:empty name="test_foo_flow">
-                <bpel:targets>
-                    <bpel:target linkName="test_foo" />
-                </bpel:targets>
-                <bpel:empty/>
-            </bpel:empty>
-            <bpel:sequence name="State-Inbound_Workflows_Selectors" suppressJoinFailure="yes">
-                <bpel:targets>
-                    <bpel:target linkName="transition2" />
-                </bpel:targets>
-                <bpel:sources>
-                    <bpel:source linkName="transition3" />
-                </bpel:sources>
-                <bpel:empty/>
-            </bpel:sequence>
-            <bpel:if name="TransitionResolver2" suppressJoinFailure="yes">
-                <bpel:targets>
-                    <bpel:target linkName="transition3" />
-                </bpel:targets>
-                <bpel:condition> true() </bpel:condition>
-                <bpel:empty name="should-be-dpe">
-                    <bpel:sources>
-                        <bpel:source linkName="transition4" />
-                    </bpel:sources>
-                </bpel:empty>
-                <bpel:else>
-                    <bpel:empty />
-                </bpel:else>
-            </bpel:if>
-            <bpel:sequence name="State-Simple_Inbound" suppressJoinFailure="yes">
-                <bpel:targets>
-                    <bpel:target linkName="transition4" />
-                </bpel:targets>
-                <bpel:empty />
-            </bpel:sequence>
-        </bpel:flow>
-        <bpel:reply name="Reply" partnerLink="TestCase" portType="saw:Workflow" operation="ExecuteWorkflow" variable="In"/>
-    </bpel:sequence>
+<?xml version="1.0"?>
+<bpel:process  xmlns:wsa="http://schemas.xmlsoap.org/ws/2003/03/addressing"
+               xmlns:saw="workflowns"
+               xmlns:xs="http://www.w3.org/2001/XMLSchema"
+               name="TestCase" targetNamespace="workflowns"
+               queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+               expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+               suppressJoinFailure="no" exitOnStandardFault="no" xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+    <bpel:import namespace="workflowns" location="TestCase.wsdl" importType="http://schemas.xmlsoap.org/wsdl/" />
+    <bpel:partnerLinks>
+        <bpel:partnerLink name="TestCase" partnerLinkType="saw:TestCase" myRole="WorkflowRole" />
+    </bpel:partnerLinks>
+    <bpel:variables>
+        <bpel:variable name="In" messageType="saw:ExecuteWorkflowSoapIn" />
+    </bpel:variables>
+    <bpel:sequence name="Outer_Workflow">
+        <bpel:receive name="Receive" partnerLink="TestCase" portType="saw:Workflow" operation="ExecuteWorkflow" variable="In" createInstance="yes"/>
+        <bpel:flow name="EndlessRunningFlowOfPain">
+            <bpel:links>
+                <bpel:link name="transition1"/>
+                <bpel:link name="transition2"/>
+                <bpel:link name="transition3"/>
+                <bpel:link name="transition4" />
+                <bpel:link name="test_foo" />
+            </bpel:links>
+            <bpel:sequence name="State-Actioning_Start">
+                <bpel:sources>
+                    <bpel:source linkName="transition1" />
+                </bpel:sources>
+                <bpel:empty/>
+            </bpel:sequence>
+            <bpel:if name="TransitionResolver">
+                <bpel:targets>
+                    <bpel:target linkName="transition1" />
+                </bpel:targets>
+                <bpel:condition>false()</bpel:condition>
+                <bpel:empty>
+                    <bpel:sources>
+                        <bpel:source linkName="transition2" />
+                    </bpel:sources>
+                </bpel:empty>
+                <bpel:elseif>
+                    <bpel:condition>true()</bpel:condition>
+                    <bpel:empty>
+                        <bpel:sources>
+                            <bpel:source linkName="test_foo" />
+                        </bpel:sources>
+                    </bpel:empty>
+                </bpel:elseif>
+                <bpel:else>
+                    <bpel:throw faultName="saw:TransitionConditionOutOfRangeException" />
+                </bpel:else>
+            </bpel:if>
+            <bpel:empty name="test_foo_flow">
+                <bpel:targets>
+                    <bpel:target linkName="test_foo" />
+                </bpel:targets>
+                <bpel:empty/>
+            </bpel:empty>
+            <bpel:sequence name="State-Inbound_Workflows_Selectors" suppressJoinFailure="yes">
+                <bpel:targets>
+                    <bpel:target linkName="transition2" />
+                </bpel:targets>
+                <bpel:sources>
+                    <bpel:source linkName="transition3" />
+                </bpel:sources>
+                <bpel:empty/>
+            </bpel:sequence>
+            <bpel:if name="TransitionResolver2" suppressJoinFailure="yes">
+                <bpel:targets>
+                    <bpel:target linkName="transition3" />
+                </bpel:targets>
+                <bpel:condition> true() </bpel:condition>
+                <bpel:empty name="should-be-dpe">
+                    <bpel:sources>
+                        <bpel:source linkName="transition4" />
+                    </bpel:sources>
+                </bpel:empty>
+                <bpel:else>
+                    <bpel:empty />
+                </bpel:else>
+            </bpel:if>
+            <bpel:sequence name="State-Simple_Inbound" suppressJoinFailure="yes">
+                <bpel:targets>
+                    <bpel:target linkName="transition4" />
+                </bpel:targets>
+                <bpel:empty />
+            </bpel:sequence>
+        </bpel:flow>
+        <bpel:reply name="Reply" partnerLink="TestCase" portType="saw:Workflow" operation="ExecuteWorkflow" variable="In"/>
+    </bpel:sequence>
 </bpel:process>
\ No newline at end of file

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFlowLinks/TestCase.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFlowLinks/TestCase.wsdl?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFlowLinks/TestCase.wsdl (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFlowLinks/TestCase.wsdl Fri Jan 23 23:53:17 2009
@@ -1,66 +1,66 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<wsdl:definitions name="TestCase"  
-				  xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable"  
-				  xmlns:saw="workflowns"  
-				  xmlns:wsa="http://schemas.xmlsoap.org/ws/2003/03/addressing"  
-				  xmlns:xs="http://www.w3.org/2001/XMLSchema"  
-				  xmlns="http://schemas.xmlsoap.org/wsdl/"  
-				  targetNamespace="workflowns"
-                  xmlns:bpws="http://schemas.xmlsoap.org/ws/2003/03/business-process/" 
-                  xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
-                  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-                  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
-                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-  <wsdl:types>
-    <xsd:schema attributeFormDefault="unqualified" elementFormDefault="qualified" 
-		xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-		targetNamespace="workflowns">
-        <xsd:element name="ExecuteWorkflow">
-			<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="value" type="xsd:string"/>
-					</xsd:sequence>
-			</xsd:complexType>
-			</xsd:element>
-		<xsd:element name="ExecuteWorkflowResponse">
-				<xsd:complexType>
-					<xsd:sequence>
-						<xsd:element name="value" type="xsd:string"/>
-					</xsd:sequence>
-				</xsd:complexType>
-			</xsd:element>
-		</xsd:schema>
-  </wsdl:types>
-  <wsdl:message name="ExecuteWorkflowSoapIn">
-    <wsdl:part name="parameters" element="saw:ExecuteWorkflow"/>
-  </wsdl:message>
-  <wsdl:message name="ExecuteWorkflowSoapOut">
-    <wsdl:part name="parameters" element="saw:ExecuteWorkflowResponse"/>
-  </wsdl:message>
-  <wsdl:portType name="Workflow">
-    <wsdl:operation name="ExecuteWorkflow">
-      <wsdl:input message="saw:ExecuteWorkflowSoapIn"/>
-      <wsdl:output message="saw:ExecuteWorkflowSoapIn"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  <wsdl:binding name="WorkflowSOAP" type="saw:Workflow">
-    <soap:binding xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-    <wsdl:operation name="ExecuteWorkflow">
-    <soap:operation xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" soapAction="workflowns/ExecuteWorkflow"/>
-      <wsdl:input>
-    <soap:body xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" use="literal"/>
-      </wsdl:input>
-      <wsdl:output>
-    <soap:body xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" use="literal"/>
-      </wsdl:output>
-    </wsdl:operation>
-  </wsdl:binding> 
-  <wsdl:service name="TestCase">
-	<wsdl:port name="Workflow" binding="saw:WorkflowSOAP">
-		<soap:address location="http://localhost:8080/ode/processes/TestCase"/>
-	</wsdl:port>
-  </wsdl:service>
-  <plnk:partnerLinkType name="TestCase">
-	<plnk:role name="WorkflowRole" portType="saw:Workflow"/>
-  </plnk:partnerLinkType>  
+<?xml version="1.0" encoding="UTF-8"?>
+<wsdl:definitions name="TestCase"  
+				  xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable"  
+				  xmlns:saw="workflowns"  
+				  xmlns:wsa="http://schemas.xmlsoap.org/ws/2003/03/addressing"  
+				  xmlns:xs="http://www.w3.org/2001/XMLSchema"  
+				  xmlns="http://schemas.xmlsoap.org/wsdl/"  
+				  targetNamespace="workflowns"
+                  xmlns:bpws="http://schemas.xmlsoap.org/ws/2003/03/business-process/" 
+                  xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
+                  xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+                  xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" 
+                  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
+  <wsdl:types>
+    <xsd:schema attributeFormDefault="unqualified" elementFormDefault="qualified" 
+		xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
+		targetNamespace="workflowns">
+        <xsd:element name="ExecuteWorkflow">
+			<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element name="value" type="xsd:string"/>
+					</xsd:sequence>
+			</xsd:complexType>
+			</xsd:element>
+		<xsd:element name="ExecuteWorkflowResponse">
+				<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element name="value" type="xsd:string"/>
+					</xsd:sequence>
+				</xsd:complexType>
+			</xsd:element>
+		</xsd:schema>
+  </wsdl:types>
+  <wsdl:message name="ExecuteWorkflowSoapIn">
+    <wsdl:part name="parameters" element="saw:ExecuteWorkflow"/>
+  </wsdl:message>
+  <wsdl:message name="ExecuteWorkflowSoapOut">
+    <wsdl:part name="parameters" element="saw:ExecuteWorkflowResponse"/>
+  </wsdl:message>
+  <wsdl:portType name="Workflow">
+    <wsdl:operation name="ExecuteWorkflow">
+      <wsdl:input message="saw:ExecuteWorkflowSoapIn"/>
+      <wsdl:output message="saw:ExecuteWorkflowSoapIn"/>
+    </wsdl:operation>
+  </wsdl:portType>
+  <wsdl:binding name="WorkflowSOAP" type="saw:Workflow">
+    <soap:binding xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+    <wsdl:operation name="ExecuteWorkflow">
+    <soap:operation xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" soapAction="workflowns/ExecuteWorkflow"/>
+      <wsdl:input>
+    <soap:body xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" use="literal"/>
+      </wsdl:input>
+      <wsdl:output>
+    <soap:body xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" use="literal"/>
+      </wsdl:output>
+    </wsdl:operation>
+  </wsdl:binding> 
+  <wsdl:service name="TestCase">
+	<wsdl:port name="Workflow" binding="saw:WorkflowSOAP">
+		<soap:address location="http://localhost:8080/ode/processes/TestCase"/>
+	</wsdl:port>
+  </wsdl:service>
+  <plnk:partnerLinkType name="TestCase">
+	<plnk:role name="WorkflowRole" portType="saw:Workflow"/>
+  </plnk:partnerLinkType>  
 </wsdl:definitions>
\ No newline at end of file

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFlowLinks/deploy.xml
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFlowLinks/deploy.xml?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFlowLinks/deploy.xml (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFlowLinks/deploy.xml Fri Jan 23 23:53:17 2009
@@ -1,13 +1,13 @@
-<?xml version="1.0"?>
-<deploy xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
-		xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.apache.org/ode/schemas/dd/2007/03">
-  <process xmlns:q1="workflowns" name="q1:TestCase">
-    <provide partnerLink="TestCase">
-      <service name="q1:TestCase" port="Workflow" />
-    </provide>
-  </process>
-  <process-events>
-    <enable-event>dataHandling</enable-event>
-    <enable-event>activityLifecycle</enable-event>
-  </process-events>  
+<?xml version="1.0"?>
+<deploy xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" 
+		xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://www.apache.org/ode/schemas/dd/2007/03">
+  <process xmlns:q1="workflowns" name="q1:TestCase">
+    <provide partnerLink="TestCase">
+      <service name="q1:TestCase" port="Workflow" />
+    </provide>
+  </process>
+  <process-events>
+    <enable-event>dataHandling</enable-event>
+    <enable-event>activityLifecycle</enable-event>
+  </process-events>  
 </deploy>
\ No newline at end of file

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestForEach/foreach.xsd
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestForEach/foreach.xsd?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestForEach/foreach.xsd (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestForEach/foreach.xsd Fri Jan 23 23:53:17 2009
@@ -17,12 +17,12 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
-	targetNamespace="http://www.example.org/jms"
-	xmlns:tns="http://www.example.org/foreach"
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema"
+	targetNamespace="http://www.example.org/jms"
+	xmlns:tns="http://www.example.org/foreach"
 	elementFormDefault="qualified">
-
-    <xs:element name="input" type="xs:string" />
-</xs:schema>
-
-
+
+    <xs:element name="input" type="xs:string" />
+</xs:schema>
+
+

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestImplicitFaultHandler/TestImplicitFaultHandler.bpel
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestImplicitFaultHandler/TestImplicitFaultHandler.bpel?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestImplicitFaultHandler/TestImplicitFaultHandler.bpel (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestImplicitFaultHandler/TestImplicitFaultHandler.bpel Fri Jan 23 23:53:17 2009
@@ -109,4 +109,4 @@
 		<reply name="reply" partnerLink="request" portType="wns:testImplicitFaultHandlerPT" operation="request" variable="reply2"> </reply>
 	</sequence>
 
-</process>
+</process>

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestImplicitFaultHandler/TestImplicitFaultHandler.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestImplicitFaultHandler/TestImplicitFaultHandler.wsdl?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestImplicitFaultHandler/TestImplicitFaultHandler.wsdl (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestImplicitFaultHandler/TestImplicitFaultHandler.wsdl Fri Jan 23 23:53:17 2009
@@ -1,61 +1,61 @@
-<!--
-  ~ 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/testImplicitFaultHandler.wsdl"
-  xmlns:tns="http://ode/bpel/unit-test/testImplicitFaultHandler.wsdl"
-  xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
-  xmlns:flt="http://ode/bpel/unit-test/FaultService.wsdl"
-  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-  xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"      
-  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
-
-  
-  <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="replyText" type="xsd:string"/>
-  </wsdl:message>
-
-  <wsdl:portType name="testImplicitFaultHandlerPT">
-    <wsdl:operation name="request">
-      <wsdl:input message="tns:requestMessage"/>
-      <wsdl:output message="tns:replyMessage"></wsdl:output>
-    </wsdl:operation>
-  </wsdl:portType>
-
-  <plnk:partnerLinkType name="testImplicitFaultHandlerRequest">
-    <plnk:role name="testImplicitFaultHandlerService" portType="tns:testImplicitFaultHandlerPT"/>
-  </plnk:partnerLinkType>
-  
-  <plnk:partnerLinkType name="probeRequest">
-    <plnk:role name="probeService" portType="prb:probeMessagePT"/>
-  </plnk:partnerLinkType>
-  
-  <plnk:partnerLinkType name="faultRequest">
-    <plnk:role name="faultService" portType="flt:faultMessagePT"/>
-  </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/testImplicitFaultHandler.wsdl"
+  xmlns:tns="http://ode/bpel/unit-test/testImplicitFaultHandler.wsdl"
+  xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
+  xmlns:flt="http://ode/bpel/unit-test/FaultService.wsdl"
+  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+  xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"      
+  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+  xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+
+  
+  <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="replyText" type="xsd:string"/>
+  </wsdl:message>
+
+  <wsdl:portType name="testImplicitFaultHandlerPT">
+    <wsdl:operation name="request">
+      <wsdl:input message="tns:requestMessage"/>
+      <wsdl:output message="tns:replyMessage"></wsdl:output>
+    </wsdl:operation>
+  </wsdl:portType>
+
+  <plnk:partnerLinkType name="testImplicitFaultHandlerRequest">
+    <plnk:role name="testImplicitFaultHandlerService" portType="tns:testImplicitFaultHandlerPT"/>
+  </plnk:partnerLinkType>
+  
+  <plnk:partnerLinkType name="probeRequest">
+    <plnk:role name="probeService" portType="prb:probeMessagePT"/>
+  </plnk:partnerLinkType>
+  
+  <plnk:partnerLinkType name="faultRequest">
+    <plnk:role name="faultService" portType="flt:faultMessagePT"/>
+  </plnk:partnerLinkType>
+
+</wsdl:definitions>

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestInstantiatingPick/TestInstantiatingPick.bpel
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestInstantiatingPick/TestInstantiatingPick.bpel?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestInstantiatingPick/TestInstantiatingPick.bpel (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestInstantiatingPick/TestInstantiatingPick.bpel Fri Jan 23 23:53:17 2009
@@ -1,183 +1,183 @@
-<!--
-	~ Licensed to the Apache Software Foundation (ASF) under one
-	~ or more contributor license agreements.  See the NOTICE file
-	~ distributed with this work for additional information
-	~ regarding copyright ownership.  The ASF licenses this file
-	~ to you under the Apache License, Version 2.0 (the
-	~ "License"); you may not use this file except in compliance
-	~ with the License.  You may obtain a copy of the License at
-	~
-	~    http://www.apache.org/licenses/LICENSE-2.0
-	~
-	~ Unless required by applicable law or agreed to in writing,
-	~ software distributed under the License is distributed on an
-	~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-	~ KIND, either express or implied.  See the License for the
-	~ specific language governing permissions and limitations
-	~ under the License.
--->
-
-<process xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://docs.oasis-open.org/wsbpel/2.0/process/executable ../../../../../../../bpel-schemas/src/main/resources/wsbpel_executable.xsd"
-         xmlns:tns="http://ode/bpel/unit-test/TestInstantiatingPick"
-         xmlns:wns="http://ode/bpel/unit-test/TestInstantiatingPick.wsdl"
-         xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
-         xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
-         name="TestInstantiatingPick"
-         targetNamespace="http://ode/bpel/unit-test/TestInstantiatingPick"
-         queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
-         expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
-         suppressJoinFailure="yes">
-
-    <!-- Unit test process instantiating pick -->
-    <import location="TestInstantiatingPick.wsdl"
-            namespace="http://ode/bpel/unit-test/TestInstantiatingPick.wsdl"
-            importType="http://schemas.xmlsoap.org/wsdl/" />
-    <import location="../ProbeService/probeService.wsdl"
-            namespace="http://ode/bpel/unit-test/ProbeService.wsdl"
-            importType="http://schemas.xmlsoap.org/wsdl/"/>
-
-
-    <partnerLinks>
-        <partnerLink name="request1" partnerLinkType="wns:testInstPick1Request" myRole="testInstPick1Service"/>
-        <partnerLink name="request2" partnerLinkType="wns:testInstPick2Request" myRole="testInstPick2Service"/>
-        <partnerLink name="probe" partnerLinkType="wns:probeRequest" partnerRole="probeService" initializePartnerRole="yes"/>
-    </partnerLinks>
-
-    <variables>
-        <variable name="request" messageType="wns:requestMessage"/>
-        <variable name="probeInput" messageType="prb:probeMessage"/>
-        <variable name="reply" messageType="wns:replyMessage"/>
-    </variables>
-
-
-    <pick name="testPick" createInstance="yes">
-        <onMessage partnerLink="request1"
-                   portType="wns:testInstPick1PT" operation="request" variable="request">
-            <sequence>
-                <assign name="assign1">
-                    <copy>
-                        <from variable="request" property="wns:testProbeID"/>
-                        <to variable="probeInput" part="probeName"/>
-                    </copy>
-                    <copy>
-                        <from variable="request" part="requestText"/>
-                        <to variable="probeInput" part="probeData"/>
-                    </copy>
-                </assign>
-
-                <assign>
-                    <copy>
-                        <from>
-                            <literal><![CDATA[pick branch one invoked]]></literal>
-                        </from>
-                        <to variable="probeInput" part="probeName"/>
-                    </copy>
-                </assign>
-
-                <invoke name="probe" partnerLink="probe"
-                        portType="prb:probeMessagePT"
-                        operation="probe"
-                        inputVariable="probeInput"
-                        outputVariable="probeInput">
-                </invoke>
-
-                <assign>
-                    <copy>
-                        <from>
-                            <literal><![CDATA[process complete]]></literal>
-                        </from>
-                        <to variable="probeInput" part="probeName"/>
-                    </copy>
-                </assign>
-
-                <invoke name="probe" partnerLink="probe"
-                        portType="prb:probeMessagePT"
-                        operation="probe"
-                        inputVariable="probeInput"
-                        outputVariable="probeInput">
-                </invoke>
-
-                <assign name="assign2">
-                    <copy>
-                        <from variable="probeInput" part="probeName"/>
-                        <to variable="reply" part="replyID"/>
-                    </copy>
-                    <copy>
-                        <from variable="probeInput" part="probeData"/>
-                        <to variable="reply" part="replyText"/>
-                    </copy>
-                </assign>
-
-                <reply name="reply" partnerLink="request1" portType="wns:testInstPick1PT"
-                       operation="request" variable="reply">
-                </reply>
-
-            </sequence>
-        </onMessage>
-        <onMessage partnerLink="request2"
-                   portType="wns:testInstPick2PT" operation="request" variable="request">
-            <sequence>
-                <assign name="assign1">
-                    <copy>
-                        <from variable="request" property="wns:testProbeID"/>
-                        <to variable="probeInput" part="probeName"/>
-                    </copy>
-                    <copy>
-                        <from variable="request" part="requestText"/>
-                        <to variable="probeInput" part="probeData"/>
-                    </copy>
-                </assign>
-
-                <assign>
-                    <copy>
-                        <from>
-                            <literal><![CDATA[pick branch two invoked]]></literal>
-                        </from>
-                        <to variable="probeInput" part="probeName"/>
-                    </copy>
-                </assign>
-
-                <invoke name="probe" partnerLink="probe"
-                        portType="prb:probeMessagePT"
-                        operation="probe"
-                        inputVariable="probeInput"
-                        outputVariable="probeInput">
-                </invoke>
-
-                <assign>
-                    <copy>
-                        <from>
-                            <literal><![CDATA[process complete]]></literal>
-                        </from>
-                        <to variable="probeInput" part="probeName"/>
-                    </copy>
-                </assign>
-
-                <invoke name="probe" partnerLink="probe"
-                        portType="prb:probeMessagePT"
-                        operation="probe"
-                        inputVariable="probeInput"
-                        outputVariable="probeInput">
-                </invoke>
-
-                <assign name="assign2">
-                    <copy>
-                        <from variable="probeInput" part="probeName"/>
-                        <to variable="reply" part="replyID"/>
-                    </copy>
-                    <copy>
-                        <from variable="probeInput" part="probeData"/>
-                        <to variable="reply" part="replyText"/>
-                    </copy>
-                </assign>
-
-                <reply name="reply" partnerLink="request2" portType="wns:testInstPick2PT"
-                       operation="request" variable="reply">
-                </reply>
-
-            </sequence>
-        </onMessage>
-    </pick>
-
-</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/TestInstantiatingPick"
+         xmlns:wns="http://ode/bpel/unit-test/TestInstantiatingPick.wsdl"
+         xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
+         xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+         name="TestInstantiatingPick"
+         targetNamespace="http://ode/bpel/unit-test/TestInstantiatingPick"
+         queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+         expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+         suppressJoinFailure="yes">
+
+    <!-- Unit test process instantiating pick -->
+    <import location="TestInstantiatingPick.wsdl"
+            namespace="http://ode/bpel/unit-test/TestInstantiatingPick.wsdl"
+            importType="http://schemas.xmlsoap.org/wsdl/" />
+    <import location="../ProbeService/probeService.wsdl"
+            namespace="http://ode/bpel/unit-test/ProbeService.wsdl"
+            importType="http://schemas.xmlsoap.org/wsdl/"/>
+
+
+    <partnerLinks>
+        <partnerLink name="request1" partnerLinkType="wns:testInstPick1Request" myRole="testInstPick1Service"/>
+        <partnerLink name="request2" partnerLinkType="wns:testInstPick2Request" myRole="testInstPick2Service"/>
+        <partnerLink name="probe" partnerLinkType="wns:probeRequest" partnerRole="probeService" initializePartnerRole="yes"/>
+    </partnerLinks>
+
+    <variables>
+        <variable name="request" messageType="wns:requestMessage"/>
+        <variable name="probeInput" messageType="prb:probeMessage"/>
+        <variable name="reply" messageType="wns:replyMessage"/>
+    </variables>
+
+
+    <pick name="testPick" createInstance="yes">
+        <onMessage partnerLink="request1"
+                   portType="wns:testInstPick1PT" operation="request" variable="request">
+            <sequence>
+                <assign name="assign1">
+                    <copy>
+                        <from variable="request" property="wns:testProbeID"/>
+                        <to variable="probeInput" part="probeName"/>
+                    </copy>
+                    <copy>
+                        <from variable="request" part="requestText"/>
+                        <to variable="probeInput" part="probeData"/>
+                    </copy>
+                </assign>
+
+                <assign>
+                    <copy>
+                        <from>
+                            <literal><![CDATA[pick branch one invoked]]></literal>
+                        </from>
+                        <to variable="probeInput" part="probeName"/>
+                    </copy>
+                </assign>
+
+                <invoke name="probe" partnerLink="probe"
+                        portType="prb:probeMessagePT"
+                        operation="probe"
+                        inputVariable="probeInput"
+                        outputVariable="probeInput">
+                </invoke>
+
+                <assign>
+                    <copy>
+                        <from>
+                            <literal><![CDATA[process complete]]></literal>
+                        </from>
+                        <to variable="probeInput" part="probeName"/>
+                    </copy>
+                </assign>
+
+                <invoke name="probe" partnerLink="probe"
+                        portType="prb:probeMessagePT"
+                        operation="probe"
+                        inputVariable="probeInput"
+                        outputVariable="probeInput">
+                </invoke>
+
+                <assign name="assign2">
+                    <copy>
+                        <from variable="probeInput" part="probeName"/>
+                        <to variable="reply" part="replyID"/>
+                    </copy>
+                    <copy>
+                        <from variable="probeInput" part="probeData"/>
+                        <to variable="reply" part="replyText"/>
+                    </copy>
+                </assign>
+
+                <reply name="reply" partnerLink="request1" portType="wns:testInstPick1PT"
+                       operation="request" variable="reply">
+                </reply>
+
+            </sequence>
+        </onMessage>
+        <onMessage partnerLink="request2"
+                   portType="wns:testInstPick2PT" operation="request" variable="request">
+            <sequence>
+                <assign name="assign1">
+                    <copy>
+                        <from variable="request" property="wns:testProbeID"/>
+                        <to variable="probeInput" part="probeName"/>
+                    </copy>
+                    <copy>
+                        <from variable="request" part="requestText"/>
+                        <to variable="probeInput" part="probeData"/>
+                    </copy>
+                </assign>
+
+                <assign>
+                    <copy>
+                        <from>
+                            <literal><![CDATA[pick branch two invoked]]></literal>
+                        </from>
+                        <to variable="probeInput" part="probeName"/>
+                    </copy>
+                </assign>
+
+                <invoke name="probe" partnerLink="probe"
+                        portType="prb:probeMessagePT"
+                        operation="probe"
+                        inputVariable="probeInput"
+                        outputVariable="probeInput">
+                </invoke>
+
+                <assign>
+                    <copy>
+                        <from>
+                            <literal><![CDATA[process complete]]></literal>
+                        </from>
+                        <to variable="probeInput" part="probeName"/>
+                    </copy>
+                </assign>
+
+                <invoke name="probe" partnerLink="probe"
+                        portType="prb:probeMessagePT"
+                        operation="probe"
+                        inputVariable="probeInput"
+                        outputVariable="probeInput">
+                </invoke>
+
+                <assign name="assign2">
+                    <copy>
+                        <from variable="probeInput" part="probeName"/>
+                        <to variable="reply" part="replyID"/>
+                    </copy>
+                    <copy>
+                        <from variable="probeInput" part="probeData"/>
+                        <to variable="reply" part="replyText"/>
+                    </copy>
+                </assign>
+
+                <reply name="reply" partnerLink="request2" portType="wns:testInstPick2PT"
+                       operation="request" variable="reply">
+                </reply>
+
+            </sequence>
+        </onMessage>
+    </pick>
+
+</process>

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestInstantiatingPick/TestInstantiatingPick.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestInstantiatingPick/TestInstantiatingPick.wsdl?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestInstantiatingPick/TestInstantiatingPick.wsdl (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestInstantiatingPick/TestInstantiatingPick.wsdl Fri Jan 23 23:53:17 2009
@@ -1,88 +1,88 @@
-<!--
-   ~ 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/TestInstantiatingPick.wsdl"
-   xmlns:tns="http://ode/bpel/unit-test/TestInstantiatingPick.wsdl"
-   xmlns="http://ode/bpel/unit-test/TestInstantiatingPick.wsdl"
-   xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
-   xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-   xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"      
-   xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-   xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
-   xmlns:prop="http://docs.oasis-open.org/wsbpel/2.0/varprop">
-
-   <wsdl:message name="requestMessage">
-      <wsdl:part name="requestID" type="xsd:string"/>
-      <wsdl:part name="requestText" 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>
-
-   <wsdl:portType name="testInstPick1PT">
-      <wsdl:operation name="request">
-         <wsdl:input message="requestMessage"/>
-         <wsdl:output message="replyMessage"/>
-      </wsdl:operation>
-   </wsdl:portType>
-
-   <wsdl:portType name="testInstPick2PT">
-      <wsdl:operation name="request">
-         <wsdl:input message="requestMessage"/>
-         <wsdl:output message="replyMessage"/>
-      </wsdl:operation>
-   </wsdl:portType>
-
-   <wsdl:binding name="testInstPick1Binding" type="tns:testInstPick1PT">
-      <wsdl:operation name="request">
-      </wsdl:operation>
-   </wsdl:binding>
-   <wsdl:service name="testInstPick1Service">
-      <wsdl:port name="testInstPick1Port" binding="tns:testInstPick1Binding">
-      </wsdl:port>
-   </wsdl:service>
-   
-   <wsdl:binding name="testInstPick2Binding" type="tns:testInstPick2PT">
-      <wsdl:operation name="request">
-      </wsdl:operation>
-   </wsdl:binding>
-   <wsdl:service name="testInstPick2Service">
-      <wsdl:port name="testInstPick2Port" binding="tns:testInstPick2Binding">
-      </wsdl:port>
-   </wsdl:service>
-
-   <plnk:partnerLinkType name="testInstPick1Request">
-      <plnk:role name="testInstPick1Service" portType="testInstPick1PT"/>
-   </plnk:partnerLinkType>
-
-   <plnk:partnerLinkType name="testInstPick2Request">
-      <plnk:role name="testInstPick2Service" portType="testInstPick2PT"/>
-   </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="requestID"/>
-
-</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/TestInstantiatingPick.wsdl"
+   xmlns:tns="http://ode/bpel/unit-test/TestInstantiatingPick.wsdl"
+   xmlns="http://ode/bpel/unit-test/TestInstantiatingPick.wsdl"
+   xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
+   xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+   xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"      
+   xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+   xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+   xmlns:prop="http://docs.oasis-open.org/wsbpel/2.0/varprop">
+
+   <wsdl:message name="requestMessage">
+      <wsdl:part name="requestID" type="xsd:string"/>
+      <wsdl:part name="requestText" 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>
+
+   <wsdl:portType name="testInstPick1PT">
+      <wsdl:operation name="request">
+         <wsdl:input message="requestMessage"/>
+         <wsdl:output message="replyMessage"/>
+      </wsdl:operation>
+   </wsdl:portType>
+
+   <wsdl:portType name="testInstPick2PT">
+      <wsdl:operation name="request">
+         <wsdl:input message="requestMessage"/>
+         <wsdl:output message="replyMessage"/>
+      </wsdl:operation>
+   </wsdl:portType>
+
+   <wsdl:binding name="testInstPick1Binding" type="tns:testInstPick1PT">
+      <wsdl:operation name="request">
+      </wsdl:operation>
+   </wsdl:binding>
+   <wsdl:service name="testInstPick1Service">
+      <wsdl:port name="testInstPick1Port" binding="tns:testInstPick1Binding">
+      </wsdl:port>
+   </wsdl:service>
+   
+   <wsdl:binding name="testInstPick2Binding" type="tns:testInstPick2PT">
+      <wsdl:operation name="request">
+      </wsdl:operation>
+   </wsdl:binding>
+   <wsdl:service name="testInstPick2Service">
+      <wsdl:port name="testInstPick2Port" binding="tns:testInstPick2Binding">
+      </wsdl:port>
+   </wsdl:service>
+
+   <plnk:partnerLinkType name="testInstPick1Request">
+      <plnk:role name="testInstPick1Service" portType="testInstPick1PT"/>
+   </plnk:partnerLinkType>
+
+   <plnk:partnerLinkType name="testInstPick2Request">
+      <plnk:role name="testInstPick2Service" portType="testInstPick2PT"/>
+   </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="requestID"/>
+
+</wsdl:definitions>

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestMsgDate/BugFromNodeDateTimeToWait-Pool.bpel
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestMsgDate/BugFromNodeDateTimeToWait-Pool.bpel?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestMsgDate/BugFromNodeDateTimeToWait-Pool.bpel (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestMsgDate/BugFromNodeDateTimeToWait-Pool.bpel Fri Jan 23 23:53:17 2009
@@ -1,26 +1,26 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<bpel:process xmlns:bpel="http://schemas.xmlsoap.org/ws/2004/03/business-process/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:pnlk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/" xmlns:Pool0="http://example.com/BugFromNodeDateTimeToWait/Pool0" xmlns:tns="http://www.example.org/NewXMLSchema" xmlns:this="http://example.com/BugFromNodeDateTimeToWait/Pool" xmlns:diag="http://example.com/BugFromNodeDateTimeToWait" xmlns:bpmn="http://www.intalio.com/bpms" xmlns:atomic="http://ode.apache.org/atomicScope" queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0" expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0" bpmn:label="Pool" bpmn:id="_Dn0p0Oc8EdyCLdedvglBCQ" name="Pool" targetNamespace="http://example.com/BugFromNodeDateTimeToWait/Pool">
-  <bpel:import namespace="http://example.com/BugFromNodeDateTimeToWait" location="BugFromNodeDateTimeToWait.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
-  <bpel:import namespace="http://example.com/BugFromNodeDateTimeToWait/Pool" location="BugFromNodeDateTimeToWait-Pool.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
-  <bpel:partnerLinks>
-    <bpel:partnerLink name="pool0AndPoolPlkVar" partnerLinkType="diag:Pool0AndPool" myRole="Pool_for_Pool0"/>
-  </bpel:partnerLinks>
-  <bpel:variables>
-    <bpel:variable name="thisTaskRequestMsg" messageType="this:TaskRequest"/>
-    <bpel:variable name="thisTaskResponseMsg" messageType="this:TaskResponse"/>
-  </bpel:variables>
-  <bpel:sequence>
-    <bpel:receive partnerLink="pool0AndPoolPlkVar" portType="this:ForPool0" operation="Task"
-                  variable="thisTaskRequestMsg" createInstance="yes"/>
-    <bpel:assign name="init-variables-Pool">
-      <bpel:copy bpmn:label="$thisTaskResponseMsg">
-        <bpel:from>$thisTaskRequestMsg.body</bpel:from>
-        <bpel:to>$thisTaskResponseMsg.body</bpel:to>
-      </bpel:copy>
-    </bpel:assign>
-    <bpel:wait bpmn:label="EventIntermediateTimer" bpmn:id="_G71_UOc8EdyCLdedvglBCQ">
-      <bpel:until>$thisTaskRequestMsg.body</bpel:until>
-    </bpel:wait>
-    <bpel:reply partnerLink="pool0AndPoolPlkVar" portType="this:ForPool0" operation="Task" variable="thisTaskResponseMsg" bpmn:label="Task" bpmn:id="_HbE5AOc8EdyCLdedvglBCQ"></bpel:reply>
-  </bpel:sequence>
+<?xml version="1.0" encoding="UTF-8"?>
+<bpel:process xmlns:bpel="http://schemas.xmlsoap.org/ws/2004/03/business-process/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:pnlk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/" xmlns:Pool0="http://example.com/BugFromNodeDateTimeToWait/Pool0" xmlns:tns="http://www.example.org/NewXMLSchema" xmlns:this="http://example.com/BugFromNodeDateTimeToWait/Pool" xmlns:diag="http://example.com/BugFromNodeDateTimeToWait" xmlns:bpmn="http://www.intalio.com/bpms" xmlns:atomic="http://ode.apache.org/atomicScope" queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0" expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0" bpmn:label="Pool" bpmn:id="_Dn0p0Oc8EdyCLdedvglBCQ" name="Pool" targetNamespace="http://example.com/BugFromNodeDateTimeToWait/Pool">
+  <bpel:import namespace="http://example.com/BugFromNodeDateTimeToWait" location="BugFromNodeDateTimeToWait.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+  <bpel:import namespace="http://example.com/BugFromNodeDateTimeToWait/Pool" location="BugFromNodeDateTimeToWait-Pool.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+  <bpel:partnerLinks>
+    <bpel:partnerLink name="pool0AndPoolPlkVar" partnerLinkType="diag:Pool0AndPool" myRole="Pool_for_Pool0"/>
+  </bpel:partnerLinks>
+  <bpel:variables>
+    <bpel:variable name="thisTaskRequestMsg" messageType="this:TaskRequest"/>
+    <bpel:variable name="thisTaskResponseMsg" messageType="this:TaskResponse"/>
+  </bpel:variables>
+  <bpel:sequence>
+    <bpel:receive partnerLink="pool0AndPoolPlkVar" portType="this:ForPool0" operation="Task"
+                  variable="thisTaskRequestMsg" createInstance="yes"/>
+    <bpel:assign name="init-variables-Pool">
+      <bpel:copy bpmn:label="$thisTaskResponseMsg">
+        <bpel:from>$thisTaskRequestMsg.body</bpel:from>
+        <bpel:to>$thisTaskResponseMsg.body</bpel:to>
+      </bpel:copy>
+    </bpel:assign>
+    <bpel:wait bpmn:label="EventIntermediateTimer" bpmn:id="_G71_UOc8EdyCLdedvglBCQ">
+      <bpel:until>$thisTaskRequestMsg.body</bpel:until>
+    </bpel:wait>
+    <bpel:reply partnerLink="pool0AndPoolPlkVar" portType="this:ForPool0" operation="Task" variable="thisTaskResponseMsg" bpmn:label="Task" bpmn:id="_HbE5AOc8EdyCLdedvglBCQ"></bpel:reply>
+  </bpel:sequence>
 </bpel:process>
\ No newline at end of file