You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by va...@apache.org on 2007/07/31 18:06:23 UTC

svn commit: r561372 - in /ode/trunk/bpel-test/src/test/resources/bpel/2.0: TestCompensationHandlers/ TestFlowActivity1/ TestFlowActivity2/ TestXPathNamespace1/ TestXslTransform/

Author: vanto
Date: Tue Jul 31 09:06:22 2007
New Revision: 561372

URL: http://svn.apache.org/viewvc?view=rev&rev=561372
Log:
fixing BPEL test cases.

Modified:
    ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCompensationHandlers/test.properties
    ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCompensationHandlers/testCompensationHandlers.bpel
    ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCompensationHandlers/testCompensationHandlers.wsdl
    ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/TestActivityFlow.wsdl
    ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/test.properties
    ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/TestActivityFlow.wsdl
    ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/test.properties
    ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace1/test1.properties
    ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXslTransform/HelloXslWorld.bpel
    ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXslTransform/HelloXslWorld.xsl

Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCompensationHandlers/test.properties
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCompensationHandlers/test.properties?view=diff&rev=561372&r1=561371&r2=561372
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCompensationHandlers/test.properties (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCompensationHandlers/test.properties Tue Jul 31 09:06:22 2007
@@ -19,6 +19,6 @@
 service=testCompensationHandlersService
 operation=request
 request1=<message><requestID>Start Test3.1</requestID><requestText>Event Start Test3.1</requestText><faultIndicator1>yes</faultIndicator1><faultIndicator2>no</faultIndicator2></message>
-response1=.*Event Start Test3.1 -&gt; throw testFault -&gt; caught testFault -&gt; process complete.*
+response1=.*Event Start Test3.1 -&gt; begin fault test -&gt; throw testFault -&gt; caught testFault -&gt; process complete.*
 request2=<message><requestID>Start Test3.2</requestID><requestText>Event Start Test3.2</requestText><faultIndicator1>no</faultIndicator1><faultIndicator2>yes</faultIndicator2></message>
-response2=.*Event Start Test2.2 -&gt; throw unknown fault -&gt; caught fault with catchAll.*
+response2=.*Event Start Test3.2 -&gt; begin fault test -&gt; throw unknown fault -&gt; fire compensation handler -&gt; process complete.*

Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCompensationHandlers/testCompensationHandlers.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCompensationHandlers/testCompensationHandlers.bpel?view=diff&rev=561372&r1=561371&r2=561372
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCompensationHandlers/testCompensationHandlers.bpel (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCompensationHandlers/testCompensationHandlers.bpel Tue Jul 31 09:06:22 2007
@@ -18,11 +18,11 @@
 -->
 
 <process xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://schemas.xmlsoap.org/ws/2004/03/business-process/ ../../../../../../../bpel-schemas/src/main/resources/wsbpel_main-draft-Apr-29-2006.xsd"
+ xsi:schemaLocation="http://docs.oasis-open.org/wsbpel/2.0/process/executable ../../../../../../../bpel-schemas/src/main/resources/wsbpel_executable.xsd"
  xmlns:tns="http://ode/bpel/unit-test/testCompensationHandlers"
  xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
  xmlns:wns="http://ode/bpel/unit-test/testCompensationHandlers.wsdl"
- xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+ xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
  name="TestCompensationHandlersProcess"
  targetNamespace="http://ode/bpel/unit-test/testCompensationHandlers"
  queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
@@ -84,7 +84,7 @@
 
 
 		<catchAll>
-			<compensate scope="ScopeTwo"/>
+			<compensateScope target="ScopeTwo"/>
 		</catchAll>
 
 		
@@ -99,7 +99,7 @@
 	  			   	  <assign>
 	      				<copy>
 	      					<from>
-	      						<literal><![CDATA[fire compenstation handler]]></literal>
+	      						<literal><![CDATA[fire compensation handler]]></literal>
 	      					</from>
 	        				<to variable="probeInput" part="probeName"/>
 	      				</copy>
@@ -158,26 +158,24 @@
 	    </invoke>
 
 	  <if>
-	  	<condition>$request.faultIndictor1 = 'yes'</condition>
-	  	<then>
-	  		<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>
-	  	</then>
+	  	<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>
 	  	<elseif>
 	  		<condition>$request.faultIndicator2 = 'yes'</condition>
 	  		<sequence>

Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCompensationHandlers/testCompensationHandlers.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCompensationHandlers/testCompensationHandlers.wsdl?view=diff&rev=561372&r1=561371&r2=561372
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCompensationHandlers/testCompensationHandlers.wsdl (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestCompensationHandlers/testCompensationHandlers.wsdl Tue Jul 31 09:06:22 2007
@@ -21,7 +21,7 @@
    targetNamespace="http://ode/bpel/unit-test/testCompensationHandlers.wsdl"
    xmlns="http://ode/bpel/unit-test/testCompensationHandlers.wsdl"
    xmlns:tns="http://ode/bpel/unit-test/testCompensationHandlers.wsdl"
-   xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/"      
+   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/">

Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/TestActivityFlow.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/TestActivityFlow.wsdl?view=diff&rev=561372&r1=561371&r2=561372
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/TestActivityFlow.wsdl (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/TestActivityFlow.wsdl Tue Jul 31 09:06:22 2007
@@ -95,7 +95,7 @@
   <bpws:property name="testProbeData" type="xsd:string"/>
   <bpws:propertyAlias propertyName="tns:testProbeData" messageType="tns:requestMessage" part="requestMessageData">
     <bpws:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-      testMessage/requestText
+      requestText
     </bpws:query>
   </bpws:propertyAlias>
   
@@ -103,7 +103,7 @@
   <bpws:propertyAlias propertyName="tns:testFlow1" messageType="tns:requestMessage" part="requestMessageData">
  
     <bpws:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-      testMessage/flowIndicators/indicatorOne
+      flowIndicators/indicatorOne
     </bpws:query> 
   
   </bpws:propertyAlias>
@@ -113,7 +113,7 @@
   <bpws:propertyAlias propertyName="tns:loopInd" messageType="tns:requestMessage" part="requestMessageData">
 
     <bpws:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-      testMessage/loopIndicator
+      loopIndicator
     </bpws:query>  
    
   </bpws:propertyAlias>

Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/test.properties
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/test.properties?view=diff&rev=561372&r1=561371&r2=561372
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/test.properties (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/test.properties Tue Jul 31 09:06:22 2007
@@ -18,15 +18,15 @@
 namespace=http://ode/bpel/unit-test/testFlowActivity1.wsdl
 service=TestFlowActivityService
 operation=request
-request1=<message><requestMessageData><testMessage><requestID>Start Test1.1</requestID><requestText>Event Start Test1.1</requestText><flowIndicators><indicatorOne>yes</indicatorOne><indicatorTwo>yes</indicatorTwo></flowIndicators><loopIndicator>min</loopIndicator></testMessage></requestMessageData></message>
+request1=<message><requestMessageData><requestID>Start Test1.1</requestID><requestText>Event Start Test1.1</requestText><flowIndicators><indicatorOne>yes</indicatorOne><indicatorTwo>yes</indicatorTwo></flowIndicators><loopIndicator>min</loopIndicator></requestMessageData></message>
 response1=.*processes A and B merge on process C -&gt; merge into root process -&gt; test switch statement -&gt; case min: set loop iterations = 5 -&gt; test loop iterations -&gt; 2 -&gt; 3 -&gt; 4 -&gt; 5 -&gt; 6 -&gt; test1Process complete.*
-request2=<message><requestMessageData><testMessage><requestID>Start Test1.2</requestID><requestText>Event Start Test1.2</requestText><flowIndicators><indicatorOne>yes</indicatorOne><indicatorTwo>no</indicatorTwo></flowIndicators><loopIndicator>min</loopIndicator></testMessage></requestMessageData></message>
+request2=<message><requestMessageData><requestID>Start Test1.2</requestID><requestText>Event Start Test1.2</requestText><flowIndicators><indicatorOne>yes</indicatorOne><indicatorTwo>no</indicatorTwo></flowIndicators><loopIndicator>min</loopIndicator></requestMessageData></message>
 response2=.*merge into root process -&gt; test switch statement -&gt; case min: set loop iterations = 5 -&gt; test loop iterations -&gt; 2 -&gt; 3 -&gt; 4 -&gt; 5 -&gt; 6 -&gt; test1Process complete.*
-request3=<message><requestMessageData><testMessage><requestID>Start Test1.3</requestID><requestText>Event Start Test1.3</requestText><flowIndicators><indicatorOne>no</indicatorOne><indicatorTwo>yes</indicatorTwo></flowIndicators><loopIndicator>min</loopIndicator></testMessage></requestMessageData></message>
+request3=<message><requestMessageData><requestID>Start Test1.3</requestID><requestText>Event Start Test1.3</requestText><flowIndicators><indicatorOne>no</indicatorOne><indicatorTwo>yes</indicatorTwo></flowIndicators><loopIndicator>min</loopIndicator></requestMessageData></message>
 response3=.*merge into root process -&gt; test switch statement -&gt; case min: set loop iterations = 5 -&gt; test loop iterations -&gt; 2 -&gt; 3 -&gt; 4 -&gt; 5 -&gt; 6 -&gt; test1Process complete.*
-request4=<message><requestMessageData><testMessage><requestID>Start Test1.4</requestID><requestText>Event Start Test1.4</requestText><flowIndicators><indicatorOne>no</indicatorOne><indicatorTwo>no</indicatorTwo></flowIndicators><loopIndicator>min</loopIndicator></testMessage></requestMessageData></message>
+request4=<message><requestMessageData><requestID>Start Test1.4</requestID><requestText>Event Start Test1.4</requestText><flowIndicators><indicatorOne>no</indicatorOne><indicatorTwo>no</indicatorTwo></flowIndicators><loopIndicator>min</loopIndicator></requestMessageData></message>
 response4=.*merge into root process -&gt; test switch statement -&gt; case min: set loop iterations = 5 -&gt; test loop iterations -&gt; 2 -&gt; 3 -&gt; 4 -&gt; 5 -&gt; 6 -&gt; test1Process complete.*
-request5=<message><requestMessageData><testMessage><requestID>Start Test1.5</requestID><requestText>Event Start Test1.5</requestText><flowIndicators><indicatorOne>yes</indicatorOne><indicatorTwo>yes</indicatorTwo></flowIndicators><loopIndicator>max</loopIndicator></testMessage></requestMessageData></message>
+request5=<message><requestMessageData><requestID>Start Test1.5</requestID><requestText>Event Start Test1.5</requestText><flowIndicators><indicatorOne>yes</indicatorOne><indicatorTwo>yes</indicatorTwo></flowIndicators><loopIndicator>max</loopIndicator></requestMessageData></message>
 response5=.*processes A and B merge on process C -&gt; merge into root process -&gt; test switch statement -&gt; case max: set loop iterations = 10 -&gt; test loop iterations -&gt; 2 -&gt; 3 -&gt; 4 -&gt; 5 -&gt; 6 -&gt; 7 -&gt; 8 -&gt; 9 -&gt; 10 -&gt; 11 -&gt; test1Process complete.*
-request6=<message><requestMessageData><testMessage><requestID>Start Test1.6</requestID><requestText>Event Start Test1.6</requestText><flowIndicators><indicatorOne>yes</indicatorOne><indicatorTwo>yes</indicatorTwo></flowIndicators><loopIndicator>default</loopIndicator></testMessage></requestMessageData></message>
+request6=<message><requestMessageData><requestID>Start Test1.6</requestID><requestText>Event Start Test1.6</requestText><flowIndicators><indicatorOne>yes</indicatorOne><indicatorTwo>yes</indicatorTwo></flowIndicators><loopIndicator>default</loopIndicator></requestMessageData></message>
 response6=.*processes A and B merge on process C -&gt; merge into root process -&gt; test switch statement -&gt; otherwise: set loop iterations = 0 -&gt; test loop iterations -&gt; test1Process complete.*

Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/TestActivityFlow.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/TestActivityFlow.wsdl?view=diff&rev=561372&r1=561371&r2=561372
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/TestActivityFlow.wsdl (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/TestActivityFlow.wsdl Tue Jul 31 09:06:22 2007
@@ -95,7 +95,7 @@
   <bpws:property name="testProbeData" type="xsd:string"/>
   <bpws:propertyAlias propertyName="tns:testProbeData" messageType="tns:requestMessage" part="requestMessageData">
     <bpws:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-      testMessage/requestText
+      requestText
     </bpws:query>
   </bpws:propertyAlias>
   
@@ -103,7 +103,7 @@
   <bpws:propertyAlias propertyName="tns:testFlow1" messageType="tns:requestMessage" part="requestMessageData">
  
     <bpws:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-      testMessage/flowIndicators/indicatorOne
+      flowIndicators/indicatorOne
     </bpws:query> 
   
   </bpws:propertyAlias>
@@ -113,7 +113,7 @@
   <bpws:propertyAlias propertyName="tns:loopInd" messageType="tns:requestMessage" part="requestMessageData">
 
     <bpws:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-      testMessage/loopIndicator
+      loopIndicator
     </bpws:query>  
    
   </bpws:propertyAlias>

Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/test.properties
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/test.properties?view=diff&rev=561372&r1=561371&r2=561372
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/test.properties (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/test.properties Tue Jul 31 09:06:22 2007
@@ -18,15 +18,15 @@
 namespace=http://ode/bpel/unit-test/testFlowActivity2.wsdl
 service=TestFlowActivityService
 operation=request
-request1=<message><requestMessageData><testMessage><requestID>Start Test1.1</requestID><requestText>Event Start Test1.1</requestText><flowIndicators><indicatorOne>yes</indicatorOne><indicatorTwo>yes</indicatorTwo></flowIndicators><loopIndicator>min</loopIndicator></testMessage></requestMessageData></message>
+request1=<message><requestMessageData><requestID>Start Test1.1</requestID><requestText>Event Start Test1.1</requestText><flowIndicators><indicatorOne>yes</indicatorOne><indicatorTwo>yes</indicatorTwo></flowIndicators><loopIndicator>min</loopIndicator></requestMessageData></message>
 response1=.*processes A and B merge on process C -&gt; merge into root process -&gt; test switch statement -&gt; case min: set loop iterations = 5 -&gt; test loop iterations -&gt; 2\.0 -&gt; 3\.0 -&gt; 4\.0 -&gt; 5\.0 -&gt; 6\.0 -&gt; test1Process complete.*
-request2=<message><requestMessageData><testMessage><requestID>Start Test1.2</requestID><requestText>Event Start Test1.2</requestText><flowIndicators><indicatorOne>yes</indicatorOne><indicatorTwo>no</indicatorTwo></flowIndicators><loopIndicator>min</loopIndicator></testMessage></requestMessageData></message>
+request2=<message><requestMessageData><requestID>Start Test1.2</requestID><requestText>Event Start Test1.2</requestText><flowIndicators><indicatorOne>yes</indicatorOne><indicatorTwo>no</indicatorTwo></flowIndicators><loopIndicator>min</loopIndicator></requestMessageData></message>
 response2=.*merge into root process -&gt; test switch statement -&gt; case min: set loop iterations = 5 -&gt; test loop iterations -&gt; 2\.0 -&gt; 3\.0 -&gt; 4\.0 -&gt; 5\.0 -&gt; 6\.0 -&gt; test1Process complete.*
-request3=<message><requestMessageData><testMessage><requestID>Start Test1.3</requestID><requestText>Event Start Test1.3</requestText><flowIndicators><indicatorOne>no</indicatorOne><indicatorTwo>yes</indicatorTwo></flowIndicators><loopIndicator>min</loopIndicator></testMessage></requestMessageData></message>
+request3=<message><requestMessageData><requestID>Start Test1.3</requestID><requestText>Event Start Test1.3</requestText><flowIndicators><indicatorOne>no</indicatorOne><indicatorTwo>yes</indicatorTwo></flowIndicators><loopIndicator>min</loopIndicator></requestMessageData></message>
 response3=.*merge into root process -&gt; test switch statement -&gt; case min: set loop iterations = 5 -&gt; test loop iterations -&gt; 2\.0 -&gt; 3\.0 -&gt; 4\.0 -&gt; 5\.0 -&gt; 6\.0 -&gt; test1Process complete.*
-request4=<message><requestMessageData><testMessage><requestID>Start Test1.4</requestID><requestText>Event Start Test1.4</requestText><flowIndicators><indicatorOne>no</indicatorOne><indicatorTwo>no</indicatorTwo></flowIndicators><loopIndicator>min</loopIndicator></testMessage></requestMessageData></message>
+request4=<message><requestMessageData><requestID>Start Test1.4</requestID><requestText>Event Start Test1.4</requestText><flowIndicators><indicatorOne>no</indicatorOne><indicatorTwo>no</indicatorTwo></flowIndicators><loopIndicator>min</loopIndicator></requestMessageData></message>
 response4=.*merge into root process -&gt; test switch statement -&gt; case min: set loop iterations = 5 -&gt; test loop iterations -&gt; 2\.0 -&gt; 3\.0 -&gt; 4\.0 -&gt; 5\.0 -&gt; 6\.0 -&gt; test1Process complete.*
-request5=<message><requestMessageData><testMessage><requestID>Start Test1.5</requestID><requestText>Event Start Test1.5</requestText><flowIndicators><indicatorOne>yes</indicatorOne><indicatorTwo>yes</indicatorTwo></flowIndicators><loopIndicator>max</loopIndicator></testMessage></requestMessageData></message>
+request5=<message><requestMessageData><requestID>Start Test1.5</requestID><requestText>Event Start Test1.5</requestText><flowIndicators><indicatorOne>yes</indicatorOne><indicatorTwo>yes</indicatorTwo></flowIndicators><loopIndicator>max</loopIndicator></requestMessageData></message>
 response5=.*processes A and B merge on process C -&gt; merge into root process -&gt; test switch statement -&gt; case max: set loop iterations = 10 -&gt; test loop iterations -&gt; 2\.0 -&gt; 3\.0 -&gt; 4\.0 -&gt; 5\.0 -&gt; 6\.0 -&gt; 7\.0 -&gt; 8\.0 -&gt; 9\.0 -&gt; 10\.0 -&gt; 11\.0 -&gt; test1Process complete.*
-request6=<message><requestMessageData><testMessage><requestID>Start Test1.6</requestID><requestText>Event Start Test1.6</requestText><flowIndicators><indicatorOne>yes</indicatorOne><indicatorTwo>yes</indicatorTwo></flowIndicators><loopIndicator>default</loopIndicator></testMessage></requestMessageData></message>
+request6=<message><requestMessageData><requestID>Start Test1.6</requestID><requestText>Event Start Test1.6</requestText><flowIndicators><indicatorOne>yes</indicatorOne><indicatorTwo>yes</indicatorTwo></flowIndicators><loopIndicator>default</loopIndicator></requestMessageData></message>
 response6=.*processes A and B merge on process C -&gt; merge into root process -&gt; test switch statement -&gt; otherwise: set loop iterations = 0 -&gt; test loop iterations -&gt; test1Process complete.*

Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace1/test1.properties
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace1/test1.properties?view=diff&rev=561372&r1=561371&r2=561372
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace1/test1.properties (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace1/test1.properties Tue Jul 31 09:06:22 2007
@@ -18,5 +18,5 @@
 namespace=http://ode/bpel/unit-test/TestXPathNamespace1.wsdl
 service=TestXPathNamespace1Service
 operation=request
-request1=<message><requestMessageData><testMessage><requestID>Start TestXPathNamespace1</requestID><requestText>Event TestXPathNamespace1</requestText><typeIndicators xmlns:foo="http://ode/bpel/unit-test/TestXPathNamespace1.wsdl.footypes"><foo:indicatorOne>pass</foo:indicatorOne><foo:indicatorTwo>pass</foo:indicatorTwo></typeIndicators></testMessage></requestMessageData></message>
+request1=<message><requestMessageData><requestID>Start TestXPathNamespace1</requestID><requestText>Event TestXPathNamespace1</requestText><typeIndicators xmlns:foo="http://ode/bpel/unit-test/TestXPathNamespace1.wsdl.footypes"><foo:indicatorOne>pass</foo:indicatorOne><foo:indicatorTwo>pass</foo:indicatorTwo></typeIndicators></requestMessageData></message>
 response1=.*<replyID>Start TestXPathNamespace1</replyID><replyText>pass</replyText>.*

Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXslTransform/HelloXslWorld.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXslTransform/HelloXslWorld.bpel?view=diff&rev=561372&r1=561371&r2=561372
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXslTransform/HelloXslWorld.bpel (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXslTransform/HelloXslWorld.bpel Tue Jul 31 09:06:22 2007
@@ -39,7 +39,7 @@
         
     <variables>
         <variable name="myVar" messageType="test:HelloXslMessage"/>
-        <variable name="otherVar" messageType="test:HelloXslMessage"/>
+        <variable name="otherVar" type="xsd:string"/>
     </variables>
             
     <sequence>   
@@ -53,15 +53,15 @@
         <assign name="assign1">
             <copy>
                 <from variable="myVar" part="TestPart"/>
-                <to variable="otherVar" part="TestPart"/>
+                <to variable="otherVar"/>
             </copy>
             <copy>
                 <from>'Xsl'</from>
-                <to>$otherVar.TestPart</to>
+                <to>$otherVar</to>
             </copy>
             <copy>
                 <from>
-                    bpws:doXslTransform("HelloXslWorld.xsl", $myVar.TestPart, 'middle', $otherVar.TestPart)
+                    bpws:doXslTransform("HelloXslWorld.xsl", $myVar.TestPart, 'middle', $otherVar)
                 </from>
                 <to variable="myVar" part="TestPart"/>
             </copy>

Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXslTransform/HelloXslWorld.xsl
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXslTransform/HelloXslWorld.xsl?view=diff&rev=561372&r1=561371&r2=561372
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXslTransform/HelloXslWorld.xsl (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestXslTransform/HelloXslWorld.xsl Tue Jul 31 09:06:22 2007
@@ -27,7 +27,7 @@
          in the engine) -->
     <xsl:element name="root">
       <xsl:element name="hello">
-        <xsl:value-of select="concat(*/text(), $middle/text(), ' World')"/>
+        <xsl:value-of select="concat(*/content/text(), $middle, ' World')"/>
       </xsl:element>
     </xsl:element>
   </xsl:template>