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 [5/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/TestDynamicPick/TestDynamicPick.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/TestDynamicPick.wsdl?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/TestDynamicPick.wsdl (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/TestDynamicPick.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/TestDynamicPick.wsdl"
-  xmlns:tns="http://ode/bpel/unit-test/TestDynamicPick.wsdl"
-  xmlns:typens="http://ode/bpel/unit-test/TestDynamicPick.wsdl.types"
-  xmlns="http://ode/bpel/unit-test/TestDynamicPick.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:types>
-    <xsd:schema
-      targetNamespace="http://ode/bpel/unit-test/TestDynamicPick.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="requestKey1" type="xsd:string"/>
-          <xsd:element name="requestKey2" 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="TestDynamicPickPT">
-    <wsdl:operation name="request">
-      <wsdl:input message="requestMessage"/>
-      <wsdl:output message="replyMessage"/>
-    </wsdl:operation>
-    <wsdl:operation name="continue1">
-      <wsdl:input message="requestMessage"/>
-    </wsdl:operation>
-    <wsdl:operation name="continue2">
-      <wsdl:input message="requestMessage"/>
-    </wsdl:operation>
-  </wsdl:portType>
-  
-  <wsdl:binding name="TestDynamicPickBinding" type="tns:TestDynamicPickPT">
-    <wsdl:operation name="request">
-    </wsdl:operation>
-    <wsdl:operation name="continue1">
-    </wsdl:operation>
-    <wsdl:operation name="continue2">
-    </wsdl:operation>
-  </wsdl:binding>
-  <wsdl:service name="TestDynamicPickService">
-    <wsdl:port name="TestDynamicPickPort" binding="tns:TestDynamicPickBinding">
-    </wsdl:port>
-  </wsdl:service>
-
-  <plnk:partnerLinkType name="TestDynamicPickRequest">
-    <plnk:role name="TestDynamicPickService" portType="TestDynamicPickPT"/>
-   </plnk:partnerLinkType>
-
-   <plnk:partnerLinkType name="probeRequest">
-	<plnk:role name="probeService" portType="prb:probeMessagePT"/>
-   </plnk:partnerLinkType>
-   
-  <prop:property name="testProbeKey1" type="xsd:string"/>
-  <prop:propertyAlias propertyName="tns:testProbeKey1" messageType="tns:requestMessage" part="requestMessageData">
-    <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-      requestKey1
-    </prop:query>
-  </prop:propertyAlias>
-  
-  <prop:property name="testProbeKey2" type="xsd:string"/>
-  <prop:propertyAlias propertyName="tns:testProbeKey2" messageType="tns:requestMessage" part="requestMessageData">
-    <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-      requestKey2
-    </prop:query>
-  </prop:propertyAlias>
-  
-  <prop:property name="testProbeID" type="xsd:string"/>
-  <prop:propertyAlias propertyName="tns:testProbeID" messageType="tns:requestMessage" part="requestMessageData">
-    <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-      requestID
-    </prop:query>
-  </prop:propertyAlias>
-  
-  <prop:property name="testProbeData" type="xsd:string"/>
-  <prop:propertyAlias propertyName="tns:testProbeData" messageType="tns:requestMessage" part="requestMessageData">
-    <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-      requestText
-    </prop:query>
-  </prop:propertyAlias>
-
-</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/TestDynamicPick.wsdl"
+  xmlns:tns="http://ode/bpel/unit-test/TestDynamicPick.wsdl"
+  xmlns:typens="http://ode/bpel/unit-test/TestDynamicPick.wsdl.types"
+  xmlns="http://ode/bpel/unit-test/TestDynamicPick.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:types>
+    <xsd:schema
+      targetNamespace="http://ode/bpel/unit-test/TestDynamicPick.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="requestKey1" type="xsd:string"/>
+          <xsd:element name="requestKey2" 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="TestDynamicPickPT">
+    <wsdl:operation name="request">
+      <wsdl:input message="requestMessage"/>
+      <wsdl:output message="replyMessage"/>
+    </wsdl:operation>
+    <wsdl:operation name="continue1">
+      <wsdl:input message="requestMessage"/>
+    </wsdl:operation>
+    <wsdl:operation name="continue2">
+      <wsdl:input message="requestMessage"/>
+    </wsdl:operation>
+  </wsdl:portType>
+  
+  <wsdl:binding name="TestDynamicPickBinding" type="tns:TestDynamicPickPT">
+    <wsdl:operation name="request">
+    </wsdl:operation>
+    <wsdl:operation name="continue1">
+    </wsdl:operation>
+    <wsdl:operation name="continue2">
+    </wsdl:operation>
+  </wsdl:binding>
+  <wsdl:service name="TestDynamicPickService">
+    <wsdl:port name="TestDynamicPickPort" binding="tns:TestDynamicPickBinding">
+    </wsdl:port>
+  </wsdl:service>
+
+  <plnk:partnerLinkType name="TestDynamicPickRequest">
+    <plnk:role name="TestDynamicPickService" portType="TestDynamicPickPT"/>
+   </plnk:partnerLinkType>
+
+   <plnk:partnerLinkType name="probeRequest">
+	<plnk:role name="probeService" portType="prb:probeMessagePT"/>
+   </plnk:partnerLinkType>
+   
+  <prop:property name="testProbeKey1" type="xsd:string"/>
+  <prop:propertyAlias propertyName="tns:testProbeKey1" messageType="tns:requestMessage" part="requestMessageData">
+    <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+      requestKey1
+    </prop:query>
+  </prop:propertyAlias>
+  
+  <prop:property name="testProbeKey2" type="xsd:string"/>
+  <prop:propertyAlias propertyName="tns:testProbeKey2" messageType="tns:requestMessage" part="requestMessageData">
+    <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+      requestKey2
+    </prop:query>
+  </prop:propertyAlias>
+  
+  <prop:property name="testProbeID" type="xsd:string"/>
+  <prop:propertyAlias propertyName="tns:testProbeID" messageType="tns:requestMessage" part="requestMessageData">
+    <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+      requestID
+    </prop:query>
+  </prop:propertyAlias>
+  
+  <prop:property name="testProbeData" type="xsd:string"/>
+  <prop:propertyAlias propertyName="tns:testProbeData" messageType="tns:requestMessage" part="requestMessageData">
+    <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+      requestText
+    </prop:query>
+  </prop:propertyAlias>
+
+</wsdl:definitions>

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFaultHandlers/testFaultHandlers.bpel
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFaultHandlers/testFaultHandlers.bpel?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFaultHandlers/testFaultHandlers.bpel (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFaultHandlers/testFaultHandlers.bpel Fri Jan 23 23:53:17 2009
@@ -1,234 +1,234 @@
-<!--
-	~ 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/testFaultHandlers"
-	xmlns:wns="http://ode/bpel/unit-test/testFaultHandlers.wsdl"
-	xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
- xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
- name="TestFaultHandlersProcess"
-	targetNamespace="http://ode/bpel/unit-test/testFaultHandlers"
-	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="testFaultHandlers.wsdl"
-		namespace="http://ode/bpel/unit-test/testFaultHandlers.wsdl"
-		importType="http://schemas.xmlsoap.org/wsdl/" />
-	<import location="../ProbeService/probeService.wsdl"
-		namespace="http://ode/bpel/unit-test/ProbeService.wsdl"
-		importType="http://schemas.xmlsoap.org/wsdl/"/>
-
-<!-- Unit test fault handlers	-->
-<!--	throw 					-->
-<!--	catch 					-->
-<!--	catchAll 				-->
-
-  <partnerLinks>
-  	<partnerLink name="request" partnerLinkType="wns:testFaultHandlersRequest" myRole="testFaultHandlersService"/>
-  	<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>
-
-  <faultHandlers>
-	<catchAll>
-	   <sequence>
-	   	  	<assign>
-	      		<copy>
-	      			<from>
-	      				<literal><![CDATA[caught fault with catchAll]]></literal>
-	      			</from>
-	        		<to variable="probeInput" part="probeName"/>
-	      		</copy>
-	  		</assign> 
-	    	<invoke name="allFaultProbe" partnerLink="probe" 
-	            	portType="prb:probeMessagePT" 
-	            	operation="probe"
-	            	inputVariable="probeInput"  
-	            	outputVariable="probeInput">
-	    	</invoke>
-
-	  	<!-- copy internal accumulators to the reply message -->
-
-	  	<assign name="allFaultAssign">
-	      	<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="allFaultReply" partnerLink="request" portType="wns:testFaultHandlersPT" 
-	           operation="request" variable="reply"> 
-	  	</reply>
-	   </sequence>
-	</catchAll>
-  </faultHandlers>
-
-  <sequence>
-	    
-	    <receive name="receive1" partnerLink="request"
-	    	portType="wns:testFaultHandlersPT" 
-	             operation="request" variable="request"
-	             createInstance="yes">
-	    </receive>
-	
-		<!-- Copy input variables to internal accumulators -->
-	 
-	    <assign name="assign1">
-	      <copy>
-	        <from variable="request" part="requestID"/>
-	        <to variable="probeInput" part="probeName"/>
-	      </copy>
-	      <copy>
-	        <from variable="request" part="requestText"/>
-	        <to variable="probeInput" part="probeData"/>
-	      </copy>
-	    </assign>   
-	
-	  <scope name="scopeOne">
-  		<faultHandlers>
-			<catch faultName="tns:testFault">
-	   			<sequence>
-	   			
-	   				  <assign>
-	      				<copy>
-	      					<from>
-	      						<literal><![CDATA[caught testFault]]></literal>
-	      					</from>
-	        				<to variable="probeInput" part="probeName"/>
-	      				</copy>
-	  				  </assign> 
-	    				<invoke name="testFaultProbe" partnerLink="probe" 
-	            			portType="prb:probeMessagePT" 
-	            			operation="probe"
-	            			inputVariable="probeInput"  
-	            			outputVariable="probeInput">
-	    				</invoke>
-
-	  				<!-- copy internal accumulators to the reply message -->
-
-	  				<assign name="testFaultAssign">
-	      				<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> 
-	    
-	   			</sequence>
-			</catch>
-		</faultHandlers>
-
-	  <if>
-		<!-- throws a named fault -->
-		<condition>$request.faultIndicator1 = 'yes'</condition>
-        <sequence>
-            <assign>
-                    <copy>
-                        <from>
-                            <literal><![CDATA[throw testFault]]></literal>
-                        </from>
-                        <to variable="probeInput" part="probeName"/>
-                    </copy>
-            </assign> 
-            <invoke name="probe1" partnerLink="probe" 
-                        portType="prb:probeMessagePT" 
-                        operation="probe"
-                        inputVariable="probeInput"  
-                        outputVariable="probeInput">
-            </invoke>
-            <throw faultName="tns:testFault"/>
-        </sequence>
-		<!-- throws an unknown fault -->
-		<elseif>
-			<condition>$request.faultIndicator2 = 'yes'</condition>
-			<sequence>
-				<assign>
-					<copy>
-						<from>
-							<literal><![CDATA[throw unknown fault]]></literal>
-						</from>
-						<to variable="probeInput" part="probeName"/>
-					</copy>
-				</assign> 
-				<invoke name="probe1" partnerLink="probe" 
-					portType="prb:probeMessagePT" 
-					operation="probe"
-					inputVariable="probeInput"  
-					outputVariable="probeInput">
-				</invoke>
-				
-				<throw faultName="tns:unknownFault"/>
-			</sequence>
-		</elseif>
-	  </if>
-	  </scope>
-
-	  			<assign>
-	      				<copy>
-	      					<from>
-	      						<literal><![CDATA[process complete]]></literal>
-	      					</from>
-	        				<to variable="probeInput" part="probeName"/>
-	      				</copy>
-	  			</assign> 
-
-       <invoke name="probe2" partnerLink="probe"
-	            portType="prb:probeMessagePT" 
-	            operation="probe"
-	            inputVariable="probeInput"  
-	            outputVariable="probeInput">
-       </invoke>
-
-	  <!-- copy internal accumulators to the reply message -->
-
-	  <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:testFaultHandlersPT" 
-	           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/testFaultHandlers"
+	xmlns:wns="http://ode/bpel/unit-test/testFaultHandlers.wsdl"
+	xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
+ xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+ name="TestFaultHandlersProcess"
+	targetNamespace="http://ode/bpel/unit-test/testFaultHandlers"
+	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="testFaultHandlers.wsdl"
+		namespace="http://ode/bpel/unit-test/testFaultHandlers.wsdl"
+		importType="http://schemas.xmlsoap.org/wsdl/" />
+	<import location="../ProbeService/probeService.wsdl"
+		namespace="http://ode/bpel/unit-test/ProbeService.wsdl"
+		importType="http://schemas.xmlsoap.org/wsdl/"/>
+
+<!-- Unit test fault handlers	-->
+<!--	throw 					-->
+<!--	catch 					-->
+<!--	catchAll 				-->
+
+  <partnerLinks>
+  	<partnerLink name="request" partnerLinkType="wns:testFaultHandlersRequest" myRole="testFaultHandlersService"/>
+  	<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>
+
+  <faultHandlers>
+	<catchAll>
+	   <sequence>
+	   	  	<assign>
+	      		<copy>
+	      			<from>
+	      				<literal><![CDATA[caught fault with catchAll]]></literal>
+	      			</from>
+	        		<to variable="probeInput" part="probeName"/>
+	      		</copy>
+	  		</assign> 
+	    	<invoke name="allFaultProbe" partnerLink="probe" 
+	            	portType="prb:probeMessagePT" 
+	            	operation="probe"
+	            	inputVariable="probeInput"  
+	            	outputVariable="probeInput">
+	    	</invoke>
+
+	  	<!-- copy internal accumulators to the reply message -->
+
+	  	<assign name="allFaultAssign">
+	      	<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="allFaultReply" partnerLink="request" portType="wns:testFaultHandlersPT" 
+	           operation="request" variable="reply"> 
+	  	</reply>
+	   </sequence>
+	</catchAll>
+  </faultHandlers>
+
+  <sequence>
+	    
+	    <receive name="receive1" partnerLink="request"
+	    	portType="wns:testFaultHandlersPT" 
+	             operation="request" variable="request"
+	             createInstance="yes">
+	    </receive>
+	
+		<!-- Copy input variables to internal accumulators -->
+	 
+	    <assign name="assign1">
+	      <copy>
+	        <from variable="request" part="requestID"/>
+	        <to variable="probeInput" part="probeName"/>
+	      </copy>
+	      <copy>
+	        <from variable="request" part="requestText"/>
+	        <to variable="probeInput" part="probeData"/>
+	      </copy>
+	    </assign>   
+	
+	  <scope name="scopeOne">
+  		<faultHandlers>
+			<catch faultName="tns:testFault">
+	   			<sequence>
+	   			
+	   				  <assign>
+	      				<copy>
+	      					<from>
+	      						<literal><![CDATA[caught testFault]]></literal>
+	      					</from>
+	        				<to variable="probeInput" part="probeName"/>
+	      				</copy>
+	  				  </assign> 
+	    				<invoke name="testFaultProbe" partnerLink="probe" 
+	            			portType="prb:probeMessagePT" 
+	            			operation="probe"
+	            			inputVariable="probeInput"  
+	            			outputVariable="probeInput">
+	    				</invoke>
+
+	  				<!-- copy internal accumulators to the reply message -->
+
+	  				<assign name="testFaultAssign">
+	      				<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> 
+	    
+	   			</sequence>
+			</catch>
+		</faultHandlers>
+
+	  <if>
+		<!-- throws a named fault -->
+		<condition>$request.faultIndicator1 = 'yes'</condition>
+        <sequence>
+            <assign>
+                    <copy>
+                        <from>
+                            <literal><![CDATA[throw testFault]]></literal>
+                        </from>
+                        <to variable="probeInput" part="probeName"/>
+                    </copy>
+            </assign> 
+            <invoke name="probe1" partnerLink="probe" 
+                        portType="prb:probeMessagePT" 
+                        operation="probe"
+                        inputVariable="probeInput"  
+                        outputVariable="probeInput">
+            </invoke>
+            <throw faultName="tns:testFault"/>
+        </sequence>
+		<!-- throws an unknown fault -->
+		<elseif>
+			<condition>$request.faultIndicator2 = 'yes'</condition>
+			<sequence>
+				<assign>
+					<copy>
+						<from>
+							<literal><![CDATA[throw unknown fault]]></literal>
+						</from>
+						<to variable="probeInput" part="probeName"/>
+					</copy>
+				</assign> 
+				<invoke name="probe1" partnerLink="probe" 
+					portType="prb:probeMessagePT" 
+					operation="probe"
+					inputVariable="probeInput"  
+					outputVariable="probeInput">
+				</invoke>
+				
+				<throw faultName="tns:unknownFault"/>
+			</sequence>
+		</elseif>
+	  </if>
+	  </scope>
+
+	  			<assign>
+	      				<copy>
+	      					<from>
+	      						<literal><![CDATA[process complete]]></literal>
+	      					</from>
+	        				<to variable="probeInput" part="probeName"/>
+	      				</copy>
+	  			</assign> 
+
+       <invoke name="probe2" partnerLink="probe"
+	            portType="prb:probeMessagePT" 
+	            operation="probe"
+	            inputVariable="probeInput"  
+	            outputVariable="probeInput">
+       </invoke>
+
+	  <!-- copy internal accumulators to the reply message -->
+
+	  <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:testFaultHandlersPT" 
+	           operation="request" variable="reply"> 
+	  </reply>
+
+  
+  </sequence>
+</process>

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFaultHandlers/testFaultHandlers.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFaultHandlers/testFaultHandlers.wsdl?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFaultHandlers/testFaultHandlers.wsdl (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFaultHandlers/testFaultHandlers.wsdl Fri Jan 23 23:53:17 2009
@@ -1,66 +1,66 @@
-<!--
-   ~ 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/testFaultHandlers.wsdl"
-   xmlns:tns="http://ode/bpel/unit-test/testFaultHandlers.wsdl"
-   xmlns="http://ode/bpel/unit-test/testFaultHandlers.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>
-
-
-   <wsdl:portType name="testFaultHandlersPT">
-      <wsdl:operation name="request">
-         <wsdl:input message="requestMessage"/>
-         <wsdl:output message="replyMessage"/>
-      </wsdl:operation>
-   </wsdl:portType>
-   
-   <wsdl:binding name="testFaultHandlersBinding" type="tns:testFaultHandlersPT">
-      <wsdl:operation name="request">
-      </wsdl:operation>
-   </wsdl:binding>
-   <wsdl:service name="testFaultHandlersService">
-      <wsdl:port name="testFaultHandlersPort" binding="tns:testFaultHandlersBinding">
-      </wsdl:port>
-   </wsdl:service>
-
-   <plnk:partnerLinkType name="testFaultHandlersRequest">
-      <plnk:role name="testFaultHandlersService" portType="testFaultHandlersPT"/>
-   </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/testFaultHandlers.wsdl"
+   xmlns:tns="http://ode/bpel/unit-test/testFaultHandlers.wsdl"
+   xmlns="http://ode/bpel/unit-test/testFaultHandlers.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>
+
+
+   <wsdl:portType name="testFaultHandlersPT">
+      <wsdl:operation name="request">
+         <wsdl:input message="requestMessage"/>
+         <wsdl:output message="replyMessage"/>
+      </wsdl:operation>
+   </wsdl:portType>
+   
+   <wsdl:binding name="testFaultHandlersBinding" type="tns:testFaultHandlersPT">
+      <wsdl:operation name="request">
+      </wsdl:operation>
+   </wsdl:binding>
+   <wsdl:service name="testFaultHandlersService">
+      <wsdl:port name="testFaultHandlersPort" binding="tns:testFaultHandlersBinding">
+      </wsdl:port>
+   </wsdl:service>
+
+   <plnk:partnerLinkType name="testFaultHandlersRequest">
+      <plnk:role name="testFaultHandlersService" portType="testFaultHandlersPT"/>
+   </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/TestFaultWithVariable/TestFaultWithVariable.bpel
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFaultWithVariable/TestFaultWithVariable.bpel?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFaultWithVariable/TestFaultWithVariable.bpel (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFaultWithVariable/TestFaultWithVariable.bpel Fri Jan 23 23:53:17 2009
@@ -30,10 +30,10 @@
 	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 external fault handlers with variable input -->
-	<!--	throw 					-->
-	<!--	catch 					-->
+	
+	<!-- Unit test external fault handlers with variable input -->
+	<!--	throw 					-->
+	<!--	catch 					-->
 
 	<import location="TestFaultWithVariable.wsdl"
 		namespace="http://ode/bpel/unit-test/TestFaultWithVariable.wsdl"
@@ -46,79 +46,79 @@
 		importType="http://schemas.xmlsoap.org/wsdl/"/>
 	
 
-	<partnerLinks>
-		<partnerLink name="request" partnerLinkType="wns:TestFaultWithVariableRequest" myRole="TestFaultWithVariableService"/>
-		<partnerLink name="probe" partnerLinkType="wns:probeRequest" partnerRole="probeService" initializePartnerRole="yes"/>
-		<partnerLink name="fault" partnerLinkType="wns:faultRequest" partnerRole="faultService" initializePartnerRole="yes"/>
-	</partnerLinks>
-	<variables>
-		<variable name="request" messageType="wns:requestMessage"/>
-		<variable name="probeInput" messageType="prb:probeMessage"/>
-		<variable name="reply" messageType="wns:replyMessage"/>
+	<partnerLinks>
+		<partnerLink name="request" partnerLinkType="wns:TestFaultWithVariableRequest" myRole="TestFaultWithVariableService"/>
+		<partnerLink name="probe" partnerLinkType="wns:probeRequest" partnerRole="probeService" initializePartnerRole="yes"/>
+		<partnerLink name="fault" partnerLinkType="wns:faultRequest" partnerRole="faultService" initializePartnerRole="yes"/>
+	</partnerLinks>
+	<variables>
+		<variable name="request" messageType="wns:requestMessage"/>
+		<variable name="probeInput" messageType="prb:probeMessage"/>
+		<variable name="reply" messageType="wns:replyMessage"/>
 		<variable name="fault" messageType="flt:faultMessage"/>
 		<variable name="faultResponse" messageType="flt:faultMessage"/>
-	</variables>
-	<faultHandlers>
-		<catchAll>
-			<sequence>
-				<assign>
+	</variables>
+	<faultHandlers>
+		<catchAll>
+			<sequence>
+				<assign>
 					<copy>
 						<from>
 							<literal><![CDATA[caught fault with catchAll]]></literal>
-						</from>
-						<to variable="probeInput" part="probeName"/>
-					</copy>
-				</assign>
-				<invoke name="allFaultProbe" partnerLink="probe" portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput" outputVariable="probeInput"/>
-				<!-- copy internal accumulators to the reply message -->
-				<assign name="allFaultAssign">
-					<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="allFaultReply" partnerLink="request" portType="wns:TestFaultWithVariablePT" operation="request" variable="reply"/>
-			</sequence>
-		</catchAll>
-	</faultHandlers>
-	<sequence>
-		<receive name="receive1" partnerLink="request" portType="wns:TestFaultWithVariablePT" operation="request" variable="request" createInstance="yes"/>
-		<!-- Copy input variables to internal accumulators -->
-		<assign name="assign1">
-			<copy>
-				<from variable="request" part="requestID"/>
-				<to variable="probeInput" part="probeName"/>
-			</copy>
-			<copy>
-				<from variable="request" part="requestText"/>
-				<to variable="probeInput" part="probeData"/>
-			</copy>
-		</assign>
-		<scope name="scopeOne">
-			<faultHandlers>
-				<catch faultName="flt:FaultMessage1" faultVariable="testError" faultMessageType="flt:errorMessage">
-					<sequence>
-						<assign>
+						</from>
+						<to variable="probeInput" part="probeName"/>
+					</copy>
+				</assign>
+				<invoke name="allFaultProbe" partnerLink="probe" portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput" outputVariable="probeInput"/>
+				<!-- copy internal accumulators to the reply message -->
+				<assign name="allFaultAssign">
+					<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="allFaultReply" partnerLink="request" portType="wns:TestFaultWithVariablePT" operation="request" variable="reply"/>
+			</sequence>
+		</catchAll>
+	</faultHandlers>
+	<sequence>
+		<receive name="receive1" partnerLink="request" portType="wns:TestFaultWithVariablePT" operation="request" variable="request" createInstance="yes"/>
+		<!-- Copy input variables to internal accumulators -->
+		<assign name="assign1">
+			<copy>
+				<from variable="request" part="requestID"/>
+				<to variable="probeInput" part="probeName"/>
+			</copy>
+			<copy>
+				<from variable="request" part="requestText"/>
+				<to variable="probeInput" part="probeData"/>
+			</copy>
+		</assign>
+		<scope name="scopeOne">
+			<faultHandlers>
+				<catch faultName="flt:FaultMessage1" faultVariable="testError" faultMessageType="flt:errorMessage">
+					<sequence>
+						<assign>
 							<copy>
 								<from>
 									<literal><![CDATA[caught FaultMessage1]]></literal>
-								</from>
-								<to variable="probeInput" part="probeName"/>
-							</copy>
-						</assign>
-						<invoke name="testFaultProbe" partnerLink="probe" portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput" outputVariable="probeInput"/>
-						<assign>
-							<copy>
-								<from variable="testError" part="errorText"/>
-								<to variable="probeInput" part="probeName"/>
-							</copy>
-						</assign>
-						<invoke name="faultMessageProbe" partnerLink="probe" portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput" outputVariable="probeInput"/>
-					</sequence>
+								</from>
+								<to variable="probeInput" part="probeName"/>
+							</copy>
+						</assign>
+						<invoke name="testFaultProbe" partnerLink="probe" portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput" outputVariable="probeInput"/>
+						<assign>
+							<copy>
+								<from variable="testError" part="errorText"/>
+								<to variable="probeInput" part="probeName"/>
+							</copy>
+						</assign>
+						<invoke name="faultMessageProbe" partnerLink="probe" portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput" outputVariable="probeInput"/>
+					</sequence>
 				</catch>
 				<catch faultName="flt:FaultMessage2" faultVariable="testError" faultMessageType="flt:errorMessage">
 					<sequence>
@@ -139,17 +139,17 @@
 						</assign>
 						<invoke name="faultMessageProbe" partnerLink="probe" portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput" outputVariable="probeInput"/>
 					</sequence>
-				</catch>
-			</faultHandlers>
-			<sequence>
-				<assign>
+				</catch>
+			</faultHandlers>
+			<sequence>
+				<assign>
 					<copy>
 						<from>$request.requestID</from>
-						<to variable="fault" part="faultName"/>
-					</copy>
+						<to variable="fault" part="faultName"/>
+					</copy>
 					<copy>
 						<from>$request.requestText</from>
-						<to variable="fault" part="faultData"/>
+						<to variable="fault" part="faultData"/>
 					</copy>
 					<copy>
 						<from>$request.faultIndicator1</from>
@@ -158,32 +158,32 @@
 					<copy>
 						<from>$request.faultIndicator2</from>
 						<to>$fault.faultIndicator2</to>
-					</copy>
-				</assign>
-				<invoke name="throwTestFault" partnerLink="fault" portType="flt:faultMessagePT" operation="throwFault" inputVariable="fault" outputVariable="faultResponse"/>
-			</sequence>
-
-		</scope>
-		<assign>
+					</copy>
+				</assign>
+				<invoke name="throwTestFault" partnerLink="fault" portType="flt:faultMessagePT" operation="throwFault" inputVariable="fault" outputVariable="faultResponse"/>
+			</sequence>
+
+		</scope>
+		<assign>
 			<copy>
 				<from>
 					<literal><![CDATA[process complete]]></literal>
-				</from>
-				<to variable="probeInput" part="probeName"/>
-			</copy>
-		</assign>
-		<invoke name="probe2" partnerLink="probe" portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput" outputVariable="probeInput"/>
-		<!-- copy internal accumulators to the reply message -->
-		<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:TestFaultWithVariablePT" operation="request" variable="reply"/>
-	</sequence>
-</process>
+				</from>
+				<to variable="probeInput" part="probeName"/>
+			</copy>
+		</assign>
+		<invoke name="probe2" partnerLink="probe" portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput" outputVariable="probeInput"/>
+		<!-- copy internal accumulators to the reply message -->
+		<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:TestFaultWithVariablePT" operation="request" variable="reply"/>
+	</sequence>
+</process>

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFaultWithVariable/TestFaultWithVariable.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFaultWithVariable/TestFaultWithVariable.wsdl?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFaultWithVariable/TestFaultWithVariable.wsdl (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFaultWithVariable/TestFaultWithVariable.wsdl Fri Jan 23 23:53:17 2009
@@ -1,65 +1,65 @@
-<!--
-	~ 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/TestFaultWithVariable.wsdl"
-	xmlns:tns="http://ode/bpel/unit-test/TestFaultWithVariable.wsdl"
-	xmlns:typens="http://ode/bpel/unit-test/TestFaultWithVariable.wsdl.types"
-	xmlns="http://ode/bpel/unit-test/TestFaultWithVariable.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:flt="http://ode/bpel/unit-test/FaultService.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>
-
-	<wsdl:portType name="TestFaultWithVariablePT">
-		<wsdl:operation name="request">
-			<wsdl:input message="requestMessage"/>
-			<wsdl:output message="replyMessage"/>
-		</wsdl:operation>
-	</wsdl:portType>
-	<wsdl:binding name="TestFaultWithVariableBinding" type="tns:TestFaultWithVariablePT">
-		<wsdl:operation name="request">
-		</wsdl:operation>
-	</wsdl:binding>
-	<wsdl:service name="TestFaultWithVariableService">
-		<wsdl:port name="TestFaultWithVariablePort" binding="tns:TestFaultWithVariableBinding">
-		</wsdl:port>
-	</wsdl:service>	
-	
-	<plnk:partnerLinkType name="TestFaultWithVariableRequest">
-		<plnk:role name="TestFaultWithVariableService" portType="TestFaultWithVariablePT"/>
-	</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/TestFaultWithVariable.wsdl"
+	xmlns:tns="http://ode/bpel/unit-test/TestFaultWithVariable.wsdl"
+	xmlns:typens="http://ode/bpel/unit-test/TestFaultWithVariable.wsdl.types"
+	xmlns="http://ode/bpel/unit-test/TestFaultWithVariable.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:flt="http://ode/bpel/unit-test/FaultService.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>
+
+	<wsdl:portType name="TestFaultWithVariablePT">
+		<wsdl:operation name="request">
+			<wsdl:input message="requestMessage"/>
+			<wsdl:output message="replyMessage"/>
+		</wsdl:operation>
+	</wsdl:portType>
+	<wsdl:binding name="TestFaultWithVariableBinding" type="tns:TestFaultWithVariablePT">
+		<wsdl:operation name="request">
+		</wsdl:operation>
+	</wsdl:binding>
+	<wsdl:service name="TestFaultWithVariableService">
+		<wsdl:port name="TestFaultWithVariablePort" binding="tns:TestFaultWithVariableBinding">
+		</wsdl:port>
+	</wsdl:service>	
+	
+	<plnk:partnerLinkType name="TestFaultWithVariableRequest">
+		<plnk:role name="TestFaultWithVariableService" portType="TestFaultWithVariablePT"/>
+	</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/TestFlowActivity1/TestActivityFlow.bpel
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/TestActivityFlow.bpel?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/TestActivityFlow.bpel (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/TestActivityFlow.bpel Fri Jan 23 23:53:17 2009
@@ -1,308 +1,308 @@
-<!--
-	~ 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/testFlowActivity1"
-	xmlns:wns="http://ode/bpel/unit-test/testFlowActivity1.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/testFlowActivity1"
- 	suppressJoinFailure="yes"
-	queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
-	expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-
-	<!-- Test Flow using XPath 20 -->
- 
-	<import location="TestActivityFlow.wsdl"
-		namespace="http://ode/bpel/unit-test/testFlowActivity1.wsdl"
-		importType="http://schemas.xmlsoap.org/wsdl/" />
-	<import location="../ProbeService/probeService.wsdl"
-		namespace="http://ode/bpel/unit-test/ProbeService.wsdl"
-		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/testFlowActivity1"
+	xmlns:wns="http://ode/bpel/unit-test/testFlowActivity1.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/testFlowActivity1"
+ 	suppressJoinFailure="yes"
+	queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+	expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+
+	<!-- Test Flow using XPath 20 -->
+ 
+	<import location="TestActivityFlow.wsdl"
+		namespace="http://ode/bpel/unit-test/testFlowActivity1.wsdl"
+		importType="http://schemas.xmlsoap.org/wsdl/" />
+	<import location="../ProbeService/probeService.wsdl"
+		namespace="http://ode/bpel/unit-test/ProbeService.wsdl"
+		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/TestFlowActivity1/TestActivityFlow.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/TestActivityFlow.wsdl?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/TestActivityFlow.wsdl (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/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/testFlowActivity1.wsdl"
-  xmlns:tns="http://ode/bpel/unit-test/testFlowActivity1.wsdl"
-  xmlns="http://ode/bpel/unit-test/testFlowActivity1.wsdl"
-  xmlns:typens="http://ode/bpel/unit-test/testFlowActivity1.wsdl.types"
-  xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
-  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-  xmlns:plnk="http://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/testFlowActivity1.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/testFlowActivity1.wsdl"
+  xmlns:tns="http://ode/bpel/unit-test/testFlowActivity1.wsdl"
+  xmlns="http://ode/bpel/unit-test/testFlowActivity1.wsdl"
+  xmlns:typens="http://ode/bpel/unit-test/testFlowActivity1.wsdl.types"
+  xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
+  xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+  xmlns:plnk="http://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/testFlowActivity1.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>