Author: bbrodt
Date: 2010-03-11 10:54:18 -0500 (Thu, 11 Mar 2010)
New Revision: 559
Modified:
trunk/samples/quickstart/BPEL-BluePrint3/bpelContent/InventoryService.bpel
trunk/samples/quickstart/BPEL-BluePrint3/bpelContent/InventoryService.bpelex
trunk/samples/quickstart/BPEL-BluePrint3/bpelContent/POService.bpel
trunk/samples/quickstart/BPEL-BluePrint3/bpelContent/POService.bpelex
trunk/samples/quickstart/BPEL-BluePrint3/build.xml
Log:
Add test messages and build targets; fix POService logic
Modified: trunk/samples/quickstart/BPEL-BluePrint3/bpelContent/InventoryService.bpel
===================================================================
--- trunk/samples/quickstart/BPEL-BluePrint3/bpelContent/InventoryService.bpel 2010-03-11
11:05:03 UTC (rev 558)
+++ trunk/samples/quickstart/BPEL-BluePrint3/bpelContent/InventoryService.bpel 2010-03-11
15:54:18 UTC (rev 559)
@@ -72,7 +72,7 @@
createInstance="yes">
</receive>
<if name="checkAvailability">
-
<condition>starts-with($purchaseOrder.purchaseOrder/po:orderDescription,
'OrderVal') = true()</condition>
+
<bpws:condition><![CDATA[starts-with($purchaseOrder.purchaseOrder/po:orderDescription,
'OrderVal') = true()]]></bpws:condition>
<sequence>
<assign name="Case1">
<bpws:copy>
Modified: trunk/samples/quickstart/BPEL-BluePrint3/bpelContent/InventoryService.bpelex
===================================================================
---
trunk/samples/quickstart/BPEL-BluePrint3/bpelContent/InventoryService.bpelex 2010-03-11
11:05:03 UTC (rev 558)
+++
trunk/samples/quickstart/BPEL-BluePrint3/bpelContent/InventoryService.bpelex 2010-03-11
15:54:18 UTC (rev 559)
@@ -22,7 +22,7 @@
</extensions>
<extensions>
<extendedObject href="InventoryService.bpel#/"/>
- <extensionObject
xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ProcessExtension"
modificationStamp="1267496989000"/>
+ <extensionObject
xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ProcessExtension"
modificationStamp="1268321524000"/>
</extensions>
<extensions>
<extendedObject
href="InventoryService.bpel#//@activity/@activities.1/@else/(a)activity"/>
Modified: trunk/samples/quickstart/BPEL-BluePrint3/bpelContent/POService.bpel
===================================================================
--- trunk/samples/quickstart/BPEL-BluePrint3/bpelContent/POService.bpel 2010-03-11
11:05:03 UTC (rev 558)
+++ trunk/samples/quickstart/BPEL-BluePrint3/bpelContent/POService.bpel 2010-03-11
15:54:18 UTC (rev 559)
@@ -189,30 +189,60 @@
operation="inventoryService"
inputVariable="inventoryServiceRequest"
outputVariable="inventoryServiceReply"/>
- <assign name="Assign">
- <bpws:copy>
- <bpws:from><bpws:literal><tns:purchaseOrder
xmlns:tns="http://manufacturing.org/xsd/purchase"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <tns:orderId></tns:orderId>
- <tns:customerId></tns:customerId>
- <tns:orderDescription></tns:orderDescription>
- <tns:price></tns:price>
-</tns:purchaseOrder>
-</bpws:literal></bpws:from>
- <bpws:to variable="purchaseOrderReply"
part="purchaseOrder"></bpws:to>
- </bpws:copy>
- <copy>
- <from part="purchaseOrder"
variable="purchaseOrderRequest"/>
- <to part="purchaseOrder"
variable="purchaseOrderReply"/>
- </copy>
- <copy>
- <from variable="inventoryServiceReply"/>
- <to variable="inventoryServiceReply"/>
- </copy>
- </assign>
- <reply name="sendPurchaseOrder.Reply"
- partnerLink="POServicePLink"
- portType="pos:purchaseOrderPT"
- operation="sendPurchaseOrder"
- variable="purchaseOrderReply"/>
+<if name="InStock">
+
<bpws:condition><![CDATA[$inventoryServiceReply.inventoryPart/xsd:inventoryStatus
= 'true']]></bpws:condition>
+ <sequence name="ProcessInStock">
+ <reply name="sendPurchaseOrder.Success"
+ partnerLink="POServicePLink"
+ operation="sendPurchaseOrder"
+ portType="pos:purchaseOrderPT"
+ variable="purchaseOrderRequest"/>
+ </sequence>
+ <else>
+ <sequence name="ProcessOutOfStock">
+
+ <assign name="InitializeFaultReply">
+
+
+
+
+
+
+ <bpws:copy>
+
<bpws:from><bpws:literal><tns:purchaseOrderFault
xmlns:tns="http://manufacturing.org/xsd/purchase"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+ <tns:FaultCode></tns:FaultCode>
+ <tns:FaultMessage></tns:FaultMessage>
+</tns:purchaseOrderFault>
+</bpws:literal></bpws:from>
+ <bpws:to variable="purchaseOrderFault"
part="cannotCompleteOrder"></bpws:to>
+ </bpws:copy>
+ <bpws:copy>
+ <bpws:from part="inventoryPart"
variable="inventoryServiceReply">
+ <bpws:query
queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath1.0">
+ <![CDATA[xsd:inventoryStatusMessage]]>
+ </bpws:query>
+ </bpws:from>
+ <bpws:to part="cannotCompleteOrder"
variable="purchaseOrderFault">
+ <bpws:query
queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath1.0"><![CDATA[po:FaultMessage]]></bpws:query>
+ </bpws:to>
+ </bpws:copy>
+ <bpws:copy>
+ <bpws:from>
+ <bpws:literal
xml:space="preserve">404</bpws:literal>
+ </bpws:from>
+ <bpws:to part="cannotCompleteOrder"
variable="purchaseOrderFault">
+ <bpws:query
queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath1.0"><![CDATA[po:FaultCode]]></bpws:query>
+ </bpws:to>
+ </bpws:copy>
+ </assign>
+ <reply name="sendPurchaseOrder.Fault"
+ partnerLink="POServicePLink"
+ portType="pos:purchaseOrderPT"
+ operation="sendPurchaseOrder"
+ variable="purchaseOrderFault"
+ faultName="pos:cannotCompleteOrder"/>
+ </sequence>
+ </else>
+ </if>
</sequence>
</process>
Modified: trunk/samples/quickstart/BPEL-BluePrint3/bpelContent/POService.bpelex
===================================================================
--- trunk/samples/quickstart/BPEL-BluePrint3/bpelContent/POService.bpelex 2010-03-11
11:05:03 UTC (rev 558)
+++ trunk/samples/quickstart/BPEL-BluePrint3/bpelContent/POService.bpelex 2010-03-11
15:54:18 UTC (rev 559)
@@ -22,7 +22,7 @@
</extensions>
<extensions>
<extendedObject href="POService.bpel#/"/>
- <extensionObject
xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ProcessExtension"
modificationStamp="1267477531000"/>
+ <extensionObject
xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ProcessExtension"
modificationStamp="1268322055000"/>
</extensions>
<extensions>
<extendedObject href="POService.bpel#//@variables/(a)children.2"/>
@@ -77,22 +77,6 @@
<extensionObject
xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/>
</extensions>
<extensions>
- <extendedObject href="POService.bpel#//@activity/(a)activities.4"/>
- <extensionObject
xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/>
- </extensions>
- <extensions>
- <extendedObject
href="POService.bpel#//@activity/@activities.4/(a)copy.1"/>
- <extensionObject
xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/>
- </extensions>
- <extensions>
- <extendedObject
href="POService.bpel#//@activity/@activities.4/(a)copy.2"/>
- <extensionObject
xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/>
- </extensions>
- <extensions>
- <extendedObject href="POService.bpel#//@activity/(a)activities.5"/>
- <extensionObject
xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/>
- </extensions>
- <extensions>
<extendedObject
href="POService.bpel#//@faultHandlers/@catch.0/(a)activity"/>
<extensionObject
xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/>
</extensions>
@@ -129,10 +113,6 @@
<extensionObject
xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/>
</extensions>
<extensions>
- <extendedObject
href="POService.bpel#//@activity/@activities.4/(a)copy.0"/>
- <extensionObject
xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/>
- </extensions>
- <extensions>
<extendedObject
href="POService.bpel#//@faultHandlers/@catch.1/@activity/@activities.0/(a)copy.0"/>
<extensionObject
xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/>
</extensions>
@@ -144,4 +124,12 @@
<extendedObject
href="POService.bpel#//@faultHandlers/@catch.1/@activity/@activities.0/(a)copy.2"/>
<extensionObject
xsi:type="org.eclipse.bpel.ui.uiextensionmodel:CopyExtension"/>
</extensions>
+ <extensions>
+ <extendedObject
href="POService.bpel#//@activity/@activities.4/@activity/(a)activities.0"/>
+ <extensionObject
xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/>
+ </extensions>
+ <extensions>
+ <extendedObject
href="POService.bpel#//@activity/@activities.4/(a)activity"/>
+ <extensionObject
xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/>
+ </extensions>
</extensionmodel:ExtensionMap>
Modified: trunk/samples/quickstart/BPEL-BluePrint3/build.xml
===================================================================
--- trunk/samples/quickstart/BPEL-BluePrint3/build.xml 2010-03-11 11:05:03 UTC (rev 558)
+++ trunk/samples/quickstart/BPEL-BluePrint3/build.xml 2010-03-11 15:54:18 UTC (rev 559)
@@ -54,4 +54,32 @@
</classpath>
</java>
</target>
+
+ <target name="send_po_fault">
+ <echo>Throw PO fault message to: ${ant.project.name}</echo>
+ <java
classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender">
+ <arg
value="http://localhost:8080/BPEL_BluePrint3_PurchaseOrderService"/>
+ <arg value="messages/throw_po_fault.xml"/>
+ <classpath>
+ <fileset dir="../../common/lib">
+ <include name="**/*.jar"/>
+ </fileset>
+ <pathelement path="${java.class.path}"/>
+ </classpath>
+ </java>
+ </target>
+
+ <target name="send_inv_fault">
+ <echo>Throw Inventory fault message to: ${ant.project.name}</echo>
+ <java
classname="org.apache.ode.tools.sendsoap.cline.HttpSoapSender">
+ <arg
value="http://localhost:8080/BPEL_BluePrint3_PurchaseOrderService"/>
+ <arg value="messages/throw_inv_fault.xml"/>
+ <classpath>
+ <fileset dir="../../common/lib">
+ <include name="**/*.jar"/>
+ </fileset>
+ <pathelement path="${java.class.path}"/>
+ </classpath>
+ </java>
+ </target>
</project>