Author: lresende
Date: Wed Nov 14 18:35:56 2007
New Revision: 595190
URL: http://svn.apache.org/viewvc?rev=595190&view=rev
Log:
Fixing BPEL process that were giving errors while deployed to ODE Server
Modified:
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/deploy.xml
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/ping.bpel
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/ping.composite
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/ping.wsdl
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/pong.wsdl
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/pong/deploy.xml
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/pong/pong.bpel
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/pong/pong.composite
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/pong/pong.wsdl
Modified:
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel?rev=595190&r1=595189&r2=595190&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel
(original)
+++
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/helloworld/helloworld.bpel
Wed Nov 14 18:35:56 2007
@@ -27,7 +27,7 @@
expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
<import location="helloworld.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/";
-
namespace="file:///home/mriou/dev/projects/ode/distro-axis2/src/examples/HelloWorld2/HelloWorld2.wsdl"/>
+
namespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"/>
<partnerLinks>
<partnerLink name="helloPartnerLink"
partnerLinkType="test:HelloPartnerLinkType" myRole="me" />
Modified:
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/deploy.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/deploy.xml?rev=595190&r1=595189&r2=595190&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/deploy.xml
(original)
+++
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/deploy.xml
Wed Nov 14 18:35:56 2007
@@ -18,7 +18,7 @@
~ under the License.
-->
<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03";
-
xmlns:process="http://tuscany.apache.org/implementation/bpel/example/ping";
+
xmlns:process="http://tuscany.apache.org/implementation/bpel/example/ping.bpel";
xmlns:ping="http://tuscany.apache.org/implementation/bpel/example/ping.wsdl";
xmlns:pong="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl";>
Modified:
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/ping.bpel
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/ping.bpel?rev=595190&r1=595189&r2=595190&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/ping.bpel
(original)
+++
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/ping.bpel
Wed Nov 14 18:35:56 2007
@@ -19,11 +19,10 @@
-->
<process
name="Ping"
-
targetNamespace="http://tuscany.apache.org/implementation/bpel/example/ping";
- xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable";
- xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable";
+ xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable";
+
targetNamespace="http://tuscany.apache.org/implementation/bpel/example/ping.bpel";
xmlns:xsd="http://www.w3.org/2001/XMLSchema";
- xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/ping";
+
xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/ping.bpel";
xmlns:ping="http://tuscany.apache.org/implementation/bpel/example/ping.wsdl";
xmlns:pong="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl";
expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath1.0">
Modified:
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/ping.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/ping.composite?rev=595190&r1=595189&r2=595190&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/ping.composite
(original)
+++
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/ping.composite
Wed Nov 14 18:35:56 2007
@@ -20,11 +20,11 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
targetNamespace="http://bpel";
- xmlns:hns="http://tuscany.apache.org/implementation/bpel/example/ping";
+
xmlns:ping="http://tuscany.apache.org/implementation/bpel/example/ping.bpel";
name="ping">
<component name="BPELPingComponent">
- <implementation.bpel process="hns:Ping"/>
+ <implementation.bpel process="ping:Ping"/>
</component>
</composite>
Modified:
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/ping.wsdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/ping.wsdl?rev=595190&r1=595189&r2=595190&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/ping.wsdl
(original)
+++
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/ping.wsdl
Wed Nov 14 18:35:56 2007
@@ -17,14 +17,12 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<definitions name="ping"
+<definitions name="Ping"
targetNamespace="http://tuscany.apache.org/implementation/bpel/example/ping.wsdl";
- xmlns="http://schemas.xmlsoap.org/wsdl/";
xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/ping.wsdl";
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
- xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/";
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";
- xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype";>
+ xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype";
+ xmlns="http://schemas.xmlsoap.org/wsdl/";>
<types>
<schema
targetNamespace="http://tuscany.apache.org/implementation/bpel/example/ping.wsdl";
@@ -60,36 +58,27 @@
<output message="tns:PingResponse"/>
</operation>
</portType>
-
+
<binding name="PingSoapBinding" type="tns:PingPortType">
- <wsdlsoap:binding style="document"
transport="http://schemas.xmlsoap.org/soap/http"/>
- <operation name="Ping">
- <wsdlsoap:operation soapAction=""/>
- <input name="PingRequest">
- <wsdlsoap:body use="literal"/>
- </input>
- <output name="PingResponse">
- <wsdlsoap:body use="literal"/>
- </output>
- </operation>
- </binding>
-
+ <soap:binding style="document"
transport="http://schemas.xmlsoap.org/soap/http"; />
+ <operation name="Ping">
+ <soap:operation soapAction="" />
+ <input name="PingRequest">
+ <soap:body use="literal" />
+ </input>
+ <output name="PingResponse">
+ <soap:body use="literal" />
+ </output>
+ </operation>
+ </binding>
+
<service name="PingService">
- <port name="PingPort" binding="tns:PingSoapBinding">
- <soap:address
location="http://localhost:8085/ode/processes/pong"/>
- </port>
- </service>
+ <port name="PingPort" binding="tns:PingSoapBinding">
+ <soap:address
location="http://localhost:8085/ode/processes/ping"; />
+ </port>
+ </service>
<plnk:partnerLinkType name="PingPartnerLinkType">
<plnk:role name="Provider" portType="tns:PingPortType"/>
</plnk:partnerLinkType>
-
- <!--
-
- This is an abstract interface/portType definition. Note the lack of
- binding and service: these are defined by the HTTP binding component.
- See ping-http/Ping.wsdl for details.
-
- -->
-
-</definitions>
+</definitions>
\ No newline at end of file
Modified:
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/pong.wsdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/pong.wsdl?rev=595190&r1=595189&r2=595190&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/pong.wsdl
(original)
+++
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/ping/pong.wsdl
Wed Nov 14 18:35:56 2007
@@ -17,11 +17,9 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<definitions name="pong"
+<definitions name="Pong"
targetNamespace="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl";
xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl";
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
- xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/";
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";
xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype";
xmlns="http://schemas.xmlsoap.org/wsdl/";>
@@ -61,15 +59,15 @@
</operation>
</portType>
- <binding name="PongSoapBinding" type="tns:PongPortType">
- <wsdlsoap:binding style="document"
transport="http://schemas.xmlsoap.org/soap/http"/>
+ <binding name="PongSoapBinding" type="tns:PongPortType">
+ <soap:binding style="document"
transport="http://schemas.xmlsoap.org/soap/http"/>
<operation name="Pong">
- <wsdlsoap:operation soapAction=""/>
+ <soap:operation soapAction=""/>
<input name="PongRequest">
- <wsdlsoap:body use="literal"/>
+ <soap:body use="literal"/>
</input>
<output name="PongResponse">
- <wsdlsoap:body use="literal"/>
+ <soap:body use="literal"/>
</output>
</operation>
</binding>
Modified:
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/pong/deploy.xml
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/pong/deploy.xml?rev=595190&r1=595189&r2=595190&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/pong/deploy.xml
(original)
+++
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/pong/deploy.xml
Wed Nov 14 18:35:56 2007
@@ -18,7 +18,7 @@
~ under the License.
-->
<deploy xmlns="http://www.apache.org/ode/schemas/dd/2007/03";
-
xmlns:process="http://tuscany.apache.org/implementation/bpel/example/pong";
+
xmlns:process="http://tuscany.apache.org/implementation/bpel/example/pong.bpel";
xmlns:pong="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl";>
<process name="process:Pong">
Modified:
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/pong/pong.bpel
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/pong/pong.bpel?rev=595190&r1=595189&r2=595190&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/pong/pong.bpel
(original)
+++
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/pong/pong.bpel
Wed Nov 14 18:35:56 2007
@@ -1,52 +1,87 @@
<?xml version="1.0" encoding="UTF-8"?>
-<process
- name="Pong"
-
targetNamespace="http://tuscany.apache.org/implementation/bpel/example/pong";
- xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/";
- xmlns:bpws="http://docs.oasis-open.org/wsbpel/2.0/process/executable";
-
xmlns:pong="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl";
- xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/pong";
- xmlns:xsd="http://www.w3.org/2001/XMLSchema";
- exitOnStandardFault="yes"
- expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath1.0">
-
- <import importType="http://schemas.xmlsoap.org/wsdl/";
- location="pong.wsdl"
namespace="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl"/>
- <import importType="http://schemas.xmlsoap.org/wsdl/";
- location="pong.wsdl"
namespace="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl"/>
+<!--
+ ~ 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
+ name="Pong"
+ xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable";
+
targetNamespace="http://tuscany.apache.org/implementation/bpel/example/pong.bpel";
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema";
+
xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/pong.bpel";
+
xmlns:pong="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl";
+ expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath1.0">
+
+ <import location="pong.wsdl"
+
namespace="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl";
+ importType="http://schemas.xmlsoap.org/wsdl/"; />
+
+ <import location="pong.wsdl"
+
namespace="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl";
+ importType="http://schemas.xmlsoap.org/wsdl/"; />
+
<partnerLinks>
- <partnerLink myRole="Provider" name="PongPartnerLink"
partnerLinkType="pong:PongPartnerLinkType"/>
+ <partnerLink name="PongPartnerLink"
+ partnerLinkType="pong:PongPartnerLinkType"
+ myRole="Provider" />
</partnerLinks>
+
<variables>
<variable messageType="pong:PongRequest" name="pongRequest"/>
<variable messageType="pong:PongResponse" name="pongResponse"/>
- <variable name="text" type="xsd:string"/>
+ <variable type="xsd:string" name="text" />
</variables>
+
<sequence name="Main">
- <receive createInstance="yes" name="pongReceive"
- operation="Pong" partnerLink="PongPartnerLink"
- portType="pong:PongPortType" variable="pongRequest"/>
- <assign name="assignPongRequest" validate="no">
+ <receive name="pongReceive"
+ createInstance="yes"
+ operation="Pong"
+ partnerLink="PongPartnerLink"
+ portType="pong:PongPortType"
+ variable="pongRequest"/>
+
+ <assign name="assignPongRequest">
+ <!-- add "ping" text to the input text -->
<copy>
- <from><![CDATA[concat($pongRequest.body/pong:text, '
pong')]]></from>
- <to><![CDATA[$text]]></to>
+ <from>concat($pongRequest.body/pong:text, ' pong')</from>
+ <to>$text</to>
</copy>
+ <!-- initialize pongResponse -->
<copy>
<from>
<literal>
- <pong:PongRequest xmlns:pong="urn:/Pong.wsdl">
+ <pong:PongRequest>
<pong:text/>
</pong:PongRequest>
</literal>
</from>
- <to><![CDATA[$pongResponse.body]]></to>
+ <to>$pongResponse.body</to>
</copy>
+ <!-- copy new text into pongResponse -->
<copy>
- <from><![CDATA[$text]]></from>
- <to><![CDATA[$pongResponse.body/pong:text]]></to>
+ <from>$text</from>
+ <to>$pongResponse.body/pong:text</to>
</copy>
</assign>
- <reply name="pongReply" operation="Pong"
- partnerLink="PongPartnerLink" portType="pong:PongPortType"
variable="pongResponse"/>
+
+ <reply name="pongReply"
+ partnerLink="PongPartnerLink"
+ portType="pong:PongPortType"
+ operation="Pong"
+ variable="pongResponse"/>
</sequence>
</process>
Modified:
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/pong/pong.composite
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/pong/pong.composite?rev=595190&r1=595189&r2=595190&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/pong/pong.composite
(original)
+++
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/pong/pong.composite
Wed Nov 14 18:35:56 2007
@@ -20,11 +20,11 @@
<composite xmlns="http://www.osoa.org/xmlns/sca/1.0";
targetNamespace="http://bpel";
- xmlns:hns="http://tuscany.apache.org/implementation/bpel/example/pong";
+
xmlns:pong="http://tuscany.apache.org/implementation/bpel/example/pong.bpel";
name="pong">
<component name="BPELPongComponent">
- <implementation.bpel process="hns:Pong"/>
+ <implementation.bpel process="pong:Pong"/>
</component>
</composite>
Modified:
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/pong/pong.wsdl
URL:
http://svn.apache.org/viewvc/incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/pong/pong.wsdl?rev=595190&r1=595189&r2=595190&view=diff
==============================================================================
---
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/pong/pong.wsdl
(original)
+++
incubator/tuscany/java/sca/modules/implementation-bpel/src/test/resources/pong/pong.wsdl
Wed Nov 14 18:35:56 2007
@@ -17,11 +17,9 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-<definitions name="pong"
+<definitions name="Pong"
targetNamespace="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl";
xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/pong.wsdl";
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/";
- xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/";
xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/";
xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype";
xmlns="http://schemas.xmlsoap.org/wsdl/";>
@@ -61,15 +59,15 @@
</operation>
</portType>
- <binding name="PongSoapBinding" type="tns:PongPortType">
- <wsdlsoap:binding style="document"
transport="http://schemas.xmlsoap.org/soap/http"/>
+ <binding name="PongSoapBinding" type="tns:PongPortType">
+ <soap:binding style="document"
transport="http://schemas.xmlsoap.org/soap/http"/>
<operation name="Pong">
- <wsdlsoap:operation soapAction=""/>
+ <soap:operation soapAction=""/>
<input name="PongRequest">
- <wsdlsoap:body use="literal"/>
+ <soap:body use="literal"/>
</input>
<output name="PongResponse">
- <wsdlsoap:body use="literal"/>
+ <soap:body use="literal"/>
</output>
</operation>
</binding>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
