Author: vanto
Date: Wed Aug 1 11:25:38 2007
New Revision: 561897
URL: http://svn.apache.org/viewvc?view=rev&rev=561897
Log:
fixing ODE-134, targeting ODE-162
Removed:
ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestIf/HelloWorld2.cbp
Modified:
ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestIf/TestIf.bpel
ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestIf/TestIf.wsdl
ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestIf/deploy.xml
ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestIf/test.properties
Modified: ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestIf/TestIf.bpel
URL:
http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestIf/TestIf.bpel?view=diff&rev=561897&r1=561896&r2=561897
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestIf/TestIf.bpel
(original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestIf/TestIf.bpel Wed Aug
1 11:25:38 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/trunk/bpel-test/src/test/resources/bpel/2.0/TestIf/TestIf.wsdl
URL:
http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestIf/TestIf.wsdl?view=diff&rev=561897&r1=561896&r2=561897
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestIf/TestIf.wsdl
(original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestIf/TestIf.wsdl Wed Aug
1 11:25:38 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/trunk/bpel-test/src/test/resources/bpel/2.0/TestIf/deploy.xml
URL:
http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestIf/deploy.xml?view=diff&rev=561897&r1=561896&r2=561897
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestIf/deploy.xml (original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestIf/deploy.xml Wed Aug
1 11:25:38 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/trunk/bpel-test/src/test/resources/bpel/2.0/TestIf/test.properties
URL:
http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestIf/test.properties?view=diff&rev=561897&r1=561896&r2=561897
==============================================================================
--- ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestIf/test.properties
(original)
+++ ode/trunk/bpel-test/src/test/resources/bpel/2.0/TestIf/test.properties Wed
Aug 1 11:25:38 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.*
