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 2010/05/27 17:52:38 UTC
svn commit: r948869 [9/20] - in /ode/trunk: ./
agents/src/main/java/org/apache/ode/agents/memory/ axis2-war/
axis2-war/src/main/assembly/ axis2-war/src/main/webapp/WEB-INF/conf/
axis2-war/src/main/webapp/js/ axis2-war/src/test/java/org/apache/ode/axis2...
Modified: ode/trunk/bpel-scripts/src/main/resources/2.0/good/flow/flow5-2.0.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-scripts/src/main/resources/2.0/good/flow/flow5-2.0.bpel?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-scripts/src/main/resources/2.0/good/flow/flow5-2.0.bpel (original)
+++ ode/trunk/bpel-scripts/src/main/resources/2.0/good/flow/flow5-2.0.bpel Thu May 27 15:52:24 2010
@@ -18,17 +18,17 @@
-->
<process name="flow5-2.0"
- 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:tns="http://ode/bpel/unit-test"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:test="http://ode/bpel/unit-test.wsdl"
- suppressJoinFailure="yes">
+ 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:tns="http://ode/bpel/unit-test"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:test="http://ode/bpel/unit-test.wsdl"
+ suppressJoinFailure="yes">
<import importType="http://schemas.xmlsoap.org/wsdl/"
- location="test.wsdl"
- namespace="http://ode/bpel/unit-test.wsdl" />
+ location="test.wsdl"
+ namespace="http://ode/bpel/unit-test.wsdl" />
<partnerLinks>
<partnerLink name="testPartnerLink"
@@ -59,7 +59,7 @@
<!-- this should happen last -->
<targets>
<joinCondition>
- $link-a and $link-b
+ $link-a and $link-b
</joinCondition>
<target linkName="link-a"/>
Modified: ode/trunk/bpel-scripts/src/main/resources/2.0/good/flow/flow6-2.0.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-scripts/src/main/resources/2.0/good/flow/flow6-2.0.bpel?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-scripts/src/main/resources/2.0/good/flow/flow6-2.0.bpel (original)
+++ ode/trunk/bpel-scripts/src/main/resources/2.0/good/flow/flow6-2.0.bpel Thu May 27 15:52:24 2010
@@ -18,17 +18,17 @@
-->
<process name="flow6-2.0"
- 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:tns="http://ode/bpel/unit-test"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:test="http://ode/bpel/unit-test.wsdl"
- suppressJoinFailure="yes">
+ 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:tns="http://ode/bpel/unit-test"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:test="http://ode/bpel/unit-test.wsdl"
+ suppressJoinFailure="yes">
<import importType="http://schemas.xmlsoap.org/wsdl/"
- location="test.wsdl"
- namespace="http://ode/bpel/unit-test.wsdl" />
+ location="test.wsdl"
+ namespace="http://ode/bpel/unit-test.wsdl" />
<partnerLinks>
<partnerLink name="testPartnerLink"
@@ -59,7 +59,7 @@
<!-- this should happen last -->
<targets>
<joinCondition>
- $link-a and not($link-b)
+ $link-a and not($link-b)
</joinCondition>
<target linkName="link-a"/>
@@ -75,7 +75,7 @@
<source linkName="link-b">
<transitionCondition>
<!-- this will evaluate to false -->
- $var1/TestPart = 'badData'
+ $var1/TestPart = 'badData'
</transitionCondition>
</source>
</sources>
@@ -92,7 +92,7 @@
</sources>
<copy>
<from>
- concat($var1/TestPart, 'd')
+ concat($var1/TestPart, 'd')
</from>
<to>$var1/TestPart</to>
</copy>
Modified: ode/trunk/bpel-scripts/src/main/resources/2.0/good/flow/flow7-2.0.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-scripts/src/main/resources/2.0/good/flow/flow7-2.0.bpel?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-scripts/src/main/resources/2.0/good/flow/flow7-2.0.bpel (original)
+++ ode/trunk/bpel-scripts/src/main/resources/2.0/good/flow/flow7-2.0.bpel Thu May 27 15:52:24 2010
@@ -18,22 +18,22 @@
-->
<process name="flow7-2.0"
- 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:tns="http://ode/bpel/unit-test"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:test="http://ode/bpel/unit-test.wsdl"
- suppressJoinFailure="yes">
+ 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:tns="http://ode/bpel/unit-test"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:test="http://ode/bpel/unit-test.wsdl"
+ suppressJoinFailure="yes">
<import importType="http://schemas.xmlsoap.org/wsdl/"
- location="test.wsdl"
- namespace="http://ode/bpel/unit-test.wsdl" />
+ location="test.wsdl"
+ namespace="http://ode/bpel/unit-test.wsdl" />
<partnerLinks>
<partnerLink name="testPartnerLink"
- partnerLinkType="test:TestPartnerLinkType"
- myRole="me" />
+ partnerLinkType="test:TestPartnerLinkType"
+ myRole="me" />
</partnerLinks>
<variables>
@@ -43,59 +43,59 @@
<sequence>
<flow name="F1">
<links>
- <link name="link-a"/>
+ <link name="link-a"/>
</links>
<assign name="last">
- <targets>
- <!-- F1.link-a -->
- <target linkName="link-a"/>
- </targets>
- <copy>
- <from>
- concat($var1/TestPart, 'e')
- </from>
- <to>$var1/TestPart</to>
- </copy>
+ <targets>
+ <!-- F1.link-a -->
+ <target linkName="link-a"/>
+ </targets>
+ <copy>
+ <from>
+ concat($var1/TestPart, 'e')
+ </from>
+ <to>$var1/TestPart</to>
+ </copy>
</assign>
<flow name="F2">
- <sources>
- <!-- this refers to containing F1.link-a -->
- <source linkName="link-a" />
- </sources>
- <links>
- <link name="link-a"/>
- </links>
-
- <assign name="firstAssign">
- <targets>
- <!-- F2.link-a -->
- <target linkName="link-a"/>
- </targets>
- <copy>
- <from>
- concat($var1/TestPart, 'd')
- </from>
- <to>$var1/TestPart</to>
- </copy>
- </assign>
- <receive name="startReceive"
- createInstance="yes"
-
- partnerLink="testPartnerLink"
- portType="test:TestPortType"
- operation="testOperation"
- variable="var1">
- <sources>
- <!-- F2.link-a -->
- <source linkName="link-a"/>
- </sources>
- </receive>
+ <sources>
+ <!-- this refers to containing F1.link-a -->
+ <source linkName="link-a" />
+ </sources>
+ <links>
+ <link name="link-a"/>
+ </links>
+
+ <assign name="firstAssign">
+ <targets>
+ <!-- F2.link-a -->
+ <target linkName="link-a"/>
+ </targets>
+ <copy>
+ <from>
+ concat($var1/TestPart, 'd')
+ </from>
+ <to>$var1/TestPart</to>
+ </copy>
+ </assign>
+ <receive name="startReceive"
+ createInstance="yes"
+
+ partnerLink="testPartnerLink"
+ portType="test:TestPortType"
+ operation="testOperation"
+ variable="var1">
+ <sources>
+ <!-- F2.link-a -->
+ <source linkName="link-a"/>
+ </sources>
+ </receive>
</flow>
</flow>
<reply name="endReply"
- operation="testOperation"
- partnerLink="testPartnerLink"
- portType="test:TestPortType"
- variable="var1"/>
+ operation="testOperation"
+ partnerLink="testPartnerLink"
+ portType="test:TestPortType"
+ variable="var1"/>
</sequence>
</process>
Modified: ode/trunk/bpel-scripts/src/main/resources/2.0/good/if/If1-2.0.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-scripts/src/main/resources/2.0/good/if/If1-2.0.bpel?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-scripts/src/main/resources/2.0/good/if/If1-2.0.bpel (original)
+++ ode/trunk/bpel-scripts/src/main/resources/2.0/good/if/If1-2.0.bpel Thu May 27 15:52:24 2010
@@ -18,22 +18,22 @@
-->
<process name="if1-2.0"
- 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:tns="http://ode/bpel/unit-test"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:test="http://ode/bpel/unit-test.wsdl"
- suppressJoinFailure="yes">
+ 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:tns="http://ode/bpel/unit-test"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:test="http://ode/bpel/unit-test.wsdl"
+ suppressJoinFailure="yes">
<import location="./test.wsdl"
- namespace="http://ode/bpel/unit-test"
- importType="http://schemas.xmlsoap.org/wsdl/" />
+ namespace="http://ode/bpel/unit-test"
+ importType="http://schemas.xmlsoap.org/wsdl/" />
<partnerLinks>
<partnerLink name="testPartnerLink"
- partnerLinkType="test:TestPartnerLinkType"
- myRole="me" />
+ partnerLinkType="test:TestPartnerLinkType"
+ myRole="me" />
</partnerLinks>
<variables>
@@ -51,43 +51,43 @@
variable="var1"/>
<sequence>
<if>
- <condition>$var1/TestPart = 'abc'</condition>
- <assign>
- <copy>
- <from>'case1'</from>
- <to>$var2</to>
- </copy>
- </assign>
- <elseif>
- <condition>$var1/TestPart = 'def'</condition>
- <assign>
- <copy>
- <from>'case2'</from>
- <to>$var2</to>
- </copy>
- </assign>
- </elseif>
- <else>
- <assign>
- <copy>
- <from>otherwise'</from>
- <to>$var2</to>
- </copy>
- </assign>
- </else>
+ <condition>$var1/TestPart = 'abc'</condition>
+ <assign>
+ <copy>
+ <from>'case1'</from>
+ <to>$var2</to>
+ </copy>
+ </assign>
+ <elseif>
+ <condition>$var1/TestPart = 'def'</condition>
+ <assign>
+ <copy>
+ <from>'case2'</from>
+ <to>$var2</to>
+ </copy>
+ </assign>
+ </elseif>
+ <else>
+ <assign>
+ <copy>
+ <from>otherwise'</from>
+ <to>$var2</to>
+ </copy>
+ </assign>
+ </else>
</if>
<assign name="b">
- <copy>
- <from>$var2</from>
- <to>$var1/TestPart</to>
- </copy>
+ <copy>
+ <from>$var2</from>
+ <to>$var1/TestPart</to>
+ </copy>
</assign>
</sequence>
<reply name="endReply"
- operation="testOperation"
- partnerLink="testPartnerLink"
- portType="test:TestPortType"
- variable="var1"/>
+ operation="testOperation"
+ partnerLink="testPartnerLink"
+ portType="test:TestPortType"
+ variable="var1"/>
</sequence>
</process>
Modified: ode/trunk/bpel-scripts/src/main/resources/2.0/good/if/If3-2.0.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-scripts/src/main/resources/2.0/good/if/If3-2.0.bpel?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-scripts/src/main/resources/2.0/good/if/If3-2.0.bpel (original)
+++ ode/trunk/bpel-scripts/src/main/resources/2.0/good/if/If3-2.0.bpel Thu May 27 15:52:24 2010
@@ -28,13 +28,13 @@
suppressJoinFailure="yes">
<import namespace="http://ode/bpel/unit-test"
- importType="http://schemas.xmlsoap.org/wsdl/"
- location="./test.wsdl" />
+ importType="http://schemas.xmlsoap.org/wsdl/"
+ location="./test.wsdl" />
<partnerLinks>
<partnerLink name="testPartnerLink"
- partnerLinkType="test:TestPartnerLinkType"
- myRole="me" />
+ partnerLinkType="test:TestPartnerLinkType"
+ myRole="me" />
</partnerLinks>
<variables>
@@ -44,50 +44,50 @@
<sequence>
<receive name="startReceive"
- createInstance="yes"
- partnerLink="testPartnerLink"
- portType="test:TestPortType"
- operation="testOperation"
- variable="var1"/>
+ createInstance="yes"
+ partnerLink="testPartnerLink"
+ portType="test:TestPortType"
+ operation="testOperation"
+ variable="var1"/>
<sequence>
<if>
- <condition>$var1/TestPart = 'foo'</condition>
- <assign>
- <copy>
- <from>'case1'</from>
- <to>$var2</to>
- </copy>
- </assign>
- <elseif>
- <condition>$var1/TestPart = 'bar'</condition>
- <assign>
- <copy>
- <from>'case2'</from>
- <to>$var2</to>
- </copy>
- </assign>
- </elseif>
- <else>
- <assign>
- <copy>
- <from>'otherwise'</from>
- <to>$var2</to>
- </copy>
- </assign>
- </else>
+ <condition>$var1/TestPart = 'foo'</condition>
+ <assign>
+ <copy>
+ <from>'case1'</from>
+ <to>$var2</to>
+ </copy>
+ </assign>
+ <elseif>
+ <condition>$var1/TestPart = 'bar'</condition>
+ <assign>
+ <copy>
+ <from>'case2'</from>
+ <to>$var2</to>
+ </copy>
+ </assign>
+ </elseif>
+ <else>
+ <assign>
+ <copy>
+ <from>'otherwise'</from>
+ <to>$var2</to>
+ </copy>
+ </assign>
+ </else>
</if>
<assign name="b">
- <copy>
- <from>$var2</from>
- <to>$var1/TestPart</to>
- </copy>
+ <copy>
+ <from>$var2</from>
+ <to>$var1/TestPart</to>
+ </copy>
</assign>
</sequence>
<reply name="endReply"
- operation="testOperation"
- partnerLink="testPartnerLink"
- portType="test:TestPortType"
- variable="var1"/>
+ operation="testOperation"
+ partnerLink="testPartnerLink"
+ portType="test:TestPortType"
+ variable="var1"/>
</sequence>
</process>
Modified: ode/trunk/bpel-scripts/src/main/resources/2.0/good/pick/Pick3-2.0.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-scripts/src/main/resources/2.0/good/pick/Pick3-2.0.bpel?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-scripts/src/main/resources/2.0/good/pick/Pick3-2.0.bpel (original)
+++ ode/trunk/bpel-scripts/src/main/resources/2.0/good/pick/Pick3-2.0.bpel Thu May 27 15:52:24 2010
@@ -19,7 +19,7 @@
-->
<!--
- Pick will be used to create process instance. Very basic test.
+ Pick will be used to create process instance. Very basic test.
-->
<process name="pick3_CreateInstance"
targetNamespace="http://ode/bpel/unit-test"
Modified: ode/trunk/bpel-scripts/src/main/resources/2.0/good/pick/Pick4-2.0.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-scripts/src/main/resources/2.0/good/pick/Pick4-2.0.bpel?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-scripts/src/main/resources/2.0/good/pick/Pick4-2.0.bpel (original)
+++ ode/trunk/bpel-scripts/src/main/resources/2.0/good/pick/Pick4-2.0.bpel Thu May 27 15:52:24 2010
@@ -19,8 +19,8 @@
-->
<!--
- Pick with an onAlarm set. Expected behavior: 'onMessage' should occur
- before 'onAlarm'.
+ Pick with an onAlarm set. Expected behavior: 'onMessage' should occur
+ before 'onAlarm'.
-->
<process name="pick4_onMessageWithAlarm-2.0"
targetNamespace="http://ode/bpel/unit-test"
@@ -32,13 +32,13 @@
suppressJoinFailure="yes">
<import namespace="http://ode/bpel/unit-test.wsdl"
- importType="http://schemas.xmlsoap.org/wsdl/"
- location="Pick4-2.0.wsdl" />
+ importType="http://schemas.xmlsoap.org/wsdl/"
+ location="Pick4-2.0.wsdl" />
<partnerLinks>
<partnerLink name="testPartnerLink"
- partnerLinkType="test:TestPartnerLinkType"
- myRole="me" />
+ partnerLinkType="test:TestPartnerLinkType"
+ myRole="me" />
</partnerLinks>
<variables>
@@ -51,13 +51,13 @@
<sequence>
<receive name="startReceive"
- partnerLink="testPartnerLink"
- portType="test:TestPortType"
- operation="pickOp1"
- variable="var1"
- createInstance="yes" >
+ partnerLink="testPartnerLink"
+ portType="test:TestPortType"
+ operation="pickOp1"
+ variable="var1"
+ createInstance="yes" >
<correlations>
- <correlation set="PickCorrelator" initiate="yes" />
+ <correlation set="PickCorrelator" initiate="yes" />
</correlations>
</receive>
<wait>
@@ -65,33 +65,33 @@
</wait>
<pick name="pick1" createInstance="no">
<onMessage partnerLink="testPartnerLink"
- portType="test:TestPortType"
- operation="pickOp2"
- variable="var1">
- <correlations>
- <correlation set="PickCorrelator" initiate="no" />
- </correlations>
- <assign>
- <copy>
- <from>'onMessage'</from>
- <to>$var1/DataPart</to>
- </copy>
- </assign>
+ portType="test:TestPortType"
+ operation="pickOp2"
+ variable="var1">
+ <correlations>
+ <correlation set="PickCorrelator" initiate="no" />
+ </correlations>
+ <assign>
+ <copy>
+ <from>'onMessage'</from>
+ <to>$var1/DataPart</to>
+ </copy>
+ </assign>
</onMessage>
<onAlarm>
- <for>'P0Y0M0DT0H0M10S'</for>
- <assign>
- <copy>
- <from>'onAlarm'</from>
- <to>$var1/DataPart</to>
- </copy>
- </assign>
+ <for>'P0Y0M0DT0H0M10S'</for>
+ <assign>
+ <copy>
+ <from>'onAlarm'</from>
+ <to>$var1/DataPart</to>
+ </copy>
+ </assign>
</onAlarm>
</pick>
<reply name="endReply"
- operation="pickOp1"
- partnerLink="testPartnerLink"
- portType="test:TestPortType"
- variable="var1"/>
+ operation="pickOp1"
+ partnerLink="testPartnerLink"
+ portType="test:TestPortType"
+ variable="var1"/>
</sequence>
</process>
Modified: ode/trunk/bpel-scripts/src/main/resources/2.0/good/pick/Pick5-2.0.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-scripts/src/main/resources/2.0/good/pick/Pick5-2.0.bpel?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-scripts/src/main/resources/2.0/good/pick/Pick5-2.0.bpel (original)
+++ ode/trunk/bpel-scripts/src/main/resources/2.0/good/pick/Pick5-2.0.bpel Thu May 27 15:52:24 2010
@@ -19,7 +19,7 @@
-->
<!--
-
+
-->
<process name="pick5_mesex-2.0"
targetNamespace="http://ode/bpel/unit-test"
Modified: ode/trunk/bpel-scripts/src/main/resources/2.0/good/pick/Pick6-2.0.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-scripts/src/main/resources/2.0/good/pick/Pick6-2.0.bpel?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-scripts/src/main/resources/2.0/good/pick/Pick6-2.0.bpel (original)
+++ ode/trunk/bpel-scripts/src/main/resources/2.0/good/pick/Pick6-2.0.bpel Thu May 27 15:52:24 2010
@@ -19,25 +19,25 @@
-->
<!--
- Pick will be used to create process instance.
+ Pick will be used to create process instance.
-->
<process name="pick6_onAlarm-2.0"
- 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:tns="http://ode/bpel/unit-test"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:test="http://ode/bpel/unit-test.wsdl"
- suppressJoinFailure="yes">
+ 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:tns="http://ode/bpel/unit-test"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:test="http://ode/bpel/unit-test.wsdl"
+ suppressJoinFailure="yes">
<import namespace="http://ode/bpel/unit-test.wsdl"
- importType="http://schemas.xmlsoap.org/wsdl/"
- location="Pick6-2.0.wsdl" />
+ importType="http://schemas.xmlsoap.org/wsdl/"
+ location="Pick6-2.0.wsdl" />
<partnerLinks>
<partnerLink name="testPartnerLink"
- partnerLinkType="test:TestPartnerLinkType"
- myRole="me" />
+ partnerLinkType="test:TestPartnerLinkType"
+ myRole="me" />
</partnerLinks>
<variables>
@@ -46,37 +46,37 @@
<sequence>
<receive name="startReceive"
- partnerLink="testPartnerLink"
- portType="test:TestPortType"
- operation="pickOp1"
- variable="var1"
- createInstance="yes" />
+ partnerLink="testPartnerLink"
+ portType="test:TestPortType"
+ operation="pickOp1"
+ variable="var1"
+ createInstance="yes" />
<pick name="pick1" createInstance="no">
<onMessage partnerLink="testPartnerLink"
- portType="test:TestPortType"
- operation="pickOp2"
- variable="var1">
- <assign>
- <copy>
- <from>'onMessage'</from>
- <to>$var1/DataPart</to>
- </copy>
- </assign>
+ portType="test:TestPortType"
+ operation="pickOp2"
+ variable="var1">
+ <assign>
+ <copy>
+ <from>'onMessage'</from>
+ <to>$var1/DataPart</to>
+ </copy>
+ </assign>
</onMessage>
<onAlarm>
- <until>$var1/DataPart</until>
- <assign>
- <copy>
- <from>'onAlarm'</from>
- <to>$var1/DataPart</to>
- </copy>
- </assign>
+ <until>$var1/DataPart</until>
+ <assign>
+ <copy>
+ <from>'onAlarm'</from>
+ <to>$var1/DataPart</to>
+ </copy>
+ </assign>
</onAlarm>
</pick>
<reply name="endReply"
- operation="pickOp1"
- partnerLink="testPartnerLink"
- portType="test:TestPortType"
- variable="var1"/>
+ operation="pickOp1"
+ partnerLink="testPartnerLink"
+ portType="test:TestPortType"
+ variable="var1"/>
</sequence>
</process>
Modified: ode/trunk/bpel-scripts/src/main/resources/2.0/good/rethrow/Rethrow1-2.0.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-scripts/src/main/resources/2.0/good/rethrow/Rethrow1-2.0.bpel?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-scripts/src/main/resources/2.0/good/rethrow/Rethrow1-2.0.bpel (original)
+++ ode/trunk/bpel-scripts/src/main/resources/2.0/good/rethrow/Rethrow1-2.0.bpel Thu May 27 15:52:24 2010
@@ -18,83 +18,83 @@
-->
<process name="rethrow1-2.0"
- 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:tns="http://ode/bpel/unit-test"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:test="http://ode/bpel/unit-test.wsdl"
- suppressJoinFailure="yes">
+ 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:tns="http://ode/bpel/unit-test"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:test="http://ode/bpel/unit-test.wsdl"
+ suppressJoinFailure="yes">
<import importType="http://schemas.xmlsoap.org/wsdl/"
- location="./test.wsdl"
- namespace="http://ode/bpel/unit-test.wsdl" />
+ location="./test.wsdl"
+ namespace="http://ode/bpel/unit-test.wsdl" />
<partnerLinks>
<partnerLink name="testPartnerLink"
- partnerLinkType="test:TestPartnerLinkType"
- myRole="me" />
+ partnerLinkType="test:TestPartnerLinkType"
+ myRole="me" />
</partnerLinks>
<variables>
<variable name="var1" messageType="test:TestMessage1"/>
</variables>
<faultHandlers>
- <catch faultName="test:testFault1">
+ <catch faultName="test:testFault1">
<sequence>
- <assign>
- <copy>
- <from>
- concat($var1/TestPart, "-success")
- </from>
- <to>$var1/TestPart</to>
- </copy>
- </assign>
- <reply name="endReply"
- operation="testOperation"
- partnerLink="testPartnerLink"
- portType="test:TestPortType"
- variable="var1"/>
- </sequence>
+ <assign>
+ <copy>
+ <from>
+ concat($var1/TestPart, "-success")
+ </from>
+ <to>$var1/TestPart</to>
+ </copy>
+ </assign>
+ <reply name="endReply"
+ operation="testOperation"
+ partnerLink="testPartnerLink"
+ portType="test:TestPortType"
+ variable="var1"/>
+ </sequence>
</catch>
- </faultHandlers>
+ </faultHandlers>
<sequence>
<receive name="startReceive"
- createInstance="yes"
- partnerLink="testPartnerLink"
- portType="test:TestPortType"
- operation="testOperation"
- variable="var1"/>
+ createInstance="yes"
+ partnerLink="testPartnerLink"
+ portType="test:TestPortType"
+ operation="testOperation"
+ variable="var1"/>
<scope name="FaultScope">
<faultHandlers>
- <catch faultName="test:testFault1">
- <sequence>
- <assign>
- <copy>
- <from>'success'</from>
- <to>$var1/TestPart</to>
- </copy>
- </assign>
- <!-- HERE'S OUT RETHROW -->
- <rethrow/>
- </sequence>
- </catch>
- <catchAll>
- <assign>
- <copy>
- <from>'failure - catchAll happened'</from>
- <to>$var1/TestPart</to>
- </copy>
- </assign>
- </catchAll>
+ <catch faultName="test:testFault1">
+ <sequence>
+ <assign>
+ <copy>
+ <from>'success'</from>
+ <to>$var1/TestPart</to>
+ </copy>
+ </assign>
+ <!-- HERE'S OUT RETHROW -->
+ <rethrow/>
+ </sequence>
+ </catch>
+ <catchAll>
+ <assign>
+ <copy>
+ <from>'failure - catchAll happened'</from>
+ <to>$var1/TestPart</to>
+ </copy>
+ </assign>
+ </catchAll>
</faultHandlers>
<throw faultName="test:testFault1"/>
</scope>
<reply name="endReply"
- operation="testOperation"
- partnerLink="testPartnerLink"
- portType="test:TestPortType"
- variable="var1"/>
+ operation="testOperation"
+ partnerLink="testPartnerLink"
+ portType="test:TestPortType"
+ variable="var1"/>
</sequence>
</process>
Modified: ode/trunk/bpel-scripts/src/main/resources/2.0/good/rethrow/Rethrow2-2.0.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-scripts/src/main/resources/2.0/good/rethrow/Rethrow2-2.0.bpel?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-scripts/src/main/resources/2.0/good/rethrow/Rethrow2-2.0.bpel (original)
+++ ode/trunk/bpel-scripts/src/main/resources/2.0/good/rethrow/Rethrow2-2.0.bpel Thu May 27 15:52:24 2010
@@ -18,22 +18,22 @@
-->
<process name="rethrow2-2.0"
- 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:tns="http://ode/bpel/unit-test"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:test="http://ode/bpel/unit-test.wsdl"
- suppressJoinFailure="yes">
+ 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:tns="http://ode/bpel/unit-test"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:test="http://ode/bpel/unit-test.wsdl"
+ suppressJoinFailure="yes">
<import importType="http://schemas.xmlsoap.org/wsdl/"
- location="./test.wsdl"
- namespace="http://ode/bpel/unit-test.wsdl" />
+ location="./test.wsdl"
+ namespace="http://ode/bpel/unit-test.wsdl" />
<partnerLinks>
<partnerLink name="testPartnerLink"
- partnerLinkType="test:TestPartnerLinkType"
- myRole="me" />
+ partnerLinkType="test:TestPartnerLinkType"
+ myRole="me" />
</partnerLinks>
<variables>
@@ -41,48 +41,48 @@
</variables>
<sequence>
<receive name="startReceive"
- createInstance="yes"
- partnerLink="testPartnerLink"
- portType="test:TestPortType"
- operation="testOperation"
- variable="var1"/>
+ createInstance="yes"
+ partnerLink="testPartnerLink"
+ portType="test:TestPortType"
+ operation="testOperation"
+ variable="var1"/>
<scope name="FaultScope">
<faultHandlers>
- <catch faultName="test:testFault1">
- <!-- this will catch 'throw' -->
- <sequence>
- <assign>
- <copy>
- <from>'success1'</from>
- <to>$var1/TestPart</to>
- </copy>
- </assign>
- <scope>
- <faultHandlers>
- <!-- this will catch 'rethrow' -->
- <catch faultName="test:testFault1">
- <assign>
- <copy>
- <from>
- concat($var1/TestPart, "-success2")
- </from>
- <to>$var1/TestPart</to>
- </copy>
- </assign>
- </catch>
- </faultHandlers>
- <rethrow/>
- </scope>
- </sequence>
- </catch>
+ <catch faultName="test:testFault1">
+ <!-- this will catch 'throw' -->
+ <sequence>
+ <assign>
+ <copy>
+ <from>'success1'</from>
+ <to>$var1/TestPart</to>
+ </copy>
+ </assign>
+ <scope>
+ <faultHandlers>
+ <!-- this will catch 'rethrow' -->
+ <catch faultName="test:testFault1">
+ <assign>
+ <copy>
+ <from>
+ concat($var1/TestPart, "-success2")
+ </from>
+ <to>$var1/TestPart</to>
+ </copy>
+ </assign>
+ </catch>
+ </faultHandlers>
+ <rethrow/>
+ </scope>
+ </sequence>
+ </catch>
</faultHandlers>
<throw faultName="test:testFault1"/>
</scope>
<reply name="endReply"
- operation="testOperation"
- partnerLink="testPartnerLink"
- portType="test:TestPortType"
- variable="var1"/>
+ operation="testOperation"
+ partnerLink="testPartnerLink"
+ portType="test:TestPortType"
+ variable="var1"/>
</sequence>
</process>
Modified: ode/trunk/bpel-scripts/src/main/resources/2.0/good/rethrow/test.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-scripts/src/main/resources/2.0/good/rethrow/test.wsdl?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-scripts/src/main/resources/2.0/good/rethrow/test.wsdl (original)
+++ ode/trunk/bpel-scripts/src/main/resources/2.0/good/rethrow/test.wsdl Thu May 27 15:52:24 2010
@@ -31,7 +31,7 @@
<wsdl:types>
<xsd:schema
xmlns="http://ode/bpel/unit-test.wsdl"
- targetNamespace="http://ode/bpel/unit-test.wsdl">
+ targetNamespace="http://ode/bpel/unit-test.wsdl">
<xsd:element name="TestElement" type="xsd:string"/>
</xsd:schema>
</wsdl:types>
Modified: ode/trunk/bpel-scripts/src/main/resources/2.0/good/throw/Throw1-2.0.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-scripts/src/main/resources/2.0/good/throw/Throw1-2.0.bpel?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-scripts/src/main/resources/2.0/good/throw/Throw1-2.0.bpel (original)
+++ ode/trunk/bpel-scripts/src/main/resources/2.0/good/throw/Throw1-2.0.bpel Thu May 27 15:52:24 2010
@@ -18,22 +18,22 @@
-->
<process name="throw1-2.0"
- 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:tns="http://ode/bpel/unit-test"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:test="http://ode/bpel/unit-test.wsdl"
- suppressJoinFailure="yes">
+ 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:tns="http://ode/bpel/unit-test"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:test="http://ode/bpel/unit-test.wsdl"
+ suppressJoinFailure="yes">
<import importType="http://schemas.xmlsoap.org/wsdl/"
- location="./test.wsdl"
- namespace="http://ode/bpel/unit-test.wsdl" />
+ location="./test.wsdl"
+ namespace="http://ode/bpel/unit-test.wsdl" />
<partnerLinks>
<partnerLink name="testPartnerLink"
- partnerLinkType="test:TestPartnerLinkType"
- myRole="me" />
+ partnerLinkType="test:TestPartnerLinkType"
+ myRole="me" />
</partnerLinks>
<variables>
@@ -42,37 +42,37 @@
<sequence>
<receive name="startReceive"
- createInstance="yes"
- partnerLink="testPartnerLink"
- portType="test:TestPortType"
- operation="testOperation"
- variable="var1"/>
+ createInstance="yes"
+ partnerLink="testPartnerLink"
+ portType="test:TestPortType"
+ operation="testOperation"
+ variable="var1"/>
<scope name="FaultScope">
<faultHandlers>
- <catch faultName="test:testFault1">
- <assign>
- <copy>
- <from>'success'</from>
- <to>$var1/TestPart</to>
- </copy>
- </assign>
- </catch>
- <catchAll>
- <assign>
- <copy>
- <from>'failure - catchAll happened'</from>
- <to>$var1/TestPart</to>
- </copy>
- </assign>
- </catchAll>
+ <catch faultName="test:testFault1">
+ <assign>
+ <copy>
+ <from>'success'</from>
+ <to>$var1/TestPart</to>
+ </copy>
+ </assign>
+ </catch>
+ <catchAll>
+ <assign>
+ <copy>
+ <from>'failure - catchAll happened'</from>
+ <to>$var1/TestPart</to>
+ </copy>
+ </assign>
+ </catchAll>
</faultHandlers>
<throw faultName="test:testFault1"/>
</scope>
<reply name="endReply"
- operation="testOperation"
- partnerLink="testPartnerLink"
- portType="test:TestPortType"
- variable="var1"/>
+ operation="testOperation"
+ partnerLink="testPartnerLink"
+ portType="test:TestPortType"
+ variable="var1"/>
</sequence>
</process>
Modified: ode/trunk/bpel-scripts/src/main/resources/2.0/good/throw/Throw2-2.0.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-scripts/src/main/resources/2.0/good/throw/Throw2-2.0.bpel?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-scripts/src/main/resources/2.0/good/throw/Throw2-2.0.bpel (original)
+++ ode/trunk/bpel-scripts/src/main/resources/2.0/good/throw/Throw2-2.0.bpel Thu May 27 15:52:24 2010
@@ -18,23 +18,23 @@
-->
<process name="throw2-2.0"
- 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:tns="http://ode/bpel/unit-test"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:test="http://ode/bpel/unit-test.wsdl"
- suppressJoinFailure="yes">
+ 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:tns="http://ode/bpel/unit-test"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:test="http://ode/bpel/unit-test.wsdl"
+ suppressJoinFailure="yes">
<import importType="http://schemas.xmlsoap.org/wsdl/"
- location="test.wsdl"
- namespace="http://ode/bpel/unit-test.wsdl" />
+ location="test.wsdl"
+ namespace="http://ode/bpel/unit-test.wsdl" />
<partnerLinks>
<partnerLink name="testPartnerLink"
- partnerLinkType="test:TestPartnerLinkType"
- myRole="me" />
+ partnerLinkType="test:TestPartnerLinkType"
+ myRole="me" />
</partnerLinks>
<variables>
@@ -44,42 +44,42 @@
<sequence>
<receive name="startReceive"
- createInstance="yes"
- partnerLink="testPartnerLink"
- portType="test:TestPortType"
- operation="testOperation"
- variable="var1"/>
+ createInstance="yes"
+ partnerLink="testPartnerLink"
+ portType="test:TestPortType"
+ operation="testOperation"
+ variable="var1"/>
<scope>
<faultHandlers>
- <catch faultVariable="faultVar"
- faultMessageType="test:TestMessage1">
- <assign>
- <copy>
- <from>$faultVar</from>
- <to>$var2</to>
- </copy>
- <copy>
- <from>'success'</from>
- <to>$var2/TestPart</to>
- </copy>
- </assign>
- </catch>
- <catchAll>
- <assign>
- <copy>
- <from>'failure - catchAll happened'</from>
- <to>$var2/TestPart</to>
- </copy>
- </assign>
- </catchAll>
+ <catch faultVariable="faultVar"
+ faultMessageType="test:TestMessage1">
+ <assign>
+ <copy>
+ <from>$faultVar</from>
+ <to>$var2</to>
+ </copy>
+ <copy>
+ <from>'success'</from>
+ <to>$var2/TestPart</to>
+ </copy>
+ </assign>
+ </catch>
+ <catchAll>
+ <assign>
+ <copy>
+ <from>'failure - catchAll happened'</from>
+ <to>$var2/TestPart</to>
+ </copy>
+ </assign>
+ </catchAll>
</faultHandlers>
<throw faultName="test:testFault1" faultVariable="var1"/>
</scope>
<reply name="endReply"
- operation="testOperation"
- partnerLink="testPartnerLink"
- portType="test:TestPortType"
- variable="var2"/>
+ operation="testOperation"
+ partnerLink="testPartnerLink"
+ portType="test:TestPortType"
+ variable="var2"/>
</sequence>
</process>
Modified: ode/trunk/bpel-scripts/src/main/resources/2.0/good/throw/Throw4-2.0.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-scripts/src/main/resources/2.0/good/throw/Throw4-2.0.bpel?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-scripts/src/main/resources/2.0/good/throw/Throw4-2.0.bpel (original)
+++ ode/trunk/bpel-scripts/src/main/resources/2.0/good/throw/Throw4-2.0.bpel Thu May 27 15:52:24 2010
@@ -27,8 +27,8 @@
suppressJoinFailure="yes">
<import importType="http://schemas.xmlsoap.org/wsdl/"
- location="test.wsdl"
- namespace="http://ode/bpel/unit-test.wsdl" />
+ location="test.wsdl"
+ namespace="http://ode/bpel/unit-test.wsdl" />
<partnerLinks>
@@ -40,26 +40,26 @@
<variables>
<variable name="var1" messageType="test:TestMessage1"/>
</variables>
- <faultHandlers>
- <catch faultName="test:testFault1"
- faultVariable="faultVar"
- faultMessageType="test:TestMessage1">
+ <faultHandlers>
+ <catch faultName="test:testFault1"
+ faultVariable="faultVar"
+ faultMessageType="test:TestMessage1">
<sequence>
- <assign>
- <copy>
- <from>'success'</from>
- <to>$faultVar/TestPart</to>
- </copy>
- </assign>
- <reply name="endReply"
- operation="testOperation"
- partnerLink="testPartnerLink"
- portType="test:TestPortType"
- variable="faultVar"
- faultName="test:testFault1"/>
- </sequence>
+ <assign>
+ <copy>
+ <from>'success'</from>
+ <to>$faultVar/TestPart</to>
+ </copy>
+ </assign>
+ <reply name="endReply"
+ operation="testOperation"
+ partnerLink="testPartnerLink"
+ portType="test:TestPortType"
+ variable="faultVar"
+ faultName="test:testFault1"/>
+ </sequence>
</catch>
- </faultHandlers>
+ </faultHandlers>
<sequence>
<receive
createInstance="yes"
Modified: ode/trunk/bpel-scripts/src/main/resources/2.0/good/throw/Throw5-2.0.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-scripts/src/main/resources/2.0/good/throw/Throw5-2.0.bpel?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-scripts/src/main/resources/2.0/good/throw/Throw5-2.0.bpel (original)
+++ ode/trunk/bpel-scripts/src/main/resources/2.0/good/throw/Throw5-2.0.bpel Thu May 27 15:52:24 2010
@@ -18,8 +18,8 @@
-->
<!-- test intention
- scenario: throws a fault with associated data of element type
- outcome: catch with same variable element type should match fault
+ scenario: throws a fault with associated data of element type
+ outcome: catch with same variable element type should match fault
-->
<process name="throw5-2.0"
@@ -32,8 +32,8 @@
suppressJoinFailure="yes">
<import importType="http://schemas.xmlsoap.org/wsdl/"
- location="test.wsdl"
- namespace="http://ode/bpel/unit-test.wsdl" />
+ location="test.wsdl"
+ namespace="http://ode/bpel/unit-test.wsdl" />
<partnerLinks>
<partnerLink name="testPartnerLink"
@@ -56,10 +56,10 @@
variable="var1"/>
<scope>
<faultHandlers>
- <catch faultName="test:foo"
- faultVariable="faultVar"
- faultMessageType="test:TestMessage1">
- <!-- we do NOT want to be here -->
+ <catch faultName="test:foo"
+ faultVariable="faultVar"
+ faultMessageType="test:TestMessage1">
+ <!-- we do NOT want to be here -->
<assign>
<copy>
<from>'failure'</from>
@@ -68,9 +68,9 @@
</assign>
</catch>
<catch faultName="test:foo"
- faultVariable="faultVar"
- faultElement="test:TestElement">
- <!-- we want to be here -->
+ faultVariable="faultVar"
+ faultElement="test:TestElement">
+ <!-- we want to be here -->
<assign>
<copy>
<from>'success'</from>
@@ -86,15 +86,15 @@
</copy>
</assign>
</catchAll>
- </faultHandlers>
- <sequence>
- <assign>
- <copy>
- <from>$var1/ElementPart</from>
- <to>$var2</to>
- </copy>
- </assign>
- <throw faultName="test:foo" faultVariable="var2"/>
+ </faultHandlers>
+ <sequence>
+ <assign>
+ <copy>
+ <from>$var1/ElementPart</from>
+ <to>$var2</to>
+ </copy>
+ </assign>
+ <throw faultName="test:foo" faultVariable="var2"/>
</sequence>
</scope>
<reply name="endReply"
Modified: ode/trunk/bpel-scripts/src/main/resources/2.0/good/throw/Throw7-2.0.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-scripts/src/main/resources/2.0/good/throw/Throw7-2.0.bpel?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-scripts/src/main/resources/2.0/good/throw/Throw7-2.0.bpel (original)
+++ ode/trunk/bpel-scripts/src/main/resources/2.0/good/throw/Throw7-2.0.bpel Thu May 27 15:52:24 2010
@@ -18,9 +18,9 @@
-->
<!-- test intention
- scenario: throws a fault with associated data of element type
- this also tests case where messageType has a part with a single element type.
- outcome: catch with same variable element type should match fault
+ scenario: throws a fault with associated data of element type
+ this also tests case where messageType has a part with a single element type.
+ outcome: catch with same variable element type should match fault
-->
<process name="throw7-2.0"
@@ -33,8 +33,8 @@
suppressJoinFailure="yes">
<import importType="http://schemas.xmlsoap.org/wsdl/"
- location="test.wsdl"
- namespace="http://ode/bpel/unit-test.wsdl" />
+ location="test.wsdl"
+ namespace="http://ode/bpel/unit-test.wsdl" />
<partnerLinks>
<partnerLink name="testPartnerLink"
@@ -56,13 +56,13 @@
variable="var1"/>
<scope>
<faultHandlers>
- <catch faultVariable="faultVar"
- faultElement="test:TestElement">
- <!--
- we want to be here; the fault data is actually
- a message type, but b/c it's a single part with
- a matching element, we should match this catch
- -->
+ <catch faultVariable="faultVar"
+ faultElement="test:TestElement">
+ <!--
+ we want to be here; the fault data is actually
+ a message type, but b/c it's a single part with
+ a matching element, we should match this catch
+ -->
<assign>
<copy>
<from>'success'</from>
@@ -78,9 +78,9 @@
</copy>
</assign>
</catchAll>
- </faultHandlers>
- <sequence>
- <throw faultName="test:foo" faultVariable="var1"/>
+ </faultHandlers>
+ <sequence>
+ <throw faultName="test:foo" faultVariable="var1"/>
</sequence>
</scope>
<reply name="endReply"
Modified: ode/trunk/bpel-scripts/src/main/resources/2.0/good/throw/test.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-scripts/src/main/resources/2.0/good/throw/test.wsdl?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-scripts/src/main/resources/2.0/good/throw/test.wsdl (original)
+++ ode/trunk/bpel-scripts/src/main/resources/2.0/good/throw/test.wsdl Thu May 27 15:52:24 2010
@@ -31,7 +31,7 @@
<wsdl:types>
<xsd:schema
xmlns="http://ode/bpel/unit-test.wsdl"
- targetNamespace="http://ode/bpel/unit-test.wsdl">
+ targetNamespace="http://ode/bpel/unit-test.wsdl">
<xsd:element name="TestElement" type="xsd:string"/>
</xsd:schema>
</wsdl:types>
Modified: ode/trunk/bpel-scripts/src/main/resources/2.0/good/wait/Wait1-2.0.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-scripts/src/main/resources/2.0/good/wait/Wait1-2.0.bpel?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-scripts/src/main/resources/2.0/good/wait/Wait1-2.0.bpel (original)
+++ ode/trunk/bpel-scripts/src/main/resources/2.0/good/wait/Wait1-2.0.bpel Thu May 27 15:52:24 2010
@@ -27,8 +27,8 @@
suppressJoinFailure="yes">
<import importType="http://schemas.xmlsoap.org/wsdl/"
- location="test.wsdl"
- namespace="http://ode/bpel/unit-test.wsdl" />
+ location="test.wsdl"
+ namespace="http://ode/bpel/unit-test.wsdl" />
<partnerLinks>
<partnerLink name="testPartnerLink"
@@ -52,7 +52,7 @@
<wait>
<for>'PT5S'</for>
</wait>
-
+
<reply name="endReply"
operation="testOperation"
partnerLink="testPartnerLink"
Modified: ode/trunk/bpel-scripts/src/main/resources/2.0/good/wait/Wait2-2.0.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-scripts/src/main/resources/2.0/good/wait/Wait2-2.0.bpel?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-scripts/src/main/resources/2.0/good/wait/Wait2-2.0.bpel (original)
+++ ode/trunk/bpel-scripts/src/main/resources/2.0/good/wait/Wait2-2.0.bpel Thu May 27 15:52:24 2010
@@ -27,8 +27,8 @@
suppressJoinFailure="yes">
<import importType="http://schemas.xmlsoap.org/wsdl/"
- location="test.wsdl"
- namespace="http://ode/bpel/unit-test.wsdl" />
+ location="test.wsdl"
+ namespace="http://ode/bpel/unit-test.wsdl" />
<partnerLinks>
<partnerLink name="testPartnerLink"
@@ -52,7 +52,7 @@
<wait>
<until>$var1/Time</until>
</wait>
-
+
<reply name="endReply"
operation="testOperation"
partnerLink="testPartnerLink"
Modified: ode/trunk/bpel-scripts/src/main/resources/2.0/good/while/While1-2.0.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-scripts/src/main/resources/2.0/good/while/While1-2.0.bpel?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-scripts/src/main/resources/2.0/good/while/While1-2.0.bpel (original)
+++ ode/trunk/bpel-scripts/src/main/resources/2.0/good/while/While1-2.0.bpel Thu May 27 15:52:24 2010
@@ -27,8 +27,8 @@
suppressJoinFailure="yes">
<import importType="http://schemas.xmlsoap.org/wsdl/"
- location="While1-2.0.wsdl"
- namespace="http://ode/bpel/unit-test.wsdl" />
+ location="While1-2.0.wsdl"
+ namespace="http://ode/bpel/unit-test.wsdl" />
<partnerLinks>
<partnerLink name="testPartnerLink"
Modified: ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath10-func/GetVariableData1-2.0.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath10-func/GetVariableData1-2.0.bpel?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath10-func/GetVariableData1-2.0.bpel (original)
+++ ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath10-func/GetVariableData1-2.0.bpel Thu May 27 15:52:24 2010
@@ -32,8 +32,8 @@ bpws:getVariableData(varname, partname)
xmlns:test="uri:testing">
<import importType="http://schemas.xmlsoap.org/wsdl/"
- location="../test.wsdl"
- namespace="uri:testing" />
+ location="../test.wsdl"
+ namespace="uri:testing" />
<partnerLinks>
<partnerLink name="testPartnerLink"
partnerLinkType="test:PartnerLinkType1"
Modified: ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath10-func/GetVariableData2-2.0.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath10-func/GetVariableData2-2.0.bpel?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath10-func/GetVariableData2-2.0.bpel (original)
+++ ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath10-func/GetVariableData2-2.0.bpel Thu May 27 15:52:24 2010
@@ -32,8 +32,8 @@ bpws:getVariableData(varname, partname)
xmlns:test="uri:testing">
<import importType="http://schemas.xmlsoap.org/wsdl/"
- location="../test.wsdl"
- namespace="uri:testing" />
+ location="../test.wsdl"
+ namespace="uri:testing" />
<partnerLinks>
<partnerLink name="testPartnerLink"
partnerLinkType="test:PartnerLinkType1"
Modified: ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath10-func/GetVariableData3-2.0.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath10-func/GetVariableData3-2.0.bpel?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath10-func/GetVariableData3-2.0.bpel (original)
+++ ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath10-func/GetVariableData3-2.0.bpel Thu May 27 15:52:24 2010
@@ -32,9 +32,9 @@ bpws:getVariableData(varname, partname)
xmlns:test="uri:testing">
<import importType="http://schemas.xmlsoap.org/wsdl/"
- location="../test.wsdl"
- namespace="uri:testing" />
-
+ location="../test.wsdl"
+ namespace="uri:testing" />
+
<partnerLinks>
<partnerLink name="testPartnerLink"
partnerLinkType="test:PartnerLinkType1"
Modified: ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath10-func/GetVariableData4-2.0.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath10-func/GetVariableData4-2.0.bpel?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath10-func/GetVariableData4-2.0.bpel (original)
+++ ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath10-func/GetVariableData4-2.0.bpel Thu May 27 15:52:24 2010
@@ -33,9 +33,9 @@ bpws:getVariableData(varname, partname,q
xmlns:test="uri:testing">
<import importType="http://schemas.xmlsoap.org/wsdl/"
- location="../test.wsdl"
- namespace="uri:testing" />
-
+ location="../test.wsdl"
+ namespace="uri:testing" />
+
<partnerLinks>
<partnerLink name="testPartnerLink"
partnerLinkType="test:PartnerLinkType1"
Modified: ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath10-func/GetVariableProperty1-2.0.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath10-func/GetVariableProperty1-2.0.bpel?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath10-func/GetVariableProperty1-2.0.bpel (original)
+++ ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath10-func/GetVariableProperty1-2.0.bpel Thu May 27 15:52:24 2010
@@ -30,9 +30,9 @@ bpws:getVariableProperty Test Case
xmlns:test="uri:testing">
<import importType="http://schemas.xmlsoap.org/wsdl/"
- location="../test.wsdl"
- namespace="uri:testing" />
-
+ location="../test.wsdl"
+ namespace="uri:testing" />
+
<partnerLinks>
<partnerLink name="testPartnerLink"
partnerLinkType="test:PartnerLinkType1"
Modified: ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath20-func/GetVariableData1-xp2.0.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath20-func/GetVariableData1-xp2.0.bpel?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath20-func/GetVariableData1-xp2.0.bpel (original)
+++ ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath20-func/GetVariableData1-xp2.0.bpel Thu May 27 15:52:24 2010
@@ -34,8 +34,8 @@ bpws:getVariableData(varname, partname)
expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
<import importType="http://schemas.xmlsoap.org/wsdl/"
- location="../test.wsdl"
- namespace="uri:testing" />
+ location="../test.wsdl"
+ namespace="uri:testing" />
<partnerLinks>
<partnerLink name="testPartnerLink"
@@ -61,8 +61,8 @@ bpws:getVariableData(varname, partname)
<copy>
<from>
- $var1.StringPart1
- </from>
+ $var1.StringPart1
+ </from>
<to variable="var1" part="StringPart2"/>
</copy>
</assign>
Modified: ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath20-func/GetVariableData2-xp2.0.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath20-func/GetVariableData2-xp2.0.bpel?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath20-func/GetVariableData2-xp2.0.bpel (original)
+++ ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath20-func/GetVariableData2-xp2.0.bpel Thu May 27 15:52:24 2010
@@ -34,8 +34,8 @@ bpws:getVariableData(varname, partname)
expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
<import importType="http://schemas.xmlsoap.org/wsdl/"
- location="../test.wsdl"
- namespace="uri:testing" />
+ location="../test.wsdl"
+ namespace="uri:testing" />
<partnerLinks>
<partnerLink name="testPartnerLink"
@@ -61,8 +61,8 @@ bpws:getVariableData(varname, partname)
<copy>
<from>
- $var1/TComplex1Part1/test:StringElement
- </from>
+ $var1/TComplex1Part1/test:StringElement
+ </from>
<to>$var1/StringPart2</to>
</copy>
</assign>
Modified: ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath20-func/GetVariableData3-xp2.0.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath20-func/GetVariableData3-xp2.0.bpel?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath20-func/GetVariableData3-xp2.0.bpel (original)
+++ ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath20-func/GetVariableData3-xp2.0.bpel Thu May 27 15:52:24 2010
@@ -34,8 +34,8 @@ bpws:getVariableData(varname, partname)
expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
<import importType="http://schemas.xmlsoap.org/wsdl/"
- location="../test.wsdl"
- namespace="uri:testing" />
+ location="../test.wsdl"
+ namespace="uri:testing" />
<partnerLinks>
<partnerLink name="testPartnerLink"
Modified: ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath20-func/GetVariableData4-xp2.0.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath20-func/GetVariableData4-xp2.0.bpel?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath20-func/GetVariableData4-xp2.0.bpel (original)
+++ ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath20-func/GetVariableData4-xp2.0.bpel Thu May 27 15:52:24 2010
@@ -35,8 +35,8 @@ bpws:getVariableData(varname, partname,q
expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
<import importType="http://schemas.xmlsoap.org/wsdl/"
- location="../test.wsdl"
- namespace="http://ode/bpel/unit-test.wsdl" />
+ location="../test.wsdl"
+ namespace="http://ode/bpel/unit-test.wsdl" />
<partnerLinks>
<partnerLink name="testPartnerLink"
Modified: ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath20-func/GetVariableProperty1-xp2.0.bpel
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath20-func/GetVariableProperty1-xp2.0.bpel?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath20-func/GetVariableProperty1-xp2.0.bpel (original)
+++ ode/trunk/bpel-scripts/src/main/resources/2.0/good/xpath20-func/GetVariableProperty1-xp2.0.bpel Thu May 27 15:52:24 2010
@@ -32,8 +32,8 @@ bpws:getVariableProperty Test Case
expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
<import importType="http://schemas.xmlsoap.org/wsdl/"
- location="../test.wsdl"
- namespace="uri:testing" />
+ location="../test.wsdl"
+ namespace="uri:testing" />
<partnerLinks>
<partnerLink name="testPartnerLink"
Modified: ode/trunk/bpel-scripts/src/main/resources/2.0/good/xsd-import/message.xsd
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-scripts/src/main/resources/2.0/good/xsd-import/message.xsd?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-scripts/src/main/resources/2.0/good/xsd-import/message.xsd (original)
+++ ode/trunk/bpel-scripts/src/main/resources/2.0/good/xsd-import/message.xsd Thu May 27 15:52:24 2010
@@ -22,9 +22,9 @@
<element name="start" type="string"></element>
<complexType name="Data">
- <sequence>
- <element name="Name" type="string"></element>
- <element name="Age" type="string"></element>
- </sequence>
+ <sequence>
+ <element name="Name" type="string"></element>
+ <element name="Age" type="string"></element>
+ </sequence>
</complexType>
</schema>
\ No newline at end of file
Modified: ode/trunk/bpel-store/pom.xml
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/pom.xml?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-store/pom.xml (original)
+++ ode/trunk/bpel-store/pom.xml Thu May 27 15:52:24 2010
@@ -178,18 +178,18 @@
<tasks>
<property name="maven.runtime.classpath" refid="maven.test.classpath"/>
<path id="classpath">
- <pathelement path="${maven.runtime.classpath}"/>
- </path>
- <taskdef name="openjpac" classname="org.apache.openjpa.ant.PCEnhancerTask" classpathref="classpath"/>
+ <pathelement path="${maven.runtime.classpath}"/>
+ </path>
+ <taskdef name="openjpac" classname="org.apache.openjpa.ant.PCEnhancerTask" classpathref="classpath"/>
<openjpac>
- <fileset dir="${basedir}/src/main">
- <include name="**/*.java" />
- </fileset>
- <classpath>
- <pathelement location="${basedir}/target/classes"/>
- <pathelement path="${maven.runtime.classpath}"/>
- </classpath>
- </openjpac>
+ <fileset dir="${basedir}/src/main">
+ <include name="**/*.java" />
+ </fileset>
+ <classpath>
+ <pathelement location="${basedir}/target/classes"/>
+ <pathelement path="${maven.runtime.classpath}"/>
+ </classpath>
+ </openjpac>
</tasks>
</configuration>
</execution>
@@ -205,7 +205,7 @@
<goals>
<goal>xdoclet</goal>
</goals>
-
+
<configuration>
<tasks>
<hibernatedoclet excludedTags="@version,@author,@todo" verbose="true"
Modified: ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java (original)
+++ ode/trunk/bpel-store/src/main/java/org/apache/ode/store/DeploymentUnitDir.java Thu May 27 15:52:24 2010
@@ -146,8 +146,8 @@ class DeploymentUnitDir {
}
void setName(String name) {
- // supports extensibility
- _name = name;
+ // supports extensibility
+ _name = name;
}
CBPInfo getCBPInfo(QName typeName) {
@@ -164,14 +164,14 @@ class DeploymentUnitDir {
if (bpels.size() == 0)
throw new IllegalArgumentException("Directory " + _duDirectory.getName() + " does not contain any process!");
for (File bpel : bpels) {
- String b = bpel.getAbsolutePath();
- File cbp = new File(b.substring(0,b.lastIndexOf(".bpel")) + ".cbp");
- if (!cbp.exists()) {
- __log.debug("compiling " + bpel);
- compile(bpel);
- } else {
- __log.debug("skipping compilation of " + bpel + " cbp found: " + cbp);
- }
+ String b = bpel.getAbsolutePath();
+ File cbp = new File(b.substring(0,b.lastIndexOf(".bpel")) + ".cbp");
+ if (!cbp.exists()) {
+ __log.debug("compiling " + bpel);
+ compile(bpel);
+ } else {
+ __log.debug("skipping compilation of " + bpel + " cbp found: " + cbp);
+ }
}
}
@@ -208,13 +208,13 @@ class DeploymentUnitDir {
bpelc.setBaseDirectory(_duDirectory);
// Create process such that immutable objects are intern'ed.
InternPool.runBlock(new InternableBlock() {
- public void run() {
+ public void run() {
try {
bpelc.compile(bpelFile, getVersion());
} catch (IOException e) {
__log.error("Compile error in " + bpelFile, e);
}
- }
+ }
});
}
Modified: ode/trunk/bpel-store/src/main/java/org/apache/ode/store/Messages.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/Messages.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/main/java/org/apache/ode/store/Messages.java (original)
+++ ode/trunk/bpel-store/src/main/java/org/apache/ode/store/Messages.java Thu May 27 15:52:24 2010
@@ -203,9 +203,9 @@ public class Messages extends MessageBun
public String msgDeployFailCompileErrors(CompilationException ce) {
if (ce != null) {
- return format("Deploy failed; {0}", ce.getMessage());
+ return format("Deploy failed; {0}", ce.getMessage());
} else {
- return format("Deploy failed; BPEL compilation errors." );
+ return format("Deploy failed; BPEL compilation errors." );
}
}
Modified: ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java (original)
+++ ode/trunk/bpel-store/src/main/java/org/apache/ode/store/ProcessStoreImpl.java Thu May 27 15:52:24 2010
@@ -161,7 +161,7 @@ public class ProcessStoreImpl implements
* Deploys a process.
*/
public Collection<QName> deploy(final File deploymentUnitDirectory, boolean autoincrementVersion) {
- return deploy(deploymentUnitDirectory, true, null, autoincrementVersion);
+ return deploy(deploymentUnitDirectory, true, null, autoincrementVersion);
}
public Collection<QName> deploy(final File deploymentUnitDirectory) {
@@ -179,8 +179,8 @@ public class ProcessStoreImpl implements
// Create the DU and compile/scan it before acquiring lock.
final DeploymentUnitDir du = new DeploymentUnitDir(deploymentUnitDirectory);
if( duName != null ) {
- // Override the package name if given from the parameter
- du.setName(duName);
+ // Override the package name if given from the parameter
+ du.setName(duName);
}
long version;
@@ -348,10 +348,10 @@ public class ProcessStoreImpl implements
}
public Collection<QName> undeploy(final File dir) {
- return undeploy(dir.getName());
+ return undeploy(dir.getName());
}
- public Collection<QName> undeploy(final String duName) {
+ public Collection<QName> undeploy(final String duName) {
try {
exec(new Callable<Collection<QName>>() {
public Collection<QName> call(ConfStoreConnection conn) {
@@ -728,11 +728,11 @@ public class ProcessStoreImpl implements
return f;
f = new File(_deployDir, dudao.getName());
if (f.exists()) {
- try {
- dudao.setDeploymentUnitDir(f.getCanonicalPath());
- } catch (IOException e) {
- __log.warn("Could not update deployment unit directory for " + dudao.getName(), e);
- }
+ try {
+ dudao.setDeploymentUnitDir(f.getCanonicalPath());
+ } catch (IOException e) {
+ __log.warn("Could not update deployment unit directory for " + dudao.getName(), e);
+ }
return f;
}
@@ -806,12 +806,12 @@ public class ProcessStoreImpl implements
public void setDeployDir(File depDir) {
if (depDir != null) {
- if( !depDir.exists() ) {
- depDir.mkdirs();
- __log.warn("Deploy directory: " + depDir.getAbsolutePath() + " does not exist; created it.");
- } else if(!depDir.isDirectory()) {
+ if( !depDir.exists() ) {
+ depDir.mkdirs();
+ __log.warn("Deploy directory: " + depDir.getAbsolutePath() + " does not exist; created it.");
+ } else if(!depDir.isDirectory()) {
throw new IllegalArgumentException("Deploy directory is not a directory: " + depDir);
- }
+ }
}
_deployDir = depDir;
Modified: ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java (original)
+++ ode/trunk/bpel-store/src/main/java/org/apache/ode/store/hib/DbConfStoreConnectionFactory.java Thu May 27 15:52:24 2010
@@ -137,18 +137,18 @@ public class DbConfStoreConnectionFactor
return new ConfStoreConnectionHib(_sessionFactory.getCurrentSession());
}
- @SuppressWarnings("unchecked")
- private void initTxMgr(String txFactoryClassName) {
- __log.info("ProcessStore initializing transaction manager using " + txFactoryClassName);
- try {
- Class txFactClass = getClass().getClassLoader().loadClass(txFactoryClassName);
- Object txFact = txFactClass.newInstance();
- _txMgr = (TransactionManager) txFactClass.getMethod("getTransactionManager", (Class[]) null).invoke(txFact);
- } catch (Exception e) {
- __log.fatal("Couldn't initialize a transaction manager with factory: " + txFactoryClassName, e);
- throw new RuntimeException("Couldn't initialize a transaction manager with factory: " + txFactoryClassName, e);
- }
- }
+ @SuppressWarnings("unchecked")
+ private void initTxMgr(String txFactoryClassName) {
+ __log.info("ProcessStore initializing transaction manager using " + txFactoryClassName);
+ try {
+ Class txFactClass = getClass().getClassLoader().loadClass(txFactoryClassName);
+ Object txFact = txFactClass.newInstance();
+ _txMgr = (TransactionManager) txFactClass.getMethod("getTransactionManager", (Class[]) null).invoke(txFact);
+ } catch (Exception e) {
+ __log.fatal("Couldn't initialize a transaction manager with factory: " + txFactoryClassName, e);
+ throw new RuntimeException("Couldn't initialize a transaction manager with factory: " + txFactoryClassName, e);
+ }
+ }
private String guessDialect(DataSource dataSource) throws Exception {
@@ -186,28 +186,28 @@ public class DbConfStoreConnectionFactor
}
public void beginTransaction() {
- try {
- _txMgr.begin();
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
-
- public void commitTransaction() {
- try {
- _txMgr.commit();
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
-
- public void rollbackTransaction() {
- try {
- _txMgr.rollback();
- } catch (Exception e) {
- throw new RuntimeException(e);
- }
- }
+ try {
+ _txMgr.begin();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public void commitTransaction() {
+ try {
+ _txMgr.commit();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
+
+ public void rollbackTransaction() {
+ try {
+ _txMgr.rollback();
+ } catch (Exception e) {
+ throw new RuntimeException(e);
+ }
+ }
static Configuration getDefaultConfiguration() throws MappingException {
return new Configuration().addClass(ProcessConfDaoImpl.class).addClass(DeploymentUnitDaoImpl.class)
@@ -221,7 +221,7 @@ public class DbConfStoreConnectionFactor
}
public void configure(Properties props) throws HibernateException {
- _guid = props.getProperty(SessionManager.PROP_GUID);
+ _guid = props.getProperty(SessionManager.PROP_GUID);
}
public Connection getConnection() throws SQLException {
Modified: ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/ConfStoreConnectionJpa.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/ConfStoreConnectionJpa.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/ConfStoreConnectionJpa.java (original)
+++ ode/trunk/bpel-store/src/main/java/org/apache/ode/store/jpa/ConfStoreConnectionJpa.java Thu May 27 15:52:24 2010
@@ -33,8 +33,8 @@ import java.util.List;
* @author Matthieu Riou <mriou at apache dot org>
*/
public class ConfStoreConnectionJpa implements ConfStoreConnection {
- private static Log LOG = LogFactory.getLog(ConfStoreConnectionJpa.class);
-
+ private static Log LOG = LogFactory.getLog(ConfStoreConnectionJpa.class);
+
private EntityManager _em;
static final ThreadLocal<EntityManager> _current = new ThreadLocal<EntityManager>();
Modified: ode/trunk/bpel-store/src/test/resources/complexImport/bar.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/test/resources/complexImport/bar.wsdl?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/test/resources/complexImport/bar.wsdl (original)
+++ ode/trunk/bpel-store/src/test/resources/complexImport/bar.wsdl Thu May 27 15:52:24 2010
@@ -56,9 +56,9 @@
</wsdl:operation>
</wsdl:binding>
<wsdl:service name="HelloService">
- <wsdl:port name="HelloPort" binding="tns:HelloSoapBinding">
- <soap:address location="http://localhost:8080/ode/processes/helloWorld"/>
- </wsdl:port>
+ <wsdl:port name="HelloPort" binding="tns:HelloSoapBinding">
+ <soap:address location="http://localhost:8080/ode/processes/helloWorld"/>
+ </wsdl:port>
</wsdl:service>
<plnk:partnerLinkType name="HelloPartnerLinkType">
Modified: ode/trunk/bpel-store/src/test/resources/complexImport/deploy.xml
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/test/resources/complexImport/deploy.xml?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/test/resources/complexImport/deploy.xml (original)
+++ ode/trunk/bpel-store/src/test/resources/complexImport/deploy.xml Thu May 27 15:52:24 2010
@@ -17,14 +17,14 @@
~ under the License.
-->
<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
- xmlns:pns="http://ode/bpel/unit-test"
- xmlns:wns="http://ode/bpel/unit-test.wsdl">
+ xmlns:pns="http://ode/bpel/unit-test"
+ xmlns:wns="http://ode/bpel/unit-test.wsdl">
- <process name="pns:HelloWorld2">
- <active>true</active>
- <provide partnerLink="helloPartnerLink">
- <service name="wns:HelloService" port="HelloPort"/>
- </provide>
- </process>
+ <process name="pns:HelloWorld2">
+ <active>true</active>
+ <provide partnerLink="helloPartnerLink">
+ <service name="wns:HelloService" port="HelloPort"/>
+ </provide>
+ </process>
</deploy>
Modified: ode/trunk/bpel-store/src/test/resources/complexImport/dir1/dir11/baz.xsd
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/test/resources/complexImport/dir1/dir11/baz.xsd?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/test/resources/complexImport/dir1/dir11/baz.xsd (original)
+++ ode/trunk/bpel-store/src/test/resources/complexImport/dir1/dir11/baz.xsd Thu May 27 15:52:24 2010
@@ -20,40 +20,40 @@
-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
- xmlns:wh="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.xsd"
- targetNamespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.xsd">
+ xmlns:wh="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.xsd"
+ targetNamespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.xsd">
- <xs:simpleType name="CustomerReferenceType">
- <xs:restriction base="xs:normalizedString">
- <xs:maxLength value="20"/>
- <xs:pattern value="[A-D][0-9]{5}-[0-9A-Z]{7}-[a-z]{3}#*"/>
- </xs:restriction>
- </xs:simpleType>
-
- <xs:complexType name="Item">
- <xs:sequence>
- <xs:element name="ProductNumber" type="xs:nonNegativeInteger"/>
- <xs:element name="Quantity" type="xs:unsignedShort"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="ItemList">
- <xs:sequence>
- <xs:element name="Item" type="wh:Item" minOccurs="1" maxOccurs="unbounded" nillable="false"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="ItemShippingStatus">
- <xs:sequence>
- <xs:element name="ProductNumber" type="xs:nonNegativeInteger"/>
- <xs:element name="Status" type="xs:boolean"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:complexType name="ItemShippingStatusList">
- <xs:sequence>
- <xs:element name="ItemStatus" type="wh:ItemShippingStatus" minOccurs="1" maxOccurs="unbounded" nillable="false"/>
- </xs:sequence>
- </xs:complexType>
+ <xs:simpleType name="CustomerReferenceType">
+ <xs:restriction base="xs:normalizedString">
+ <xs:maxLength value="20"/>
+ <xs:pattern value="[A-D][0-9]{5}-[0-9A-Z]{7}-[a-z]{3}#*"/>
+ </xs:restriction>
+ </xs:simpleType>
+
+ <xs:complexType name="Item">
+ <xs:sequence>
+ <xs:element name="ProductNumber" type="xs:nonNegativeInteger"/>
+ <xs:element name="Quantity" type="xs:unsignedShort"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="ItemList">
+ <xs:sequence>
+ <xs:element name="Item" type="wh:Item" minOccurs="1" maxOccurs="unbounded" nillable="false"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="ItemShippingStatus">
+ <xs:sequence>
+ <xs:element name="ProductNumber" type="xs:nonNegativeInteger"/>
+ <xs:element name="Status" type="xs:boolean"/>
+ </xs:sequence>
+ </xs:complexType>
+
+ <xs:complexType name="ItemShippingStatusList">
+ <xs:sequence>
+ <xs:element name="ItemStatus" type="wh:ItemShippingStatus" minOccurs="1" maxOccurs="unbounded" nillable="false"/>
+ </xs:sequence>
+ </xs:complexType>
</xs:schema>
Modified: ode/trunk/bpel-store/src/test/resources/complexImport/dir1/dir11/foo.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/test/resources/complexImport/dir1/dir11/foo.wsdl?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/test/resources/complexImport/dir1/dir11/foo.wsdl (original)
+++ ode/trunk/bpel-store/src/test/resources/complexImport/dir1/dir11/foo.wsdl Thu May 27 15:52:24 2010
@@ -33,7 +33,7 @@
location="../../bar.wsdl"/>
- <wsdl:types>
+ <wsdl:types>
<xsd:schema targetNamespace="http://foo/bar" >
<xsd:import namespace="http://foo.xsd"
schemaLocation="../foo.xsd"/>
Modified: ode/trunk/bpel-store/src/test/resources/complexImport/dir1/foo.xsd
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/test/resources/complexImport/dir1/foo.xsd?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/test/resources/complexImport/dir1/foo.xsd (original)
+++ ode/trunk/bpel-store/src/test/resources/complexImport/dir1/foo.xsd Thu May 27 15:52:24 2010
@@ -20,8 +20,8 @@
-->
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
- targetNamespace="http://foo.xsd">
-
+ targetNamespace="http://foo.xsd">
+
<xs:import namespace="http://www.ws-i.org/SampleApplications/SupplyChainManagement/2002-08/Warehouse.xsd"
schemaLocation="dir11/baz.xsd"/>
</xs:schema>
Modified: ode/trunk/bpel-store/src/test/resources/testdd/HelloWorld2.wsdl
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/test/resources/testdd/HelloWorld2.wsdl?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/test/resources/testdd/HelloWorld2.wsdl (original)
+++ ode/trunk/bpel-store/src/test/resources/testdd/HelloWorld2.wsdl Thu May 27 15:52:24 2010
@@ -56,9 +56,9 @@
</wsdl:operation>
</wsdl:binding>
<wsdl:service name="HelloService">
- <wsdl:port name="HelloPort" binding="tns:HelloSoapBinding">
- <soap:address location="http://localhost:8080/ode/processes/helloWorld"/>
- </wsdl:port>
+ <wsdl:port name="HelloPort" binding="tns:HelloSoapBinding">
+ <soap:address location="http://localhost:8080/ode/processes/helloWorld"/>
+ </wsdl:port>
</wsdl:service>
<plnk:partnerLinkType name="HelloPartnerLinkType">
Modified: ode/trunk/bpel-store/src/test/resources/testdd/deploy.xml
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-store/src/test/resources/testdd/deploy.xml?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-store/src/test/resources/testdd/deploy.xml (original)
+++ ode/trunk/bpel-store/src/test/resources/testdd/deploy.xml Thu May 27 15:52:24 2010
@@ -17,21 +17,21 @@
~ under the License.
-->
<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03"
- xmlns:pns="http://ode/bpel/unit-test"
- xmlns:wns="http://ode/bpel/unit-test.wsdl">
+ xmlns:pns="http://ode/bpel/unit-test"
+ xmlns:wns="http://ode/bpel/unit-test.wsdl">
- <process name="pns:HelloWorld2">
- <active>true</active>
- <provide partnerLink="helloPartnerLink">
- <service name="wns:HelloService" port="HelloPort"/>
- </provide>
- <cleanup on="success">
- <category>all</category>
- </cleanup>
- <cleanup on="failure">
- <category>messages</category>
- <category>events</category>
- </cleanup>
+ <process name="pns:HelloWorld2">
+ <active>true</active>
+ <provide partnerLink="helloPartnerLink">
+ <service name="wns:HelloService" port="HelloPort"/>
+ </provide>
+ <cleanup on="success">
+ <category>all</category>
+ </cleanup>
+ <cleanup on="failure">
+ <category>messages</category>
+ <category>events</category>
+ </cleanup>
<schedule when="* * * * * ?">
<cleanup>
<filter><![CDATA[lastActiveDate<-1w state=completed_ok]]></filter>
@@ -56,5 +56,5 @@
<filter><![CDATA[lastActiveDate<-1m state=terminated]]></filter>
</cleanup>
</schedule>
- </process>
+ </process>
</deploy>
Modified: ode/trunk/bpel-test/pom.xml
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/pom.xml?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-test/pom.xml (original)
+++ ode/trunk/bpel-test/pom.xml Thu May 27 15:52:24 2010
@@ -151,17 +151,17 @@
<build>
<plugins>
<plugin>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <configuration>
<!-- FIXME: temporary skip it, 3 failed test cases (2 in JDK6, 3 in JDK5): testIMA, testRetireOld, testIsolated**-->
- <excludes>
+ <excludes>
<!--
<exclude>**/MessageRouting20Test.java</exclude>
- <exclude>**/VersionedRedeployTest.java</exclude>
- <exclude>**/StructuredActivities20Test.java</exclude>
+ <exclude>**/VersionedRedeployTest.java</exclude>
+ <exclude>**/StructuredActivities20Test.java</exclude>
-->
- </excludes>
- </configuration>
+ </excludes>
+ </configuration>
</plugin>
</plugins>
</build>
Modified: ode/trunk/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java (original)
+++ ode/trunk/bpel-test/src/main/java/org/apache/ode/test/BPELTestAbstract.java Thu May 27 15:52:24 2010
@@ -62,9 +62,9 @@ import org.junit.Before;
import org.w3c.dom.Element;
public abstract class BPELTestAbstract {
- public static final long WAIT_BEFORE_INVOKE_TIMEOUT = 2000;
-
- private static final String SHOW_EVENTS_ON_CONSOLE = "no";
+ public static final long WAIT_BEFORE_INVOKE_TIMEOUT = 2000;
+
+ private static final String SHOW_EVENTS_ON_CONSOLE = "no";
protected BpelServerImpl _server;
@@ -376,7 +376,7 @@ public abstract class BPELTestAbstract {
}
protected long getWaitBeforeInvokeTimeout() {
- return WAIT_BEFORE_INVOKE_TIMEOUT;
+ return WAIT_BEFORE_INVOKE_TIMEOUT;
}
private void failure(Object where) {
Modified: ode/trunk/bpel-test/src/main/java/org/apache/ode/test/BindingContextImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-test/src/main/java/org/apache/ode/test/BindingContextImpl.java?rev=948869&r1=948868&r2=948869&view=diff
==============================================================================
--- ode/trunk/bpel-test/src/main/java/org/apache/ode/test/BindingContextImpl.java (original)
+++ ode/trunk/bpel-test/src/main/java/org/apache/ode/test/BindingContextImpl.java Thu May 27 15:52:24 2010
@@ -49,11 +49,11 @@ import org.w3c.dom.Document;
import org.w3c.dom.Element;
public class BindingContextImpl implements BindingContext {
-
+
- public EndpointReference activateMyRoleEndpoint(QName processId, Endpoint myRoleEndpoint) {
- final Document doc = DOMUtils.newDocument();
- Element serviceref = doc.createElementNS(EndpointReference.SERVICE_REF_QNAME.getNamespaceURI(),
+ public EndpointReference activateMyRoleEndpoint(QName processId, Endpoint myRoleEndpoint) {
+ final Document doc = DOMUtils.newDocument();
+ Element serviceref = doc.createElementNS(EndpointReference.SERVICE_REF_QNAME.getNamespaceURI(),
EndpointReference.SERVICE_REF_QNAME.getLocalPart());
serviceref.setNodeValue(myRoleEndpoint.serviceName +":" +myRoleEndpoint.portName);
doc.appendChild(serviceref);
@@ -62,19 +62,19 @@ public class BindingContextImpl implemen
return doc;
}
};
- }
+ }
- public void deactivateMyRoleEndpoint(Endpoint myRoleEndpoint) {
+ public void deactivateMyRoleEndpoint(Endpoint myRoleEndpoint) {
- }
+ }
- public PartnerRoleChannel createPartnerRoleChannel(QName processId, PortType portType,
- Endpoint initialPartnerEndpoint) {
- return new PartnerRoleChannelImpl();
- }
+ public PartnerRoleChannel createPartnerRoleChannel(QName processId, PortType portType,
+ Endpoint initialPartnerEndpoint) {
+ return new PartnerRoleChannelImpl();
+ }
- public long calculateSizeofService(EndpointReference epr) {
- return 0;
- }
+ public long calculateSizeofService(EndpointReference epr) {
+ return 0;
+ }
}