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

svn commit: r563295 [2/2] - in /ode/branches/bart/bpel-test/src: main/java/org/apache/ode/test/ test/java/org/apache/ode/test/ test/resources/bpel/2.0/HelloWorld2/ test/resources/bpel/2.0/NegativeCorrelationTest/ test/resources/bpel/2.0/NegativeInitial...

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/TestActivityFlow.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/TestActivityFlow.wsdl?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/TestActivityFlow.wsdl (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/TestActivityFlow.wsdl Mon Aug  6 14:57:18 2007
@@ -24,9 +24,9 @@
   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://schemas.xmlsoap.org/ws/2004/03/partner-link/"      
-      xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/">
+  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>
@@ -92,31 +92,31 @@
 	<plnk:role name="probeService" portType="prb:probeMessagePT"/>
    </plnk:partnerLinkType>
    
-  <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
-    </bpws:query>
-  </bpws:propertyAlias>
+  <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>
   
-  <bpws:property name="testFlow1" type="xsd:boolean"/>
-  <bpws:propertyAlias propertyName="tns:testFlow1" messageType="tns:requestMessage" part="requestMessageData">
+  <vprop:property name="testFlow1" type="xsd:boolean"/>
+  <vprop: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
-    </bpws:query> 
+    <vprop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+      flowIndicators/indicatorOne
+    </vprop:query> 
   
-  </bpws:propertyAlias>
+  </vprop:propertyAlias>
 
   
-  <bpws:property name="loopInd" type="xsd:string"/>
-  <bpws:propertyAlias propertyName="tns:loopInd" messageType="tns:requestMessage" part="requestMessageData">
+  <vprop:property name="loopInd" type="xsd:string"/>
+  <vprop:propertyAlias propertyName="tns:loopInd" messageType="tns:requestMessage" part="requestMessageData">
 
-    <bpws:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-      testMessage/loopIndicator
-    </bpws:query>  
+    <vprop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+      loopIndicator
+    </vprop:query>  
    
-  </bpws:propertyAlias>
+  </vprop:propertyAlias>
   
    
 

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/test.properties
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/test.properties?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/test.properties (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity1/test.properties Mon Aug  6 14:57:18 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/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/TestActivityFlow.bpel
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/TestActivityFlow.bpel?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/TestActivityFlow.bpel (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/TestActivityFlow.bpel Mon Aug  6 14:57:18 2007
@@ -18,12 +18,12 @@
 -->
 
 <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/testFlowActivity2"
 	xmlns:wns="http://ode/bpel/unit-test/testFlowActivity2.wsdl"
 	xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
- xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-	xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+ xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+	xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
  name="TestActivityFlow"
 	targetNamespace="http://ode/bpel/unit-test/testFlowActivity2"
  suppressJoinFailure="yes">

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/TestActivityFlow.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/TestActivityFlow.wsdl?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/TestActivityFlow.wsdl (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/TestActivityFlow.wsdl Mon Aug  6 14:57:18 2007
@@ -24,9 +24,9 @@
   xmlns:typens="http://ode/bpel/unit-test/testFlowActivity2.wsdl.types"
   xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
   xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-  xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/"      
-      xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-  xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/">
+  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>
@@ -92,31 +92,31 @@
 	<plnk:role name="probeService" portType="prb:probeMessagePT"/>
    </plnk:partnerLinkType>
    
-  <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
-    </bpws:query>
-  </bpws:propertyAlias>
+  <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>
   
-  <bpws:property name="testFlow1" type="xsd:boolean"/>
-  <bpws:propertyAlias propertyName="tns:testFlow1" messageType="tns:requestMessage" part="requestMessageData">
+  <vprop:property name="testFlow1" type="xsd:boolean"/>
+  <vprop: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
-    </bpws:query> 
+    <vprop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+      flowIndicators/indicatorOne
+    </vprop:query> 
   
-  </bpws:propertyAlias>
+  </vprop:propertyAlias>
 
   
-  <bpws:property name="loopInd" type="xsd:string"/>
-  <bpws:propertyAlias propertyName="tns:loopInd" messageType="tns:requestMessage" part="requestMessageData">
+  <vprop:property name="loopInd" type="xsd:string"/>
+  <vprop:propertyAlias propertyName="tns:loopInd" messageType="tns:requestMessage" part="requestMessageData">
 
-    <bpws:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-      testMessage/loopIndicator
-    </bpws:query>  
+    <vprop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+      loopIndicator
+    </vprop:query>  
    
-  </bpws:propertyAlias>
+  </vprop:propertyAlias>
   
    
 

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/test.properties
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/test.properties?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/test.properties (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestFlowActivity2/test.properties Mon Aug  6 14:57:18 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/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestIf/TestIf.bpel
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestIf/TestIf.bpel?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestIf/TestIf.bpel (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestIf/TestIf.bpel Mon Aug  6 14:57:18 2007
@@ -16,10 +16,10 @@
   ~ specific language governing permissions and limitations
   ~ under the License.
   -->
-<process name="HelloWorld2"
+<process name="TestIf"
          targetNamespace="http://ode/bpel/unit-test"
-         xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-         xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+         xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+         xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
          xmlns:tns="http://ode/bpel/unit-test"
          xmlns:xsd="http://www.w3.org/2001/XMLSchema"
          xmlns:test="http://ode/bpel/unit-test.wsdl">
@@ -56,16 +56,14 @@
         </assign>
         <if>
             <condition>number($tmpVar)=number(2)</condition>
-            <then>
-                <assign name="assignError">
-                    <copy>
-                        <from>
-                            <literal>Worked</literal>
-                        </from>
-                        <to variable="myVar" part="TestPart"/>
-                    </copy>
-                </assign>
-            </then>
+            <assign name="assignError">
+                <copy>
+                    <from>
+                        <literal>Worked</literal>
+                    </from>
+                    <to variable="myVar" part="TestPart"/>
+                </copy>
+            </assign>
             <else>
                 <assign name="assignZut">
                     <copy>

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestIf/TestIf.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestIf/TestIf.wsdl?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestIf/TestIf.wsdl (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestIf/TestIf.wsdl Mon Aug  6 14:57:18 2007
@@ -25,8 +25,7 @@
     xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
+    xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype">
     
     <wsdl:message name="HelloMessage">
         <wsdl:part name="TestPart" type="xsd:string"/>

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestIf/deploy.xml
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestIf/deploy.xml?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestIf/deploy.xml (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestIf/deploy.xml Mon Aug  6 14:57:18 2007
@@ -21,7 +21,7 @@
 	xmlns:wns="http://ode/bpel/unit-test.wsdl">
 
 
-	<process name="pns:HelloWorld2">
+	<process name="pns:TestIf">
 		<active>true</active>
 		<provide partnerLink="helloPartnerLink">
 			<service name="wns:HelloService" port="HelloPort"/>

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestIf/test.properties
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestIf/test.properties?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestIf/test.properties (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestIf/test.properties Mon Aug  6 14:57:18 2007
@@ -20,4 +20,5 @@
 operation=hello
 request1=<message><TestPart>2.0</TestPart></message>
 response1=.*Worked.*
-
+request1=<message><TestPart>1.0</TestPart></message>
+response1=.*Failed.*

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestImplicitFaultHandler/TestImplicitFaultHandler.bpel
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestImplicitFaultHandler/TestImplicitFaultHandler.bpel?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestImplicitFaultHandler/TestImplicitFaultHandler.bpel (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestImplicitFaultHandler/TestImplicitFaultHandler.bpel Mon Aug  6 14:57:18 2007
@@ -18,9 +18,9 @@
 -->
 
 <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"
-	xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/" xmlns:tns="http://ode/bpel/unit-test/testImplicitFaultHandler" xmlns:flt="http://ode/bpel/unit-test/FaultService.wsdl"
-	xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl" xmlns:wns="http://ode/bpel/unit-test/testImplicitFaultHandler.wsdl" xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+	 xsi:schemaLocation="http://docs.oasis-open.org/wsbpel/2.0/process/executable ../../../../../../../bpel-schemas/src/main/resources/wsbpel_executable.xsd"
+	xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:tns="http://ode/bpel/unit-test/testImplicitFaultHandler" xmlns:flt="http://ode/bpel/unit-test/FaultService.wsdl"
+	xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl" xmlns:wns="http://ode/bpel/unit-test/testImplicitFaultHandler.wsdl" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
 	targetNamespace="http://ode/bpel/unit-test/testImplicitFaultHandler" name="testImplicitFaultHandler" suppressJoinFailure="yes" queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
 	expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
 

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestImplicitFaultHandler/TestImplicitFaultHandler.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestImplicitFaultHandler/TestImplicitFaultHandler.wsdl?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestImplicitFaultHandler/TestImplicitFaultHandler.wsdl (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestImplicitFaultHandler/TestImplicitFaultHandler.wsdl Mon Aug  6 14:57:18 2007
@@ -23,9 +23,9 @@
   xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
   xmlns:flt="http://ode/bpel/unit-test/FaultService.wsdl"
   xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-  xmlns:plnk="http://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:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/">
+  xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
 
   
   <wsdl:message name="requestMessage">
@@ -46,7 +46,7 @@
     </wsdl:operation>
   </wsdl:portType>
 
-  <plnk:partnerLinkType name="testImplicitFaultHandlwequest">
+  <plnk:partnerLinkType name="testImplicitFaultHandlerRequest">
     <plnk:role name="testImplicitFaultHandlerService" portType="tns:testImplicitFaultHandlerPT"/>
   </plnk:partnerLinkType>
   

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestInstantiatingPick/TestInstantiatingPick.bpel
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestInstantiatingPick/TestInstantiatingPick.bpel?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestInstantiatingPick/TestInstantiatingPick.bpel (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestInstantiatingPick/TestInstantiatingPick.bpel Mon Aug  6 14:57:18 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/TestInstantiatingPick"
 	xmlns:wns="http://ode/bpel/unit-test/TestInstantiatingPick.wsdl"
 	xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
- xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+ xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
  name="TestInstantiatingPick"
 	targetNamespace="http://ode/bpel/unit-test/TestInstantiatingPick"
 	queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestInstantiatingPick/TestInstantiatingPick.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestInstantiatingPick/TestInstantiatingPick.wsdl?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestInstantiatingPick/TestInstantiatingPick.wsdl (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestInstantiatingPick/TestInstantiatingPick.wsdl Mon Aug  6 14:57:18 2007
@@ -23,9 +23,9 @@
    xmlns="http://ode/bpel/unit-test/TestInstantiatingPick.wsdl"
    xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
    xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-   xmlns:plnk="http://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:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/">
+   xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
 
 
    <wsdl:message name="requestMessage">

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestSimpleTypeParts/TestSimpleTypeParts.bpel
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestSimpleTypeParts/TestSimpleTypeParts.bpel?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestSimpleTypeParts/TestSimpleTypeParts.bpel (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestSimpleTypeParts/TestSimpleTypeParts.bpel Mon Aug  6 14:57:18 2007
@@ -18,12 +18,12 @@
 -->
 
 <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/TestSimpleTypeParts"
 	xmlns:wns="http://ode/bpel/unit-test/TestSimpleTypeParts.wsdl"
 	targetNamespace="http://ode/bpel/unit-test/TestSimpleTypeParts"
 	xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
-	xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+	xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
 	name="TestSimpleTypeParts"
 	queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
 	expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestSimpleTypeParts/TestSimpleTypeParts.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestSimpleTypeParts/TestSimpleTypeParts.wsdl?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestSimpleTypeParts/TestSimpleTypeParts.wsdl (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestSimpleTypeParts/TestSimpleTypeParts.wsdl Mon Aug  6 14:57:18 2007
@@ -23,9 +23,9 @@
    xmlns="http://ode/bpel/unit-test/TestSimpleTypeParts.wsdl"
    xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
    xmlns:wsdl="http://schemas.xmlsoap.org/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:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/">
+   xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop">
     
 
    <wsdl:message name="requestMessage">
@@ -54,8 +54,8 @@
       </wsdl:port>
    </wsdl:service>
 
-   <bpws:property name="testProbeID" type="xsd:string"/>
-   <bpws:propertyAlias propertyName="tns:testProbeID" messageType="tns:requestMessage" part="requestID"/>
+   <vprop:property name="testProbeID" type="xsd:string"/>
+   <vprop:propertyAlias propertyName="tns:testProbeID" messageType="tns:requestMessage" part="requestID"/>
 
    <plnk:partnerLinkType name="TestSimpleTypePartsRequest">
       <plnk:role name="TestSimpleTypePartsService" portType="TestSimpleTypePartsPT"/>

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestSimpleVariableType/TestSimpleVariableType.bpel
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestSimpleVariableType/TestSimpleVariableType.bpel?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestSimpleVariableType/TestSimpleVariableType.bpel (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestSimpleVariableType/TestSimpleVariableType.bpel Mon Aug  6 14:57:18 2007
@@ -18,12 +18,12 @@
 -->
 
 <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"
 	targetNamespace="http://ode/bpel/unit-test/TestSimpleVariableType"
 	xmlns:tns="http://ode/bpel/unit-test/TestSimpleVariableType"
 	xmlns:wns="http://ode/bpel/unit-test/TestSimpleVariableType.wsdl"
 	xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
-	xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+	xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
 	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
 	name="TestSimpleVariableType"
 	queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestSimpleVariableType/TestSimpleVariableType.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestSimpleVariableType/TestSimpleVariableType.wsdl?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestSimpleVariableType/TestSimpleVariableType.wsdl (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestSimpleVariableType/TestSimpleVariableType.wsdl Mon Aug  6 14:57:18 2007
@@ -23,9 +23,9 @@
    xmlns="http://ode/bpel/unit-test/TestSimpleVariableType.wsdl"
    xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
    xmlns:wsdl="http://schemas.xmlsoap.org/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:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/">
+   xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop">
 
 
    <wsdl:message name="requestMessage">
@@ -54,8 +54,8 @@
       </wsdl:port>
    </wsdl:service>
 
-   <bpws:property name="testProbeID" type="xsd:string"/>
-   <bpws:propertyAlias propertyName="tns:testProbeID" messageType="tns:requestMessage" part="requestID"/>
+   <vprop:property name="testProbeID" type="xsd:string"/>
+   <vprop:propertyAlias propertyName="tns:testProbeID" messageType="tns:requestMessage" part="requestID"/>
 
    <plnk:partnerLinkType name="TestSimpleVariableTypeRequest">
       <plnk:role name="TestSimpleVariableTypeService" portType="TestSimpleVariableTypePT"/>

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/TestStaticOnMessage.bpel
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/TestStaticOnMessage.bpel?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/TestStaticOnMessage.bpel (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/TestStaticOnMessage.bpel Mon Aug  6 14:57:18 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/TestStaticOnMessage"
          xmlns:wns="http://ode/bpel/unit-test/TestStaticOnMessage.wsdl"
          xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
-         xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+         xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
          name="TestStaticOnMessageProcess"
          targetNamespace="http://ode/bpel/unit-test/TestStaticOnMessage"
          queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/TestStaticOnMessage.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/TestStaticOnMessage.wsdl?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/TestStaticOnMessage.wsdl (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestStaticOnMessage/TestStaticOnMessage.wsdl Mon Aug  6 14:57:18 2007
@@ -24,9 +24,9 @@
    xmlns="http://ode/bpel/unit-test/TestStaticOnMessage.wsdl"
    xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
    xmlns:wsdl="http://schemas.xmlsoap.org/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:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/">
+   xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
 
 
    <wsdl:types>

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.bpel
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.bpel?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.bpel (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.bpel Mon Aug  6 14:57:18 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/TestStaticPick"
 	xmlns:wns="http://ode/bpel/unit-test/TestStaticPick.wsdl"
 	xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
-	xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+	xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
 	name="TestStaticPick"
 	targetNamespace="http://ode/bpel/unit-test/TestStaticPick"
 	queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.wsdl?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.wsdl (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestStaticPick/TestStaticPick.wsdl Mon Aug  6 14:57:18 2007
@@ -23,9 +23,9 @@
    xmlns="http://ode/bpel/unit-test/TestStaticPick.wsdl"
    xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
    xmlns:wsdl="http://schemas.xmlsoap.org/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:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/">
+   xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
 
 
    <wsdl:message name="requestMessage">

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestSubTreeAssign/TestSubTreeAssign.bpel
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestSubTreeAssign/TestSubTreeAssign.bpel?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestSubTreeAssign/TestSubTreeAssign.bpel (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestSubTreeAssign/TestSubTreeAssign.bpel Mon Aug  6 14:57:18 2007
@@ -17,13 +17,13 @@
 	~ under the License.
 -->
 <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/TestSubTreeAssign"
  xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
  xmlns:types="http://ode/bpel/unit-test/TestSubTreeAssign.wsdl.types"
  xmlns:xsd="http://www.w3.org/2001/XMLSchema"
  xmlns:wns="http://ode/bpel/unit-test/TestSubTreeAssign.wsdl"
- xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+ xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
  targetNamespace="http://ode/bpel/unit-test/TestSubTreeAssign"
  name="TestSubTreeAssign"
  queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestSubTreeAssign/TestSubTreeAssign.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestSubTreeAssign/TestSubTreeAssign.wsdl?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestSubTreeAssign/TestSubTreeAssign.wsdl (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestSubTreeAssign/TestSubTreeAssign.wsdl Mon Aug  6 14:57:18 2007
@@ -23,9 +23,9 @@
   xmlns="http://ode/bpel/unit-test/TestSubTreeAssign.wsdl"
   xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
   xmlns:wsdl="http://schemas.xmlsoap.org/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:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/">
+  xmlns:vprop="http://docs.oasis-open.org/wsbpel/2.0/varprop">
 
    <wsdl:types>
  
@@ -87,15 +87,14 @@
 	<plnk:role name="probeService" portType="prb:probeMessagePT"/>
    </plnk:partnerLinkType>
    
-  <bpws:property name="testProbeID" type="xsd:string"/>
-  <bpws:propertyAlias propertyName="tns:testProbeID" messageType="tns:requestMessage" part="requestID"/>
+  <vprop:property name="testProbeID" type="xsd:string"/>
+  <vprop:propertyAlias propertyName="tns:testProbeID" messageType="tns:requestMessage" part="requestID"/>
   
-  <bpws:property name="testPath" type="xsd:string"/>
-  <bpws:propertyAlias propertyName="tns:testPath" messageType="tns:requestMessage" part="requestMessageData">
-    <bpws:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+  <vprop:property name="testPath" type="xsd:string"/>
+  <vprop:propertyAlias propertyName="tns:testPath" messageType="tns:requestMessage" part="requestMessageData">
+    <vprop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
       typeIndicators/typens:indicatorTwo
-    </bpws:query> 
-  </bpws:propertyAlias>
-  
+    </vprop:query> 
+  </vprop:propertyAlias>
 
 </wsdl:definitions>

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestTimer/TestTimer.bpel
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestTimer/TestTimer.bpel?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestTimer/TestTimer.bpel (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestTimer/TestTimer.bpel Mon Aug  6 14:57:18 2007
@@ -18,16 +18,16 @@
 -->
 
 <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/testTimer"
 	xmlns:wns="http://ode/bpel/unit-test/testTimer.wsdl"
 	xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
- xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
- name="TestTimerProcess"
+	xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+	name="TestTimerProcess"
 	targetNamespace="http://ode/bpel/unit-test/testTimer"
 	queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
 	expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
- suppressJoinFailure="yes">
+	suppressJoinFailure="yes">
  
 	<import location="TestTimer.wsdl"
 		namespace="http://ode/bpel/unit-test/testTimer.wsdl"

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestTimer/TestTimer.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestTimer/TestTimer.wsdl?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestTimer/TestTimer.wsdl (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestTimer/TestTimer.wsdl Mon Aug  6 14:57:18 2007
@@ -20,7 +20,7 @@
 <wsdl:definitions targetNamespace="http://ode/bpel/unit-test/testTimer.wsdl" 
 	   xmlns="http://ode/bpel/unit-test/testTimer.wsdl"
 	xmlns:tns="http://ode/bpel/unit-test/testTimer.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/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestVersionedRedeploy/HelloWorld-1/HelloWorld2.bpel
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestVersionedRedeploy/HelloWorld-1/HelloWorld2.bpel?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestVersionedRedeploy/HelloWorld-1/HelloWorld2.bpel (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestVersionedRedeploy/HelloWorld-1/HelloWorld2.bpel Mon Aug  6 14:57:18 2007
@@ -19,8 +19,8 @@
 
 <process name="HelloWorld2"
     targetNamespace="http://ode/bpel/unit-test" 
-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+    xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+    xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
     xmlns:tns="http://ode/bpel/unit-test"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     xmlns:test="http://ode/bpel/unit-test.wsdl">

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestVersionedRedeploy/HelloWorld-1/HelloWorld2.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestVersionedRedeploy/HelloWorld-1/HelloWorld2.wsdl?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestVersionedRedeploy/HelloWorld-1/HelloWorld2.wsdl (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestVersionedRedeploy/HelloWorld-1/HelloWorld2.wsdl Mon Aug  6 14:57:18 2007
@@ -26,8 +26,8 @@
     xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
+    xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+    xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype">
     
     <wsdl:message name="HelloMessage">
         <wsdl:part name="TestPart" type="xsd:string"/>

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestVersionedRedeploy/HelloWorld-2/HelloWorld2.bpel
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestVersionedRedeploy/HelloWorld-2/HelloWorld2.bpel?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestVersionedRedeploy/HelloWorld-2/HelloWorld2.bpel (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestVersionedRedeploy/HelloWorld-2/HelloWorld2.bpel Mon Aug  6 14:57:18 2007
@@ -18,8 +18,8 @@
   -->
 <process name="HelloWorld2"
     targetNamespace="http://ode/bpel/unit-test" 
-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+    xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+    xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
     xmlns:tns="http://ode/bpel/unit-test"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     xmlns:test="http://ode/bpel/unit-test.wsdl">

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestVersionedRedeploy/HelloWorld-2/HelloWorld2.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestVersionedRedeploy/HelloWorld-2/HelloWorld2.wsdl?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestVersionedRedeploy/HelloWorld-2/HelloWorld2.wsdl (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestVersionedRedeploy/HelloWorld-2/HelloWorld2.wsdl Mon Aug  6 14:57:18 2007
@@ -26,8 +26,8 @@
     xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
+    xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+    xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype">
     
     <wsdl:message name="HelloMessage">
         <wsdl:part name="TestPart" type="xsd:string"/>

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestVersionedRedeploy/HelloWorld-3/HelloWorld2.bpel
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestVersionedRedeploy/HelloWorld-3/HelloWorld2.bpel?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestVersionedRedeploy/HelloWorld-3/HelloWorld2.bpel (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestVersionedRedeploy/HelloWorld-3/HelloWorld2.bpel Mon Aug  6 14:57:18 2007
@@ -18,8 +18,8 @@
   -->
 <process name="HelloWorld2"
     targetNamespace="http://ode/bpel/unit-test" 
-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+    xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+    xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
     xmlns:tns="http://ode/bpel/unit-test"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     xmlns:test="http://ode/bpel/unit-test.wsdl">

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestVersionedRedeploy/HelloWorld-3/HelloWorld2.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestVersionedRedeploy/HelloWorld-3/HelloWorld2.wsdl?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestVersionedRedeploy/HelloWorld-3/HelloWorld2.wsdl (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestVersionedRedeploy/HelloWorld-3/HelloWorld2.wsdl Mon Aug  6 14:57:18 2007
@@ -45,8 +45,8 @@
     xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
+    xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+    xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype">
     
     <wsdl:message name="HelloMessage">
         <wsdl:part name="TestPart" type="xsd:string"/>

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestWait1/Wait1-2.0.bpel
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestWait1/Wait1-2.0.bpel?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestWait1/Wait1-2.0.bpel (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestWait1/Wait1-2.0.bpel Mon Aug  6 14:57:18 2007
@@ -19,8 +19,8 @@
 
 <process name="Wait1"
     targetNamespace="http://ode/bpel/unit-test" 
-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+    xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+    xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
     xmlns:tns="http://ode/bpel/unit-test"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     xmlns:test="http://ode/bpel/unit-test.wsdl" 

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestWait1/test.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestWait1/test.wsdl?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestWait1/test.wsdl (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestWait1/test.wsdl Mon Aug  6 14:57:18 2007
@@ -25,8 +25,8 @@
     xmlns:tns="http://ode/bpel/unit-test.wsdl"
     xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
+    xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+    xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype">
    
     <wsdl:message name="TestMessage">
         <wsdl:part name="TestPart" type="xsd:int"/>

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestWaitUntil/WaitUntil.bpel
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestWaitUntil/WaitUntil.bpel?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestWaitUntil/WaitUntil.bpel (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestWaitUntil/WaitUntil.bpel Mon Aug  6 14:57:18 2007
@@ -19,8 +19,8 @@
 
 <process name="WaitUntil"
     targetNamespace="http://ode/bpel/unit-test" 
-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+    xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+    xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
     xmlns:tns="http://ode/bpel/unit-test"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     xmlns:test="http://ode/bpel/unit-test.wsdl" 

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestWaitUntil/test.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestWaitUntil/test.wsdl?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestWaitUntil/test.wsdl (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestWaitUntil/test.wsdl Mon Aug  6 14:57:18 2007
@@ -25,8 +25,8 @@
     xmlns:tns="http://ode/bpel/unit-test.wsdl"
     xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" 
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
+    xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+    xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype">
    
     <wsdl:message name="TestMessage">
         <wsdl:part name="TestPart" type="xsd:int"/>

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace1/TestXPathNamespace1.bpel
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace1/TestXPathNamespace1.bpel?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace1/TestXPathNamespace1.bpel (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace1/TestXPathNamespace1.bpel Mon Aug  6 14:57:18 2007
@@ -17,13 +17,13 @@
 	~ under the License.
 -->
 <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/TestXPathNamespace1"
 	xmlns:wns="http://ode/bpel/unit-test/TestXPathNamespace1.wsdl"
 	targetNamespace="http://ode/bpel/unit-test/TestXPathNamespace1"
 	xmlns:types1="http://ode/bpel/unit-test/TestXPathNamespace1.wsdl.types1"
 	xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
-	xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+	xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
 	name="TestXPathNamespace1"
 	queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
 	expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace1/TestXPathNamespace1.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace1/TestXPathNamespace1.wsdl?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace1/TestXPathNamespace1.wsdl (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace1/TestXPathNamespace1.wsdl Mon Aug  6 14:57:18 2007
@@ -24,9 +24,9 @@
   xmlns="http://ode/bpel/unit-test/TestXPathNamespace1.wsdl"
   xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
   xmlns:wsdl="http://schemas.xmlsoap.org/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:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/">
+  xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
     
   <!-- type defs -->
   <wsdl:types>

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace1/test1.properties
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace1/test1.properties?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace1/test1.properties (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace1/test1.properties Mon Aug  6 14:57:18 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/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace2/TestXPathNamespace2.bpel
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace2/TestXPathNamespace2.bpel?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace2/TestXPathNamespace2.bpel (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace2/TestXPathNamespace2.bpel Mon Aug  6 14:57:18 2007
@@ -18,12 +18,12 @@
 -->
 
 <bpel: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/TestXPathNamespace2"
   xmlns:wns="http://ode/bpel/unit-test/TestXPathNamespace2.wsdl"
  xmlns:ns0="http://www.company.org"
  xmlns:ns1="http://www.person.org"
- xmlns:bpel="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+ xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
  xmlns:ns2="http://www.product.org"
   name="TestXPathNamespace2"
   queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace2/TestXPathNamespace2.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace2/TestXPathNamespace2.wsdl?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace2/TestXPathNamespace2.wsdl (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestXPathNamespace2/TestXPathNamespace2.wsdl Mon Aug  6 14:57:18 2007
@@ -23,9 +23,9 @@
     xmlns:tns2="http://www.product.org"
     xmlns:tns3="http://www.company.org"
     xmlns:wsdl="http://schemas.xmlsoap.org/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:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/">
+    xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
     
     <wsdl:types>
         <xsd:schema elementFormDefault="unqualified" targetNamespace="http://www.person.org" xmlns="http://www.person.org" 

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestXslTransform/HelloXslWorld.bpel
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestXslTransform/HelloXslWorld.bpel?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestXslTransform/HelloXslWorld.bpel (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestXslTransform/HelloXslWorld.bpel Mon Aug  6 14:57:18 2007
@@ -18,8 +18,8 @@
   -->
 <process name="HelloXslWorld" 
     targetNamespace="http://pxe/bpel/unit-test" 
-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
+    xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+    xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
     xmlns:tns="http://pxe/bpel/unit-test"
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     xmlns:types="http://pxe/bpel/types"
@@ -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/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestXslTransform/HelloXslWorld.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestXslTransform/HelloXslWorld.wsdl?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestXslTransform/HelloXslWorld.wsdl (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestXslTransform/HelloXslWorld.wsdl Mon Aug  6 14:57:18 2007
@@ -26,8 +26,8 @@
     xmlns:xsd="http://www.w3.org/2001/XMLSchema"
     xmlns:types="http://pxe/bpel/types"
     xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
-    xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
-    xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/">
+    xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+    xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype">
 
     <wsdl:types>
         <xsd:schema targetNamespace="http://pxe/bpel/types">

Modified: ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestXslTransform/HelloXslWorld.xsl
URL: http://svn.apache.org/viewvc/ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestXslTransform/HelloXslWorld.xsl?view=diff&rev=563295&r1=563294&r2=563295
==============================================================================
--- ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestXslTransform/HelloXslWorld.xsl (original)
+++ ode/branches/bart/bpel-test/src/test/resources/bpel/2.0/TestXslTransform/HelloXslWorld.xsl Mon Aug  6 14:57:18 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>