You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by mr...@apache.org on 2009/01/24 00:53:21 UTC

svn commit: r737256 [4/12] - in /ode/branches/APACHE_ODE_1.X: bpel-test/src/test/resources/ bpel-test/src/test/resources/bpel/2.0/TestAlarm/ bpel-test/src/test/resources/bpel/2.0/TestAssignComplex/ bpel-test/src/test/resources/bpel/2.0/TestAssignDate/ ...

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMultiComplex/testCorrelation.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMultiComplex/testCorrelation.wsdl?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMultiComplex/testCorrelation.wsdl (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMultiComplex/testCorrelation.wsdl Fri Jan 23 23:53:17 2009
@@ -1,158 +1,158 @@
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
--->
-
-<wsdl:definitions
-        targetNamespace="http://ode/bpel/unit-test/testCorrelation.wsdl"
-        xmlns:tns="http://ode/bpel/unit-test/testCorrelation.wsdl"
-        xmlns:typens="http://ode/bpel/unit-test/testCorrelation.wsdl.types"
-        xmlns="http://ode/bpel/unit-test/testCorrelation.wsdl"
-        xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
-        xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
-        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-        xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
-        xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-        xmlns:prop="http://docs.oasis-open.org/wsbpel/2.0/varprop">
-
-
-    <!-- type defs -->
-    <wsdl:types>
-        <xsd:schema
-                targetNamespace="http://ode/bpel/unit-test/testCorrelation.wsdl.types"
-                xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-            <xsd:complexType name="testMessage">
-                <xsd:sequence>
-                    <xsd:element name="correlationID1" type="xsd:string"/>
-                    <xsd:element name="correlationID2" type="xsd:string"/>
-                    <xsd:element name="correlationID3" type="xsd:string"/>
-                    <xsd:element name="requestText" type="xsd:string"/>
-                    <xsd:element name="requestEnd" type="xsd:string"/>
-                </xsd:sequence>
-            </xsd:complexType>
-        </xsd:schema>
-    </wsdl:types>
-
-
-    <wsdl:message name="requestMessage">
-        <wsdl:part name="requestMessageData" type="typens:testMessage"/>
-    </wsdl:message>
-
-    <wsdl:message name="replyMessage">
-        <wsdl:part name="replyID" type="xsd:string"/>
-        <wsdl:part name="replyText" type="xsd:string"/>
-    </wsdl:message>
-
-
-    <wsdl:portType name="testCorrelationPT">
-        <wsdl:operation name="request">
-            <wsdl:input message="requestMessage"/>
-            <wsdl:output message="replyMessage"/>
-        </wsdl:operation>
-        <wsdl:operation name="continue">
-            <wsdl:input message="requestMessage"/>
-        </wsdl:operation>
-        <wsdl:operation name="receive2">
-            <wsdl:input message="requestMessage"/>
-        </wsdl:operation>
-        <wsdl:operation name="receive3">
-            <wsdl:input message="requestMessage"/>
-        </wsdl:operation>
-        <wsdl:operation name="receive4">
-            <wsdl:input message="requestMessage"/>
-        </wsdl:operation>
-        <wsdl:operation name="receive_never">
-            <wsdl:input message="requestMessage"/>
-        </wsdl:operation>
-    </wsdl:portType>
-
-    <wsdl:binding name="TestCorrelationBinding" type="tns:testCorrelationPT">
-        <wsdl:operation name="request"/>
-        <wsdl:operation name="receive2"/>
-        <wsdl:operation name="receive3"/>
-        <wsdl:operation name="receive4"/>
-        <wsdl:operation name="receive_never"/>
-        <wsdl:operation name="continue"/>
-    </wsdl:binding>
-    <wsdl:service name="TestCorrelationService">
-        <wsdl:port name="TestCorrelationPort" binding="tns:TestCorrelationBinding">
-        </wsdl:port>
-    </wsdl:service>
-
-    <plnk:partnerLinkType name="testCorrelationRequest">
-        <plnk:role name="testCorrelationService" portType="testCorrelationPT"/>
-    </plnk:partnerLinkType>
-    <plnk:partnerLinkType name="probeRequest">
-        <plnk:role name="probeService" portType="prb:probeMessagePT"/>
-    </plnk:partnerLinkType>
-
-    <prop:property name="testCorrelationID1" type="xsd:string"/>
-    <prop:propertyAlias propertyName="tns:testCorrelationID1" messageType="tns:requestMessage" part="requestMessageData">
-        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-            correlationID1
-        </prop:query>
-    </prop:propertyAlias>
-    <prop:propertyAlias propertyName="tns:testCorrelationID1" messageType="prb:probeMessage" part="probeName">
-        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-            .
-        </prop:query>
-    </prop:propertyAlias>
-
-    <prop:property name="testCorrelationID2" type="xsd:string"/>
-    <prop:propertyAlias propertyName="tns:testCorrelationID2" messageType="tns:requestMessage" part="requestMessageData">
-        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-            correlationID2
-        </prop:query>
-    </prop:propertyAlias>
-    <prop:propertyAlias propertyName="tns:testCorrelationID2" messageType="prb:probeMessage" part="probeName">
-        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-            .
-        </prop:query>
-    </prop:propertyAlias>
-
-    <prop:property name="testCorrelationID3" type="xsd:string"/>
-    <prop:propertyAlias propertyName="tns:testCorrelationID3" messageType="tns:requestMessage" part="requestMessageData">
-        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-            correlationID3
-        </prop:query>
-    </prop:propertyAlias>
-
-    <prop:property name="testCorrelationID4" type="xsd:string"/>
-    <prop:propertyAlias propertyName="tns:testCorrelationID4" messageType="tns:requestMessage" part="requestMessageData">
-        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-            requestText
-        </prop:query>
-    </prop:propertyAlias>
-    <prop:propertyAlias propertyName="tns:testCorrelationID4" messageType="tns:replyMessage" part="replyID">
-        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-            .
-        </prop:query>
-    </prop:propertyAlias>
-
-    <prop:property name="testCorrelationID5" type="xsd:string"/>
-    <prop:propertyAlias propertyName="tns:testCorrelationID5" messageType="tns:requestMessage" part="requestMessageData">
-        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-            requestText
-        </prop:query>
-    </prop:propertyAlias>
-    <prop:propertyAlias propertyName="tns:testCorrelationID5" messageType="tns:replyMessage" part="replyText">
-        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-            .
-        </prop:query>
-    </prop:propertyAlias>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+-->
+
+<wsdl:definitions
+        targetNamespace="http://ode/bpel/unit-test/testCorrelation.wsdl"
+        xmlns:tns="http://ode/bpel/unit-test/testCorrelation.wsdl"
+        xmlns:typens="http://ode/bpel/unit-test/testCorrelation.wsdl.types"
+        xmlns="http://ode/bpel/unit-test/testCorrelation.wsdl"
+        xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
+        xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
+        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+        xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+        xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+        xmlns:prop="http://docs.oasis-open.org/wsbpel/2.0/varprop">
+
+
+    <!-- type defs -->
+    <wsdl:types>
+        <xsd:schema
+                targetNamespace="http://ode/bpel/unit-test/testCorrelation.wsdl.types"
+                xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+            <xsd:complexType name="testMessage">
+                <xsd:sequence>
+                    <xsd:element name="correlationID1" type="xsd:string"/>
+                    <xsd:element name="correlationID2" type="xsd:string"/>
+                    <xsd:element name="correlationID3" type="xsd:string"/>
+                    <xsd:element name="requestText" type="xsd:string"/>
+                    <xsd:element name="requestEnd" type="xsd:string"/>
+                </xsd:sequence>
+            </xsd:complexType>
+        </xsd:schema>
+    </wsdl:types>
+
+
+    <wsdl:message name="requestMessage">
+        <wsdl:part name="requestMessageData" type="typens:testMessage"/>
+    </wsdl:message>
+
+    <wsdl:message name="replyMessage">
+        <wsdl:part name="replyID" type="xsd:string"/>
+        <wsdl:part name="replyText" type="xsd:string"/>
+    </wsdl:message>
+
+
+    <wsdl:portType name="testCorrelationPT">
+        <wsdl:operation name="request">
+            <wsdl:input message="requestMessage"/>
+            <wsdl:output message="replyMessage"/>
+        </wsdl:operation>
+        <wsdl:operation name="continue">
+            <wsdl:input message="requestMessage"/>
+        </wsdl:operation>
+        <wsdl:operation name="receive2">
+            <wsdl:input message="requestMessage"/>
+        </wsdl:operation>
+        <wsdl:operation name="receive3">
+            <wsdl:input message="requestMessage"/>
+        </wsdl:operation>
+        <wsdl:operation name="receive4">
+            <wsdl:input message="requestMessage"/>
+        </wsdl:operation>
+        <wsdl:operation name="receive_never">
+            <wsdl:input message="requestMessage"/>
+        </wsdl:operation>
+    </wsdl:portType>
+
+    <wsdl:binding name="TestCorrelationBinding" type="tns:testCorrelationPT">
+        <wsdl:operation name="request"/>
+        <wsdl:operation name="receive2"/>
+        <wsdl:operation name="receive3"/>
+        <wsdl:operation name="receive4"/>
+        <wsdl:operation name="receive_never"/>
+        <wsdl:operation name="continue"/>
+    </wsdl:binding>
+    <wsdl:service name="TestCorrelationService">
+        <wsdl:port name="TestCorrelationPort" binding="tns:TestCorrelationBinding">
+        </wsdl:port>
+    </wsdl:service>
+
+    <plnk:partnerLinkType name="testCorrelationRequest">
+        <plnk:role name="testCorrelationService" portType="testCorrelationPT"/>
+    </plnk:partnerLinkType>
+    <plnk:partnerLinkType name="probeRequest">
+        <plnk:role name="probeService" portType="prb:probeMessagePT"/>
+    </plnk:partnerLinkType>
+
+    <prop:property name="testCorrelationID1" type="xsd:string"/>
+    <prop:propertyAlias propertyName="tns:testCorrelationID1" messageType="tns:requestMessage" part="requestMessageData">
+        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+            correlationID1
+        </prop:query>
+    </prop:propertyAlias>
+    <prop:propertyAlias propertyName="tns:testCorrelationID1" messageType="prb:probeMessage" part="probeName">
+        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+            .
+        </prop:query>
+    </prop:propertyAlias>
+
+    <prop:property name="testCorrelationID2" type="xsd:string"/>
+    <prop:propertyAlias propertyName="tns:testCorrelationID2" messageType="tns:requestMessage" part="requestMessageData">
+        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+            correlationID2
+        </prop:query>
+    </prop:propertyAlias>
+    <prop:propertyAlias propertyName="tns:testCorrelationID2" messageType="prb:probeMessage" part="probeName">
+        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+            .
+        </prop:query>
+    </prop:propertyAlias>
+
+    <prop:property name="testCorrelationID3" type="xsd:string"/>
+    <prop:propertyAlias propertyName="tns:testCorrelationID3" messageType="tns:requestMessage" part="requestMessageData">
+        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+            correlationID3
+        </prop:query>
+    </prop:propertyAlias>
+
+    <prop:property name="testCorrelationID4" type="xsd:string"/>
+    <prop:propertyAlias propertyName="tns:testCorrelationID4" messageType="tns:requestMessage" part="requestMessageData">
+        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+            requestText
+        </prop:query>
+    </prop:propertyAlias>
+    <prop:propertyAlias propertyName="tns:testCorrelationID4" messageType="tns:replyMessage" part="replyID">
+        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+            .
+        </prop:query>
+    </prop:propertyAlias>
+
+    <prop:property name="testCorrelationID5" type="xsd:string"/>
+    <prop:propertyAlias propertyName="tns:testCorrelationID5" messageType="tns:requestMessage" part="requestMessageData">
+        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+            requestText
+        </prop:query>
+    </prop:propertyAlias>
+    <prop:propertyAlias propertyName="tns:testCorrelationID5" messageType="tns:replyMessage" part="replyText">
+        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+            .
+        </prop:query>
+    </prop:propertyAlias>
 </wsdl:definitions>
\ No newline at end of file

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMultiJoin/testCorrelation.bpel
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMultiJoin/testCorrelation.bpel?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMultiJoin/testCorrelation.bpel (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMultiJoin/testCorrelation.bpel Fri Jan 23 23:53:17 2009
@@ -1,103 +1,103 @@
-<!--
-	~ Licensed to the Apache Software Foundation (ASF) under one
-	~ or more contributor license agreements.  See the NOTICE file
-	~ distributed with this work for additional information
-	~ regarding copyright ownership.  The ASF licenses this file
-	~ to you under the Apache License, Version 2.0 (the
-	~ "License"); you may not use this file except in compliance
-	~ with the License.  You may obtain a copy of the License at
-	~
-	~    http://www.apache.org/licenses/LICENSE-2.0
-	~
-	~ Unless required by applicable law or agreed to in writing,
-	~ software distributed under the License is distributed on an
-	~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-	~ KIND, either express or implied.  See the License for the
-	~ specific language governing permissions and limitations
-	~ under the License.
--->
-
-<process xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://docs.oasis-open.org/wsbpel/2.0/process/executable ../../../../../../../bpel-schemas/src/main/resources/wsbpel_executable.xsd"
- xmlns:tns="http://ode/bpel/unit-test/testCorrelation"
- xmlns:wns="http://ode/bpel/unit-test/testCorrelation.wsdl"
- xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
- name="TestCorrelationProcess"
- targetNamespace="http://ode/bpel/unit-test/testCorrelation"
- queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
- expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
- suppressJoinFailure="yes">
-	
-	<import location="testCorrelation.wsdl"
-		namespace="http://ode/bpel/unit-test/testCorrelation.wsdl"
-		importType="http://schemas.xmlsoap.org/wsdl/" />
-	
-	<!-- test correlated receive -->
-	<partnerLinks>
-		<partnerLink name="request" partnerLinkType="wns:testCorrelationRequest" myRole="testCorrelationService"/>
-	</partnerLinks>
-	<variables>
-		<variable name="request" messageType="wns:requestMessage"/>
-		<variable name="reply" messageType="wns:replyMessage"/>
-	</variables>
-	<correlationSets>
-		<correlationSet name="testCorr1" properties="wns:testCorrelationID1"/>
-		<correlationSet name="testCorr2" properties="wns:testCorrelationID2"/>
-		<correlationSet name="testCorr3" properties="wns:testCorrelationID3"/>
-	</correlationSets>
-	<sequence>
-		<receive name="receive1" partnerLink="request" portType="wns:testCorrelationPT" operation="request" variable="request" createInstance="yes">
-			<correlations>
-				<correlation set="testCorr1" initiate="yes"/>
-				<correlation set="testCorr2" initiate="join"/>
-			</correlations>
-		</receive>
-		<!-- Copy input variables to internal accumulators -->
-		<assign name="assign1">
-			<copy>
-				<from variable="request" property="wns:testCorrelationID1"/>
-				<to variable="reply" part="replyID"/>
-			</copy>
-			<copy>
-				<from>
-					$request.requestMessageData/requestText
-				</from>
-				<to variable="reply" part="replyText"/>
-			</copy>
-		</assign>
-
-		<receive name="receive2" partnerLink="request" portType="wns:testCorrelationPT" operation="continue" variable="request">
-			<correlations>
-				<correlation set="testCorr1" initiate="join"/>
-				<correlation set="testCorr2" initiate="join"/>
-				<correlation set="testCorr3" initiate="join"/>
-			</correlations>
-		</receive>
-		<assign>
-			<copy>
-				<from>
-					concat($reply.replyText, $request.requestMessageData/requestText)
-				</from>
-				<to variable="reply" part="replyText"/>
-			</copy>
-		</assign>
-
-		<receive name="receive3" partnerLink="request" portType="wns:testCorrelationPT" operation="continue" variable="request">
-			<correlations>
-				<correlation set="testCorr1" initiate="join"/>
-				<correlation set="testCorr2" initiate="join"/>
-				<correlation set="testCorr3" initiate="join"/>
-			</correlations>
-		</receive>
-		<assign>
-			<copy>
-				<from>
-					concat($reply.replyText, $request.requestMessageData/requestText)
-				</from>
-				<to variable="reply" part="replyText"/>
-			</copy>
-		</assign>
-
-		<reply name="reply" partnerLink="request" portType="wns:testCorrelationPT" operation="request" variable="reply"> </reply>
-	</sequence>
-</process>
+<!--
+	~ Licensed to the Apache Software Foundation (ASF) under one
+	~ or more contributor license agreements.  See the NOTICE file
+	~ distributed with this work for additional information
+	~ regarding copyright ownership.  The ASF licenses this file
+	~ to you under the Apache License, Version 2.0 (the
+	~ "License"); you may not use this file except in compliance
+	~ with the License.  You may obtain a copy of the License at
+	~
+	~    http://www.apache.org/licenses/LICENSE-2.0
+	~
+	~ Unless required by applicable law or agreed to in writing,
+	~ software distributed under the License is distributed on an
+	~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+	~ KIND, either express or implied.  See the License for the
+	~ specific language governing permissions and limitations
+	~ under the License.
+-->
+
+<process xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://docs.oasis-open.org/wsbpel/2.0/process/executable ../../../../../../../bpel-schemas/src/main/resources/wsbpel_executable.xsd"
+ xmlns:tns="http://ode/bpel/unit-test/testCorrelation"
+ xmlns:wns="http://ode/bpel/unit-test/testCorrelation.wsdl"
+ xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+ name="TestCorrelationProcess"
+ targetNamespace="http://ode/bpel/unit-test/testCorrelation"
+ queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+ expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+ suppressJoinFailure="yes">
+	
+	<import location="testCorrelation.wsdl"
+		namespace="http://ode/bpel/unit-test/testCorrelation.wsdl"
+		importType="http://schemas.xmlsoap.org/wsdl/" />
+	
+	<!-- test correlated receive -->
+	<partnerLinks>
+		<partnerLink name="request" partnerLinkType="wns:testCorrelationRequest" myRole="testCorrelationService"/>
+	</partnerLinks>
+	<variables>
+		<variable name="request" messageType="wns:requestMessage"/>
+		<variable name="reply" messageType="wns:replyMessage"/>
+	</variables>
+	<correlationSets>
+		<correlationSet name="testCorr1" properties="wns:testCorrelationID1"/>
+		<correlationSet name="testCorr2" properties="wns:testCorrelationID2"/>
+		<correlationSet name="testCorr3" properties="wns:testCorrelationID3"/>
+	</correlationSets>
+	<sequence>
+		<receive name="receive1" partnerLink="request" portType="wns:testCorrelationPT" operation="request" variable="request" createInstance="yes">
+			<correlations>
+				<correlation set="testCorr1" initiate="yes"/>
+				<correlation set="testCorr2" initiate="join"/>
+			</correlations>
+		</receive>
+		<!-- Copy input variables to internal accumulators -->
+		<assign name="assign1">
+			<copy>
+				<from variable="request" property="wns:testCorrelationID1"/>
+				<to variable="reply" part="replyID"/>
+			</copy>
+			<copy>
+				<from>
+					$request.requestMessageData/requestText
+				</from>
+				<to variable="reply" part="replyText"/>
+			</copy>
+		</assign>
+
+		<receive name="receive2" partnerLink="request" portType="wns:testCorrelationPT" operation="continue" variable="request">
+			<correlations>
+				<correlation set="testCorr1" initiate="join"/>
+				<correlation set="testCorr2" initiate="join"/>
+				<correlation set="testCorr3" initiate="join"/>
+			</correlations>
+		</receive>
+		<assign>
+			<copy>
+				<from>
+					concat($reply.replyText, $request.requestMessageData/requestText)
+				</from>
+				<to variable="reply" part="replyText"/>
+			</copy>
+		</assign>
+
+		<receive name="receive3" partnerLink="request" portType="wns:testCorrelationPT" operation="continue" variable="request">
+			<correlations>
+				<correlation set="testCorr1" initiate="join"/>
+				<correlation set="testCorr2" initiate="join"/>
+				<correlation set="testCorr3" initiate="join"/>
+			</correlations>
+		</receive>
+		<assign>
+			<copy>
+				<from>
+					concat($reply.replyText, $request.requestMessageData/requestText)
+				</from>
+				<to variable="reply" part="replyText"/>
+			</copy>
+		</assign>
+
+		<reply name="reply" partnerLink="request" portType="wns:testCorrelationPT" operation="request" variable="reply"> </reply>
+	</sequence>
+</process>

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMultiJoin/testCorrelation.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMultiJoin/testCorrelation.wsdl?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMultiJoin/testCorrelation.wsdl (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMultiJoin/testCorrelation.wsdl Fri Jan 23 23:53:17 2009
@@ -1,106 +1,106 @@
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
--->
-
-<wsdl:definitions
-        targetNamespace="http://ode/bpel/unit-test/testCorrelation.wsdl"
-        xmlns:tns="http://ode/bpel/unit-test/testCorrelation.wsdl"
-        xmlns:typens="http://ode/bpel/unit-test/testCorrelation.wsdl.types"
-        xmlns="http://ode/bpel/unit-test/testCorrelation.wsdl"
-        xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
-        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-        xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
-        xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-        xmlns:prop="http://docs.oasis-open.org/wsbpel/2.0/varprop">
-
-
-    <!-- type defs -->
-    <wsdl:types>
-        <xsd:schema
-                targetNamespace="http://ode/bpel/unit-test/testCorrelation.wsdl.types"
-                xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-            <xsd:complexType name="testMessage">
-                <xsd:sequence>
-                    <xsd:element name="correlationID1" type="xsd:string"/>
-                    <xsd:element name="correlationID2" type="xsd:string"/>
-                    <xsd:element name="correlationID3" type="xsd:string"/>
-                    <xsd:element name="requestText" type="xsd:string"/>
-                    <xsd:element name="requestEnd" type="xsd:string"/>
-                </xsd:sequence>
-            </xsd:complexType>
-        </xsd:schema>
-    </wsdl:types>
-
-
-    <wsdl:message name="requestMessage">
-        <wsdl:part name="requestMessageData" type="typens:testMessage"/>
-    </wsdl:message>
-
-    <wsdl:message name="replyMessage">
-        <wsdl:part name="replyID" type="xsd:string"/>
-        <wsdl:part name="replyText" type="xsd:string"/>
-    </wsdl:message>
-
-
-    <wsdl:portType name="testCorrelationPT">
-        <wsdl:operation name="request">
-            <wsdl:input message="requestMessage"/>
-            <wsdl:output message="replyMessage"/>
-        </wsdl:operation>
-        <wsdl:operation name="continue">
-            <wsdl:input message="requestMessage"/>
-        </wsdl:operation>
-    </wsdl:portType>
-
-    <wsdl:binding name="TestCorrelationBinding" type="tns:testCorrelationPT">
-        <wsdl:operation name="request">
-        </wsdl:operation>
-        <wsdl:operation name="continue">
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="TestCorrelationService">
-        <wsdl:port name="TestCorrelationPort" binding="tns:TestCorrelationBinding">
-        </wsdl:port>
-    </wsdl:service>
-
-    <plnk:partnerLinkType name="testCorrelationRequest">
-        <plnk:role name="testCorrelationService" portType="testCorrelationPT"/>
-    </plnk:partnerLinkType>
-
-    <prop:property name="testCorrelationID1" type="xsd:string"/>
-    <prop:propertyAlias propertyName="tns:testCorrelationID1" messageType="tns:requestMessage" part="requestMessageData">
-        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-            correlationID1
-        </prop:query>
-    </prop:propertyAlias>
-
-    <prop:property name="testCorrelationID2" type="xsd:string"/>
-    <prop:propertyAlias propertyName="tns:testCorrelationID2" messageType="tns:requestMessage" part="requestMessageData">
-        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-            correlationID2
-        </prop:query>
-    </prop:propertyAlias>
-
-    <prop:property name="testCorrelationID3" type="xsd:string"/>
-    <prop:propertyAlias propertyName="tns:testCorrelationID3" messageType="tns:requestMessage" part="requestMessageData">
-        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-            correlationID3
-        </prop:query>
-    </prop:propertyAlias>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+-->
+
+<wsdl:definitions
+        targetNamespace="http://ode/bpel/unit-test/testCorrelation.wsdl"
+        xmlns:tns="http://ode/bpel/unit-test/testCorrelation.wsdl"
+        xmlns:typens="http://ode/bpel/unit-test/testCorrelation.wsdl.types"
+        xmlns="http://ode/bpel/unit-test/testCorrelation.wsdl"
+        xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
+        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+        xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+        xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+        xmlns:prop="http://docs.oasis-open.org/wsbpel/2.0/varprop">
+
+
+    <!-- type defs -->
+    <wsdl:types>
+        <xsd:schema
+                targetNamespace="http://ode/bpel/unit-test/testCorrelation.wsdl.types"
+                xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+            <xsd:complexType name="testMessage">
+                <xsd:sequence>
+                    <xsd:element name="correlationID1" type="xsd:string"/>
+                    <xsd:element name="correlationID2" type="xsd:string"/>
+                    <xsd:element name="correlationID3" type="xsd:string"/>
+                    <xsd:element name="requestText" type="xsd:string"/>
+                    <xsd:element name="requestEnd" type="xsd:string"/>
+                </xsd:sequence>
+            </xsd:complexType>
+        </xsd:schema>
+    </wsdl:types>
+
+
+    <wsdl:message name="requestMessage">
+        <wsdl:part name="requestMessageData" type="typens:testMessage"/>
+    </wsdl:message>
+
+    <wsdl:message name="replyMessage">
+        <wsdl:part name="replyID" type="xsd:string"/>
+        <wsdl:part name="replyText" type="xsd:string"/>
+    </wsdl:message>
+
+
+    <wsdl:portType name="testCorrelationPT">
+        <wsdl:operation name="request">
+            <wsdl:input message="requestMessage"/>
+            <wsdl:output message="replyMessage"/>
+        </wsdl:operation>
+        <wsdl:operation name="continue">
+            <wsdl:input message="requestMessage"/>
+        </wsdl:operation>
+    </wsdl:portType>
+
+    <wsdl:binding name="TestCorrelationBinding" type="tns:testCorrelationPT">
+        <wsdl:operation name="request">
+        </wsdl:operation>
+        <wsdl:operation name="continue">
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:service name="TestCorrelationService">
+        <wsdl:port name="TestCorrelationPort" binding="tns:TestCorrelationBinding">
+        </wsdl:port>
+    </wsdl:service>
+
+    <plnk:partnerLinkType name="testCorrelationRequest">
+        <plnk:role name="testCorrelationService" portType="testCorrelationPT"/>
+    </plnk:partnerLinkType>
+
+    <prop:property name="testCorrelationID1" type="xsd:string"/>
+    <prop:propertyAlias propertyName="tns:testCorrelationID1" messageType="tns:requestMessage" part="requestMessageData">
+        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+            correlationID1
+        </prop:query>
+    </prop:propertyAlias>
+
+    <prop:property name="testCorrelationID2" type="xsd:string"/>
+    <prop:propertyAlias propertyName="tns:testCorrelationID2" messageType="tns:requestMessage" part="requestMessageData">
+        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+            correlationID2
+        </prop:query>
+    </prop:propertyAlias>
+
+    <prop:property name="testCorrelationID3" type="xsd:string"/>
+    <prop:propertyAlias propertyName="tns:testCorrelationID3" messageType="tns:requestMessage" part="requestMessageData">
+        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+            correlationID3
+        </prop:query>
+    </prop:propertyAlias>
 </wsdl:definitions>
\ No newline at end of file

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMultiNegative/testCorrelation.bpel
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMultiNegative/testCorrelation.bpel?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMultiNegative/testCorrelation.bpel (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMultiNegative/testCorrelation.bpel Fri Jan 23 23:53:17 2009
@@ -1,87 +1,87 @@
-<!--
-	~ Licensed to the Apache Software Foundation (ASF) under one
-	~ or more contributor license agreements.  See the NOTICE file
-	~ distributed with this work for additional information
-	~ regarding copyright ownership.  The ASF licenses this file
-	~ to you under the Apache License, Version 2.0 (the
-	~ "License"); you may not use this file except in compliance
-	~ with the License.  You may obtain a copy of the License at
-	~
-	~    http://www.apache.org/licenses/LICENSE-2.0
-	~
-	~ Unless required by applicable law or agreed to in writing,
-	~ software distributed under the License is distributed on an
-	~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-	~ KIND, either express or implied.  See the License for the
-	~ specific language governing permissions and limitations
-	~ under the License.
--->
-
-<process xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://docs.oasis-open.org/wsbpel/2.0/process/executable ../../../../../../../bpel-schemas/src/main/resources/wsbpel_executable.xsd"
- xmlns:tns="http://ode/bpel/unit-test/testCorrelation"
- xmlns:wns="http://ode/bpel/unit-test/testCorrelation.wsdl"
- xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
- name="TestCorrelationProcess"
- targetNamespace="http://ode/bpel/unit-test/testCorrelation"
- queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
- expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
- suppressJoinFailure="yes">
-	
-	<import location="testCorrelation.wsdl"
-		namespace="http://ode/bpel/unit-test/testCorrelation.wsdl"
-		importType="http://schemas.xmlsoap.org/wsdl/" />
-	
-	<!-- test correlated receive -->
-	<partnerLinks>
-		<partnerLink name="request" partnerLinkType="wns:testCorrelationRequest" myRole="testCorrelationService"/>
-	</partnerLinks>
-	<variables>
-		<variable name="request" messageType="wns:requestMessage"/>
-		<variable name="reply" messageType="wns:replyMessage"/>
-	</variables>
-	<correlationSets>
-		<correlationSet name="testCorr1" properties="wns:testCorrelationID1"/>
-		<correlationSet name="testCorr2" properties="wns:testCorrelationID2"/>
-		<correlationSet name="testCorr3" properties="wns:testCorrelationID3"/>
-	</correlationSets>
-	<sequence>
-		<receive name="receive1" partnerLink="request" portType="wns:testCorrelationPT" operation="request" variable="request" createInstance="yes">
-			<correlations>
-				<correlation set="testCorr1" initiate="yes"/>
-				<correlation set="testCorr2" initiate="yes"/>
-			</correlations>
-		</receive>
-		<!-- Copy input variables to internal accumulators -->
-		<assign name="assign1">
-			<copy>
-				<from variable="request" property="wns:testCorrelationID1"/>
-				<to variable="reply" part="replyID"/>
-			</copy>
-			<copy>
-				<from>
-					$request.requestMessageData/requestText
-				</from>
-				<to variable="reply" part="replyText"/>
-			</copy>
-		</assign>
-
-		<receive name="receive2" partnerLink="request" portType="wns:testCorrelationPT" operation="continue" variable="request">
-			<correlations>
-				<correlation set="testCorr1" initiate="no"/>
-				<correlation set="testCorr2" initiate="no"/>
-				<correlation set="testCorr3" initiate="yes"/>
-			</correlations>
-		</receive>
-		<assign>
-			<copy>
-				<from>
-					concat($reply.replyText, $request.requestMessageData/requestText)
-				</from>
-				<to variable="reply" part="replyText"/>
-			</copy>
-		</assign>
-
-		<reply name="reply" partnerLink="request" portType="wns:testCorrelationPT" operation="request" variable="reply"> </reply>
-	</sequence>
-</process>
+<!--
+	~ Licensed to the Apache Software Foundation (ASF) under one
+	~ or more contributor license agreements.  See the NOTICE file
+	~ distributed with this work for additional information
+	~ regarding copyright ownership.  The ASF licenses this file
+	~ to you under the Apache License, Version 2.0 (the
+	~ "License"); you may not use this file except in compliance
+	~ with the License.  You may obtain a copy of the License at
+	~
+	~    http://www.apache.org/licenses/LICENSE-2.0
+	~
+	~ Unless required by applicable law or agreed to in writing,
+	~ software distributed under the License is distributed on an
+	~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+	~ KIND, either express or implied.  See the License for the
+	~ specific language governing permissions and limitations
+	~ under the License.
+-->
+
+<process xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://docs.oasis-open.org/wsbpel/2.0/process/executable ../../../../../../../bpel-schemas/src/main/resources/wsbpel_executable.xsd"
+ xmlns:tns="http://ode/bpel/unit-test/testCorrelation"
+ xmlns:wns="http://ode/bpel/unit-test/testCorrelation.wsdl"
+ xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+ name="TestCorrelationProcess"
+ targetNamespace="http://ode/bpel/unit-test/testCorrelation"
+ queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+ expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+ suppressJoinFailure="yes">
+	
+	<import location="testCorrelation.wsdl"
+		namespace="http://ode/bpel/unit-test/testCorrelation.wsdl"
+		importType="http://schemas.xmlsoap.org/wsdl/" />
+	
+	<!-- test correlated receive -->
+	<partnerLinks>
+		<partnerLink name="request" partnerLinkType="wns:testCorrelationRequest" myRole="testCorrelationService"/>
+	</partnerLinks>
+	<variables>
+		<variable name="request" messageType="wns:requestMessage"/>
+		<variable name="reply" messageType="wns:replyMessage"/>
+	</variables>
+	<correlationSets>
+		<correlationSet name="testCorr1" properties="wns:testCorrelationID1"/>
+		<correlationSet name="testCorr2" properties="wns:testCorrelationID2"/>
+		<correlationSet name="testCorr3" properties="wns:testCorrelationID3"/>
+	</correlationSets>
+	<sequence>
+		<receive name="receive1" partnerLink="request" portType="wns:testCorrelationPT" operation="request" variable="request" createInstance="yes">
+			<correlations>
+				<correlation set="testCorr1" initiate="yes"/>
+				<correlation set="testCorr2" initiate="yes"/>
+			</correlations>
+		</receive>
+		<!-- Copy input variables to internal accumulators -->
+		<assign name="assign1">
+			<copy>
+				<from variable="request" property="wns:testCorrelationID1"/>
+				<to variable="reply" part="replyID"/>
+			</copy>
+			<copy>
+				<from>
+					$request.requestMessageData/requestText
+				</from>
+				<to variable="reply" part="replyText"/>
+			</copy>
+		</assign>
+
+		<receive name="receive2" partnerLink="request" portType="wns:testCorrelationPT" operation="continue" variable="request">
+			<correlations>
+				<correlation set="testCorr1" initiate="no"/>
+				<correlation set="testCorr2" initiate="no"/>
+				<correlation set="testCorr3" initiate="yes"/>
+			</correlations>
+		</receive>
+		<assign>
+			<copy>
+				<from>
+					concat($reply.replyText, $request.requestMessageData/requestText)
+				</from>
+				<to variable="reply" part="replyText"/>
+			</copy>
+		</assign>
+
+		<reply name="reply" partnerLink="request" portType="wns:testCorrelationPT" operation="request" variable="reply"> </reply>
+	</sequence>
+</process>

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMultiNegative/testCorrelation.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMultiNegative/testCorrelation.wsdl?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMultiNegative/testCorrelation.wsdl (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationMultiNegative/testCorrelation.wsdl Fri Jan 23 23:53:17 2009
@@ -1,106 +1,106 @@
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
--->
-
-<wsdl:definitions
-        targetNamespace="http://ode/bpel/unit-test/testCorrelation.wsdl"
-        xmlns:tns="http://ode/bpel/unit-test/testCorrelation.wsdl"
-        xmlns:typens="http://ode/bpel/unit-test/testCorrelation.wsdl.types"
-        xmlns="http://ode/bpel/unit-test/testCorrelation.wsdl"
-        xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
-        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
-        xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
-        xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
-        xmlns:prop="http://docs.oasis-open.org/wsbpel/2.0/varprop">
-
-
-    <!-- type defs -->
-    <wsdl:types>
-        <xsd:schema
-                targetNamespace="http://ode/bpel/unit-test/testCorrelation.wsdl.types"
-                xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-
-            <xsd:complexType name="testMessage">
-                <xsd:sequence>
-                    <xsd:element name="correlationID1" type="xsd:string"/>
-                    <xsd:element name="correlationID2" type="xsd:string"/>
-                    <xsd:element name="correlationID3" type="xsd:string"/>
-                    <xsd:element name="requestText" type="xsd:string"/>
-                    <xsd:element name="requestEnd" type="xsd:string"/>
-                </xsd:sequence>
-            </xsd:complexType>
-        </xsd:schema>
-    </wsdl:types>
-
-
-    <wsdl:message name="requestMessage">
-        <wsdl:part name="requestMessageData" type="typens:testMessage"/>
-    </wsdl:message>
-
-    <wsdl:message name="replyMessage">
-        <wsdl:part name="replyID" type="xsd:string"/>
-        <wsdl:part name="replyText" type="xsd:string"/>
-    </wsdl:message>
-
-
-    <wsdl:portType name="testCorrelationPT">
-        <wsdl:operation name="request">
-            <wsdl:input message="requestMessage"/>
-            <wsdl:output message="replyMessage"/>
-        </wsdl:operation>
-        <wsdl:operation name="continue">
-            <wsdl:input message="requestMessage"/>
-        </wsdl:operation>
-    </wsdl:portType>
-
-    <wsdl:binding name="TestCorrelationBinding" type="tns:testCorrelationPT">
-        <wsdl:operation name="request">
-        </wsdl:operation>
-        <wsdl:operation name="continue">
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="TestCorrelationService">
-        <wsdl:port name="TestCorrelationPort" binding="tns:TestCorrelationBinding">
-        </wsdl:port>
-    </wsdl:service>
-
-    <plnk:partnerLinkType name="testCorrelationRequest">
-        <plnk:role name="testCorrelationService" portType="testCorrelationPT"/>
-    </plnk:partnerLinkType>
-
-    <prop:property name="testCorrelationID1" type="xsd:string"/>
-    <prop:propertyAlias propertyName="tns:testCorrelationID1" messageType="tns:requestMessage" part="requestMessageData">
-        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-            correlationID1
-        </prop:query>
-    </prop:propertyAlias>
-
-    <prop:property name="testCorrelationID2" type="xsd:string"/>
-    <prop:propertyAlias propertyName="tns:testCorrelationID2" messageType="tns:requestMessage" part="requestMessageData">
-        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-            correlationID2
-        </prop:query>
-    </prop:propertyAlias>
-
-    <prop:property name="testCorrelationID3" type="xsd:string"/>
-    <prop:propertyAlias propertyName="tns:testCorrelationID3" messageType="tns:requestMessage" part="requestMessageData">
-        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-            correlationID3
-        </prop:query>
-    </prop:propertyAlias>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+-->
+
+<wsdl:definitions
+        targetNamespace="http://ode/bpel/unit-test/testCorrelation.wsdl"
+        xmlns:tns="http://ode/bpel/unit-test/testCorrelation.wsdl"
+        xmlns:typens="http://ode/bpel/unit-test/testCorrelation.wsdl.types"
+        xmlns="http://ode/bpel/unit-test/testCorrelation.wsdl"
+        xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype"
+        xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+        xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+        xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+        xmlns:prop="http://docs.oasis-open.org/wsbpel/2.0/varprop">
+
+
+    <!-- type defs -->
+    <wsdl:types>
+        <xsd:schema
+                targetNamespace="http://ode/bpel/unit-test/testCorrelation.wsdl.types"
+                xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+
+            <xsd:complexType name="testMessage">
+                <xsd:sequence>
+                    <xsd:element name="correlationID1" type="xsd:string"/>
+                    <xsd:element name="correlationID2" type="xsd:string"/>
+                    <xsd:element name="correlationID3" type="xsd:string"/>
+                    <xsd:element name="requestText" type="xsd:string"/>
+                    <xsd:element name="requestEnd" type="xsd:string"/>
+                </xsd:sequence>
+            </xsd:complexType>
+        </xsd:schema>
+    </wsdl:types>
+
+
+    <wsdl:message name="requestMessage">
+        <wsdl:part name="requestMessageData" type="typens:testMessage"/>
+    </wsdl:message>
+
+    <wsdl:message name="replyMessage">
+        <wsdl:part name="replyID" type="xsd:string"/>
+        <wsdl:part name="replyText" type="xsd:string"/>
+    </wsdl:message>
+
+
+    <wsdl:portType name="testCorrelationPT">
+        <wsdl:operation name="request">
+            <wsdl:input message="requestMessage"/>
+            <wsdl:output message="replyMessage"/>
+        </wsdl:operation>
+        <wsdl:operation name="continue">
+            <wsdl:input message="requestMessage"/>
+        </wsdl:operation>
+    </wsdl:portType>
+
+    <wsdl:binding name="TestCorrelationBinding" type="tns:testCorrelationPT">
+        <wsdl:operation name="request">
+        </wsdl:operation>
+        <wsdl:operation name="continue">
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:service name="TestCorrelationService">
+        <wsdl:port name="TestCorrelationPort" binding="tns:TestCorrelationBinding">
+        </wsdl:port>
+    </wsdl:service>
+
+    <plnk:partnerLinkType name="testCorrelationRequest">
+        <plnk:role name="testCorrelationService" portType="testCorrelationPT"/>
+    </plnk:partnerLinkType>
+
+    <prop:property name="testCorrelationID1" type="xsd:string"/>
+    <prop:propertyAlias propertyName="tns:testCorrelationID1" messageType="tns:requestMessage" part="requestMessageData">
+        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+            correlationID1
+        </prop:query>
+    </prop:propertyAlias>
+
+    <prop:property name="testCorrelationID2" type="xsd:string"/>
+    <prop:propertyAlias propertyName="tns:testCorrelationID2" messageType="tns:requestMessage" part="requestMessageData">
+        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+            correlationID2
+        </prop:query>
+    </prop:propertyAlias>
+
+    <prop:property name="testCorrelationID3" type="xsd:string"/>
+    <prop:propertyAlias propertyName="tns:testCorrelationID3" messageType="tns:requestMessage" part="requestMessageData">
+        <prop:query queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
+            correlationID3
+        </prop:query>
+    </prop:propertyAlias>
 </wsdl:definitions>
\ No newline at end of file

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationOpaque/TestCorrelationOpaque.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationOpaque/TestCorrelationOpaque.wsdl?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationOpaque/TestCorrelationOpaque.wsdl (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestCorrelationOpaque/TestCorrelationOpaque.wsdl Fri Jan 23 23:53:17 2009
@@ -1,22 +1,22 @@
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
--->
-
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+-->
+
 <wsdl:definitions targetNamespace="http://ode/bpel/unit-test/testCorrelationOpaque.wsdl" xmlns:tns="http://ode/bpel/unit-test/testCorrelationOpaque.wsdl"
   xmlns="http://ode/bpel/unit-test/testCorrelationOpaque.wsdl" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
   xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
@@ -32,32 +32,32 @@
   </wsdl:message>
   <wsdl:portType name="testCorrelationOpaquePT">
     <wsdl:operation name="operation2">
-      <wsdl:input name="operation2Input" message="tns:operation2Request"/>
-      <wsdl:output name="operation2Output" message="tns:operation2Response"/>
+      <wsdl:input name="operation2Input" message="tns:operation2Request"/>
+      <wsdl:output name="operation2Output" message="tns:operation2Response"/>
     </wsdl:operation>
     <wsdl:operation name="operation1">
       <wsdl:input name="operation1Input" message="tns:operation1Request"/>
-    </wsdl:operation>
+    </wsdl:operation>
   </wsdl:portType>
   <wsdl:binding name="testCorrelationOpaqueBinding" type="tns:testCorrelationOpaquePT">
     <wsdl:operation name="operation2">
-      <wsdl:input name="operation2Input"> </wsdl:input>
+      <wsdl:input name="operation2Input"> </wsdl:input>
       <wsdl:output name="operation2Output"> </wsdl:output>
     </wsdl:operation>
     <wsdl:operation name="operation1">
       <wsdl:input name="operation1Input"> </wsdl:input>
-    </wsdl:operation>
+    </wsdl:operation>
   </wsdl:binding>
   <wsdl:service name="testCorrelationOpaqueService">
     <wsdl:port name="testCorrelationOpaquePort" binding="tns:testCorrelationOpaqueBinding"> </wsdl:port>
-  </wsdl:service>
-
-  <plnk:partnerLinkType name="testCorrelationOpaqueRequest1">
-    <plnk:role name="testCorrelationOpaqueService1" portType="testCorrelationOpaquePT"/>
-  </plnk:partnerLinkType>
+  </wsdl:service>
+
+  <plnk:partnerLinkType name="testCorrelationOpaqueRequest1">
+    <plnk:role name="testCorrelationOpaqueService1" portType="testCorrelationOpaquePT"/>
+  </plnk:partnerLinkType>
   <plnk:partnerLinkType name="testCorrelationOpaqueRequest2">
     <plnk:role name="testCorrelationOpaqueService2" portType="testCorrelationOpaquePT"/>
-  </plnk:partnerLinkType>
+  </plnk:partnerLinkType>
+
 
-
-</wsdl:definitions>
+</wsdl:definitions>

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestDuration/BugCastDayTimeDurationToDuration-Pool.deploy
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestDuration/BugCastDayTimeDurationToDuration-Pool.deploy?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestDuration/BugCastDayTimeDurationToDuration-Pool.deploy (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestDuration/BugCastDayTimeDurationToDuration-Pool.deploy Fri Jan 23 23:53:17 2009
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='utf-8'?>
-<dd:process xmlns:dd="http://ode.fivesight.com/schemas/2006/06/27/dd" xmlns:tns="http://www.example.org/duration" xmlns:diag="http://example.com/BugCastDayTimeDurationToDuration" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:this="http://example.com/BugCastDayTimeDurationToDuration/Pool" xmlns:Pool0="http://example.com/BugCastDayTimeDurationToDuration/Pool0" name="this:Pool" fileName="BugCastDayTimeDurationToDuration-Pool.bpel">
-  <dd:property name="PATH">BugCastDayTimeDurationToDuration</dd:property>
-  <dd:property name="SVG">BugCastDayTimeDurationToDuration.svg</dd:property>
-  <dd:provide partnerLink="pool0AndPoolPlkVar">
-    <dd:service name="this:CanonicServiceForPool0" port="canonicPort"/>
-  </dd:provide>
+<?xml version='1.0' encoding='utf-8'?>
+<dd:process xmlns:dd="http://ode.fivesight.com/schemas/2006/06/27/dd" xmlns:tns="http://www.example.org/duration" xmlns:diag="http://example.com/BugCastDayTimeDurationToDuration" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:this="http://example.com/BugCastDayTimeDurationToDuration/Pool" xmlns:Pool0="http://example.com/BugCastDayTimeDurationToDuration/Pool0" name="this:Pool" fileName="BugCastDayTimeDurationToDuration-Pool.bpel">
+  <dd:property name="PATH">BugCastDayTimeDurationToDuration</dd:property>
+  <dd:property name="SVG">BugCastDayTimeDurationToDuration.svg</dd:property>
+  <dd:provide partnerLink="pool0AndPoolPlkVar">
+    <dd:service name="this:CanonicServiceForPool0" port="canonicPort"/>
+  </dd:provide>
 </dd:process>
\ No newline at end of file

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestDuration/BugCastDayTimeDurationToDuration-Pool.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestDuration/BugCastDayTimeDurationToDuration-Pool.wsdl?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestDuration/BugCastDayTimeDurationToDuration-Pool.wsdl (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestDuration/BugCastDayTimeDurationToDuration-Pool.wsdl Fri Jan 23 23:53:17 2009
@@ -1,39 +1,39 @@
-<?xml version='1.0' encoding='utf-8'?>
-<wsdl:definitions xmlns:tns="http://www.example.org/duration" xmlns:diag="http://example.com/BugCastDayTimeDurationToDuration" xmlns:bpel="http://schemas.xmlsoap.org/ws/2004/03/business-process/" xmlns:pnlk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:this="http://example.com/BugCastDayTimeDurationToDuration/Pool" xmlns:Pool0="http://example.com/BugCastDayTimeDurationToDuration/Pool0" targetNamespace="http://example.com/BugCastDayTimeDurationToDuration/Pool">
-    <wsdl:types>
-        <xs:schema elementFormDefault="qualified" targetNamespace="http://example.com/BugCastDayTimeDurationToDuration/Pool">
-            <xs:import namespace="http://www.example.org/duration" schemaLocation="duration.xsd"/>
-            <xs:element name="TaskRequest" type="tns:Complext"/>
-            <xs:element name="TaskResponse" type="xs:string"/>
-        </xs:schema>
-    </wsdl:types>
-    <wsdl:message name="TaskRequest">
-        <wsdl:part name="body" element="this:TaskRequest"/>
-    </wsdl:message>
-    <wsdl:message name="TaskResponse">
-        <wsdl:part name="body" element="this:TaskResponse"/>
-    </wsdl:message>
-    <wsdl:portType name="ForPool0">
-        <wsdl:operation name="Task">
-            <wsdl:input message="this:TaskRequest" name="Task"/>
-            <wsdl:output message="this:TaskResponse" name="TaskResponse"/>
-        </wsdl:operation>
-    </wsdl:portType>
-    <wsdl:binding name="CanonicBindingForPool0" type="this:ForPool0">
-        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
-        <wsdl:operation name="Task">
-            <soap:operation style="document" soapAction="http://example.com/BugCastDayTimeDurationToDuration/Pool/ForPool0/Task"/>
-            <wsdl:input>
-                <soap:body use="literal"/>
-            </wsdl:input>
-            <wsdl:output>
-                <soap:body use="literal"/>
-            </wsdl:output>
-        </wsdl:operation>
-    </wsdl:binding>
-    <wsdl:service name="CanonicServiceForPool0">
-        <wsdl:port name="canonicPort" binding="this:CanonicBindingForPool0">
-            <soap:address location="http://localhost:8080/ode/processes/BugcastDayTimeDurationToDuration/BugCastDayTimeDurationToDuration/Pool/Pool0"/>
-        </wsdl:port>
-    </wsdl:service>
+<?xml version='1.0' encoding='utf-8'?>
+<wsdl:definitions xmlns:tns="http://www.example.org/duration" xmlns:diag="http://example.com/BugCastDayTimeDurationToDuration" xmlns:bpel="http://schemas.xmlsoap.org/ws/2004/03/business-process/" xmlns:pnlk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:this="http://example.com/BugCastDayTimeDurationToDuration/Pool" xmlns:Pool0="http://example.com/BugCastDayTimeDurationToDuration/Pool0" targetNamespace="http://example.com/BugCastDayTimeDurationToDuration/Pool">
+    <wsdl:types>
+        <xs:schema elementFormDefault="qualified" targetNamespace="http://example.com/BugCastDayTimeDurationToDuration/Pool">
+            <xs:import namespace="http://www.example.org/duration" schemaLocation="duration.xsd"/>
+            <xs:element name="TaskRequest" type="tns:Complext"/>
+            <xs:element name="TaskResponse" type="xs:string"/>
+        </xs:schema>
+    </wsdl:types>
+    <wsdl:message name="TaskRequest">
+        <wsdl:part name="body" element="this:TaskRequest"/>
+    </wsdl:message>
+    <wsdl:message name="TaskResponse">
+        <wsdl:part name="body" element="this:TaskResponse"/>
+    </wsdl:message>
+    <wsdl:portType name="ForPool0">
+        <wsdl:operation name="Task">
+            <wsdl:input message="this:TaskRequest" name="Task"/>
+            <wsdl:output message="this:TaskResponse" name="TaskResponse"/>
+        </wsdl:operation>
+    </wsdl:portType>
+    <wsdl:binding name="CanonicBindingForPool0" type="this:ForPool0">
+        <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
+        <wsdl:operation name="Task">
+            <soap:operation style="document" soapAction="http://example.com/BugCastDayTimeDurationToDuration/Pool/ForPool0/Task"/>
+            <wsdl:input>
+                <soap:body use="literal"/>
+            </wsdl:input>
+            <wsdl:output>
+                <soap:body use="literal"/>
+            </wsdl:output>
+        </wsdl:operation>
+    </wsdl:binding>
+    <wsdl:service name="CanonicServiceForPool0">
+        <wsdl:port name="canonicPort" binding="this:CanonicBindingForPool0">
+            <soap:address location="http://localhost:8080/ode/processes/BugcastDayTimeDurationToDuration/BugCastDayTimeDurationToDuration/Pool/Pool0"/>
+        </wsdl:port>
+    </wsdl:service>
 </wsdl:definitions>
\ No newline at end of file

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestDuration/BugCastDayTimeDurationToDuration.wsdl
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestDuration/BugCastDayTimeDurationToDuration.wsdl?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestDuration/BugCastDayTimeDurationToDuration.wsdl (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestDuration/BugCastDayTimeDurationToDuration.wsdl Fri Jan 23 23:53:17 2009
@@ -1,7 +1,7 @@
-<?xml version='1.0' encoding='utf-8'?>
-<wsdl:definitions xmlns:tns="http://www.example.org/duration" xmlns:bpdm="http://www.intalio/designer/business-process-data-modeling" xmlns:Pool="http://example.com/BugCastDayTimeDurationToDuration/Pool" xmlns:diag="http://example.com/BugCastDayTimeDurationToDuration" xmlns:bpel="http://schemas.xmlsoap.org/ws/2004/03/business-process/" xmlns:pnlk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:Pool0="http://example.com/BugCastDayTimeDurationToDuration/Pool0" targetNamespace="http://example.com/BugCastDayTimeDurationToDuration">
-    <wsdl:import namespace="http://example.com/BugCastDayTimeDurationToDuration/Pool" location="BugCastDayTimeDurationToDuration-Pool.wsdl"/>
-    <pnlk:partnerLinkType name="Pool0AndPool">
-        <pnlk:role name="Pool_for_Pool0" portType="Pool:ForPool0"/>
-    </pnlk:partnerLinkType>
+<?xml version='1.0' encoding='utf-8'?>
+<wsdl:definitions xmlns:tns="http://www.example.org/duration" xmlns:bpdm="http://www.intalio/designer/business-process-data-modeling" xmlns:Pool="http://example.com/BugCastDayTimeDurationToDuration/Pool" xmlns:diag="http://example.com/BugCastDayTimeDurationToDuration" xmlns:bpel="http://schemas.xmlsoap.org/ws/2004/03/business-process/" xmlns:pnlk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:Pool0="http://example.com/BugCastDayTimeDurationToDuration/Pool0" targetNamespace="http://example.com/BugCastDayTimeDurationToDuration">
+    <wsdl:import namespace="http://example.com/BugCastDayTimeDurationToDuration/Pool" location="BugCastDayTimeDurationToDuration-Pool.wsdl"/>
+    <pnlk:partnerLinkType name="Pool0AndPool">
+        <pnlk:role name="Pool_for_Pool0" portType="Pool:ForPool0"/>
+    </pnlk:partnerLinkType>
 </wsdl:definitions>
\ No newline at end of file

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestDuration/deploy.xml
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestDuration/deploy.xml?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestDuration/deploy.xml (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestDuration/deploy.xml Fri Jan 23 23:53:17 2009
@@ -1,8 +1,8 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<dd:deploy xmlns:dd="http://ode.fivesight.com/schemas/2006/06/27/dd"><dd:process xmlns:dd="http://ode.fivesight.com/schemas/2006/06/27/dd" xmlns:tns="http://www.example.org/duration" xmlns:diag="http://example.com/BugCastDayTimeDurationToDuration" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:this="http://example.com/BugCastDayTimeDurationToDuration/Pool" xmlns:Pool0="http://example.com/BugCastDayTimeDurationToDuration/Pool0" name="this:Pool" fileName="BugCastDayTimeDurationToDuration-Pool.bpel">
-  <dd:property name="PATH">BugCastDayTimeDurationToDuration</dd:property>
-  <dd:property name="SVG">BugCastDayTimeDurationToDuration.svg</dd:property>
-  <dd:provide partnerLink="pool0AndPoolPlkVar">
-    <dd:service name="this:CanonicServiceForPool0" port="canonicPort" />
-  </dd:provide>
+<?xml version='1.0' encoding='UTF-8'?>
+<dd:deploy xmlns:dd="http://ode.fivesight.com/schemas/2006/06/27/dd"><dd:process xmlns:dd="http://ode.fivesight.com/schemas/2006/06/27/dd" xmlns:tns="http://www.example.org/duration" xmlns:diag="http://example.com/BugCastDayTimeDurationToDuration" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:this="http://example.com/BugCastDayTimeDurationToDuration/Pool" xmlns:Pool0="http://example.com/BugCastDayTimeDurationToDuration/Pool0" name="this:Pool" fileName="BugCastDayTimeDurationToDuration-Pool.bpel">
+  <dd:property name="PATH">BugCastDayTimeDurationToDuration</dd:property>
+  <dd:property name="SVG">BugCastDayTimeDurationToDuration.svg</dd:property>
+  <dd:provide partnerLink="pool0AndPoolPlkVar">
+    <dd:service name="this:CanonicServiceForPool0" port="canonicPort" />
+  </dd:provide>
 </dd:process></dd:deploy>
\ No newline at end of file

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestDuration/duration.xsd
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestDuration/duration.xsd?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestDuration/duration.xsd (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestDuration/duration.xsd Fri Jan 23 23:53:17 2009
@@ -1,10 +1,10 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/duration"
-        xmlns:tns="http://www.example.org/duration" elementFormDefault="qualified">
-
-    <complexType name="Complext">
-    	<sequence>
-    		<element name="duration" type="duration"></element>
-    	</sequence>
-    </complexType>
+<?xml version="1.0" encoding="UTF-8"?>
+<schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.example.org/duration"
+        xmlns:tns="http://www.example.org/duration" elementFormDefault="qualified">
+
+    <complexType name="Complext">
+    	<sequence>
+    		<element name="duration" type="duration"></element>
+    	</sequence>
+    </complexType>
 </schema>
\ No newline at end of file

Modified: ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/TestDynamicPick.bpel
URL: http://svn.apache.org/viewvc/ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/TestDynamicPick.bpel?rev=737256&r1=737255&r2=737256&view=diff
==============================================================================
--- ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/TestDynamicPick.bpel (original)
+++ ode/branches/APACHE_ODE_1.X/bpel-test/src/test/resources/bpel/2.0/TestDynamicPick/TestDynamicPick.bpel Fri Jan 23 23:53:17 2009
@@ -1,138 +1,138 @@
-<!--
-  ~ Licensed to the Apache Software Foundation (ASF) under one
-  ~ or more contributor license agreements.  See the NOTICE file
-  ~ distributed with this work for additional information
-  ~ regarding copyright ownership.  The ASF licenses this file
-  ~ to you under the Apache License, Version 2.0 (the
-  ~ "License"); you may not use this file except in compliance
-  ~ with the License.  You may obtain a copy of the License at
-  ~
-  ~    http://www.apache.org/licenses/LICENSE-2.0
-  ~
-  ~ Unless required by applicable law or agreed to in writing,
-  ~ software distributed under the License is distributed on an
-  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-  ~ KIND, either express or implied.  See the License for the
-  ~ specific language governing permissions and limitations
-  ~ under the License.
-  -->
-<process xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-  xsi:schemaLocation="http://docs.oasis-open.org/wsbpel/2.0/process/executable ../../../../../../../bpel-schemas/src/main/resources/wsbpel_executable.xsd"
-	targetNamespace="http://ode/bpel/unit-test/TestDynamicPick"
-	xmlns:tns="http://ode/bpel/unit-test/TestDynamicPick"
-	xmlns:wns="http://ode/bpel/unit-test/TestDynamicPick.wsdl"
-	xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
-	xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
-	name="TestDynamicPick"
-	queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
-	expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
-	suppressJoinFailure="yes">
-	
-	<!-- test pick with blocking dynamic key -->
-	
-	<import location="TestDynamicPick.wsdl"
-		namespace="http://ode/bpel/unit-test/TestDynamicPick.wsdl"
-		importType="http://schemas.xmlsoap.org/wsdl/" />
-	<import location="../ProbeService/probeService.wsdl"
-		namespace="http://ode/bpel/unit-test/ProbeService.wsdl"
-		importType="http://schemas.xmlsoap.org/wsdl/"/>
-	
-	
-	<partnerLinks>
-		<partnerLink name="request" partnerLinkType="wns:TestDynamicPickRequest" myRole="TestDynamicPickService"/>
-		<partnerLink name="probe" partnerLinkType="wns:probeRequest" partnerRole="probeService"  initializePartnerRole="yes"/>
-	</partnerLinks>
-	<variables>
-		<variable name="request" messageType="wns:requestMessage"/>
-		<variable name="probeInput" messageType="prb:probeMessage"/>
-		<variable name="reply" messageType="wns:replyMessage"/>
-	</variables>
-	<correlationSets>
-		<correlationSet name="testCorr1" properties="wns:testProbeID wns:testProbeKey1"/>
-		<correlationSet name="testCorr2" properties="wns:testProbeID wns:testProbeKey2"/>
-	</correlationSets>
-	<sequence>
-		<receive name="receive1" partnerLink="request" portType="wns:TestDynamicPickPT" operation="request" variable="request" createInstance="yes">
-			<correlations>
-				<correlation set="testCorr1" initiate="yes"/>
-				<correlation set="testCorr2" initiate="yes"/>
-			</correlations>
-		</receive>
-		<assign name="assign1">
-			<copy>
-				<from variable="request" property="wns:testProbeID"/>
-				<to variable="probeInput" part="probeName"/>
-			</copy>
-			<copy>
-				<from variable="request" property="wns:testProbeData"/>
-				<to variable="probeInput" part="probeData"/>
-			</copy>
-		</assign>
-		<assign>
-			<copy>
-				<from>
-					<literal><![CDATA[loop on pick until message includes requestEnd = yes]]></literal>
-				</from>
-				<to variable="probeInput" part="probeName"/>
-			</copy>
-		</assign>
-		<invoke name="probe" partnerLink="probe" portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput" outputVariable="probeInput"> </invoke>
-		<while>
-			<condition>$request.requestMessageData/requestEnd = 'no'</condition>
-			<pick name="testPick">
-				<onMessage partnerLink="request" portType="wns:TestDynamicPickPT" operation="continue1" variable="request">
-					<correlations>
-						<correlation set="testCorr1"/>
-					</correlations>
-					<sequence>
-						<assign>
-							<copy>
-								<from>
-									<literal><![CDATA[pick branch one invoked]]></literal>
-								</from>
-								<to variable="probeInput" part="probeName"/>
-							</copy>
-						</assign>
-						<invoke name="probe" partnerLink="probe" portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput" outputVariable="probeInput"> </invoke>
-					</sequence>
-				</onMessage>
-				<onMessage partnerLink="request" portType="wns:TestDynamicPickPT" operation="continue2" variable="request">
-					<correlations>
-						<correlation set="testCorr2"/>
-					</correlations>
-					<sequence>
-						<assign>
-							<copy>
-								<from>
-									<literal><![CDATA[pick branch two invoked]]></literal>
-								</from>
-								<to variable="probeInput" part="probeName"/>
-							</copy>
-						</assign>
-						<invoke name="probe" partnerLink="probe" portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput" outputVariable="probeInput"> </invoke>
-					</sequence>
-				</onMessage>
-			</pick>
-		</while>
-		<assign>
-			<copy>
-				<from>
-					<literal><![CDATA[process complete]]></literal>
-				</from>
-				<to variable="probeInput" part="probeName"/>
-			</copy>
-		</assign>
-		<invoke name="probe" partnerLink="probe" portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput" outputVariable="probeInput"> </invoke>
-		<assign name="assign2">
-			<copy>
-				<from variable="probeInput" part="probeName"/>
-				<to variable="reply" part="replyID"/>
-			</copy>
-			<copy>
-				<from variable="probeInput" part="probeData"/>
-				<to variable="reply" part="replyText"/>
-			</copy>
-		</assign>
-		<reply name="reply" partnerLink="request" portType="wns:TestDynamicPickPT" operation="request" variable="reply"> </reply>
-	</sequence>
-</process>
+<!--
+  ~ Licensed to the Apache Software Foundation (ASF) under one
+  ~ or more contributor license agreements.  See the NOTICE file
+  ~ distributed with this work for additional information
+  ~ regarding copyright ownership.  The ASF licenses this file
+  ~ to you under the Apache License, Version 2.0 (the
+  ~ "License"); you may not use this file except in compliance
+  ~ with the License.  You may obtain a copy of the License at
+  ~
+  ~    http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing,
+  ~ software distributed under the License is distributed on an
+  ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+  ~ KIND, either express or implied.  See the License for the
+  ~ specific language governing permissions and limitations
+  ~ under the License.
+  -->
+<process xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+  xsi:schemaLocation="http://docs.oasis-open.org/wsbpel/2.0/process/executable ../../../../../../../bpel-schemas/src/main/resources/wsbpel_executable.xsd"
+	targetNamespace="http://ode/bpel/unit-test/TestDynamicPick"
+	xmlns:tns="http://ode/bpel/unit-test/TestDynamicPick"
+	xmlns:wns="http://ode/bpel/unit-test/TestDynamicPick.wsdl"
+	xmlns:prb="http://ode/bpel/unit-test/ProbeService.wsdl"
+	xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
+	name="TestDynamicPick"
+	queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+	expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
+	suppressJoinFailure="yes">
+	
+	<!-- test pick with blocking dynamic key -->
+	
+	<import location="TestDynamicPick.wsdl"
+		namespace="http://ode/bpel/unit-test/TestDynamicPick.wsdl"
+		importType="http://schemas.xmlsoap.org/wsdl/" />
+	<import location="../ProbeService/probeService.wsdl"
+		namespace="http://ode/bpel/unit-test/ProbeService.wsdl"
+		importType="http://schemas.xmlsoap.org/wsdl/"/>
+	
+	
+	<partnerLinks>
+		<partnerLink name="request" partnerLinkType="wns:TestDynamicPickRequest" myRole="TestDynamicPickService"/>
+		<partnerLink name="probe" partnerLinkType="wns:probeRequest" partnerRole="probeService"  initializePartnerRole="yes"/>
+	</partnerLinks>
+	<variables>
+		<variable name="request" messageType="wns:requestMessage"/>
+		<variable name="probeInput" messageType="prb:probeMessage"/>
+		<variable name="reply" messageType="wns:replyMessage"/>
+	</variables>
+	<correlationSets>
+		<correlationSet name="testCorr1" properties="wns:testProbeID wns:testProbeKey1"/>
+		<correlationSet name="testCorr2" properties="wns:testProbeID wns:testProbeKey2"/>
+	</correlationSets>
+	<sequence>
+		<receive name="receive1" partnerLink="request" portType="wns:TestDynamicPickPT" operation="request" variable="request" createInstance="yes">
+			<correlations>
+				<correlation set="testCorr1" initiate="yes"/>
+				<correlation set="testCorr2" initiate="yes"/>
+			</correlations>
+		</receive>
+		<assign name="assign1">
+			<copy>
+				<from variable="request" property="wns:testProbeID"/>
+				<to variable="probeInput" part="probeName"/>
+			</copy>
+			<copy>
+				<from variable="request" property="wns:testProbeData"/>
+				<to variable="probeInput" part="probeData"/>
+			</copy>
+		</assign>
+		<assign>
+			<copy>
+				<from>
+					<literal><![CDATA[loop on pick until message includes requestEnd = yes]]></literal>
+				</from>
+				<to variable="probeInput" part="probeName"/>
+			</copy>
+		</assign>
+		<invoke name="probe" partnerLink="probe" portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput" outputVariable="probeInput"> </invoke>
+		<while>
+			<condition>$request.requestMessageData/requestEnd = 'no'</condition>
+			<pick name="testPick">
+				<onMessage partnerLink="request" portType="wns:TestDynamicPickPT" operation="continue1" variable="request">
+					<correlations>
+						<correlation set="testCorr1"/>
+					</correlations>
+					<sequence>
+						<assign>
+							<copy>
+								<from>
+									<literal><![CDATA[pick branch one invoked]]></literal>
+								</from>
+								<to variable="probeInput" part="probeName"/>
+							</copy>
+						</assign>
+						<invoke name="probe" partnerLink="probe" portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput" outputVariable="probeInput"> </invoke>
+					</sequence>
+				</onMessage>
+				<onMessage partnerLink="request" portType="wns:TestDynamicPickPT" operation="continue2" variable="request">
+					<correlations>
+						<correlation set="testCorr2"/>
+					</correlations>
+					<sequence>
+						<assign>
+							<copy>
+								<from>
+									<literal><![CDATA[pick branch two invoked]]></literal>
+								</from>
+								<to variable="probeInput" part="probeName"/>
+							</copy>
+						</assign>
+						<invoke name="probe" partnerLink="probe" portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput" outputVariable="probeInput"> </invoke>
+					</sequence>
+				</onMessage>
+			</pick>
+		</while>
+		<assign>
+			<copy>
+				<from>
+					<literal><![CDATA[process complete]]></literal>
+				</from>
+				<to variable="probeInput" part="probeName"/>
+			</copy>
+		</assign>
+		<invoke name="probe" partnerLink="probe" portType="prb:probeMessagePT" operation="probe" inputVariable="probeInput" outputVariable="probeInput"> </invoke>
+		<assign name="assign2">
+			<copy>
+				<from variable="probeInput" part="probeName"/>
+				<to variable="reply" part="replyID"/>
+			</copy>
+			<copy>
+				<from variable="probeInput" part="probeData"/>
+				<to variable="reply" part="replyText"/>
+			</copy>
+		</assign>
+		<reply name="reply" partnerLink="request" portType="wns:TestDynamicPickPT" operation="request" variable="reply"> </reply>
+	</sequence>
+</process>