Author: objectiser
Date: 2010-07-02 15:14:49 -0400 (Fri, 02 Jul 2010)
New Revision: 292
Modified:
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Broker.bpel
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Buyer.bpel
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)CreditAgency.bpel
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Buyer.bpel
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)CreditAgency.bpel
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Store.bpel
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Buyer.bpel
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Seller.bpel
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker(a)Broker.scv
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Broker.bpel
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Buyer.bpel
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)CreditAgency.bpel
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Buyer.bpel
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)CreditAgency.bpel
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Store.bpel
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Buyer.bpel
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Seller.bpel
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker(a)Broker.scv
Log:
Fixed remaining fault message types and updated expected test results.
Modified:
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java
===================================================================
---
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java 2010-07-01
19:42:28 UTC (rev 291)
+++
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java 2010-07-02
19:14:49 UTC (rev 292)
@@ -350,6 +350,9 @@
if (InteractionUtil.isRequest(interaction)) {
qname = WSDLGeneratorUtil.getRequestMessageType(contract.getNamespace(),
interaction.getMessageSignature().getOperation());
+ } else if (InteractionPatterns.isFaultResponse(interaction)) {
+ qname = WSDLGeneratorUtil.getFaultMessageType(contract.getNamespace(),
+ InteractionPatterns.getFaultName(interaction));
} else {
qname = WSDLGeneratorUtil.getResponseMessageType(contract.getNamespace(),
interaction.getMessageSignature().getOperation());
Modified:
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Broker.bpel
===================================================================
---
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Broker.bpel 2010-07-01
19:42:28 UTC (rev 291)
+++
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Broker.bpel 2010-07-02
19:14:49 UTC (rev 292)
@@ -10,17 +10,17 @@
<partnerLink name="BrokerToSupplierTxnProcessor"
partnerLinkType="tns:BrokerToSupplierTxnProcessorLT"
partnerRole="SupplierTxnProcessorRequester"/>
</partnerLinks>
<variables>
- <variable messageType="enquiry" name="enquiryVar"/>
- <variable messageType="requestForQuote"
name="requestForQuoteVar"/>
- <variable messageType="quote" name="quoteVar"/>
- <variable messageType="quoteList"
name="quoteListVar"/>
- <variable messageType="buy" name="buyVar"/>
- <variable messageType="CreditCheckRequest"
name="creditCheckRequestVar"/>
- <variable messageType="CreditCheckOk"
name="creditCheckOkVar"/>
- <variable messageType="orderConfirmed"
name="orderConfirmedVar"/>
- <variable messageType="bookingReference"
name="bookingReferenceVar"/>
- <variable messageType="orderRejected"
name="orderRejectedVar"/>
- <variable messageType="cancel" name="cancelVar"/>
+ <variable messageType="tns:makeEnquiryRequest"
name="enquiryVar"/>
+ <variable messageType="ns1:getQuoteRequest"
name="requestForQuoteVar"/>
+ <variable messageType="ns1:getQuoteResponse"
name="quoteVar"/>
+ <variable messageType="tns:makeEnquiryResponse"
name="quoteListVar"/>
+ <variable messageType="tns:buyRequest" name="buyVar"/>
+ <variable messageType="tns:checkCreditRequest"
name="creditCheckRequestVar"/>
+ <variable messageType="tns:checkCreditResponse"
name="creditCheckOkVar"/>
+ <variable messageType="ns1:confirmRequest"
name="orderConfirmedVar"/>
+ <variable messageType="ns1:confirmResponse"
name="bookingReferenceVar"/>
+ <variable messageType="tns:rejectedFault"
name="orderRejectedVar"/>
+ <variable messageType="tns:cancelRequest"
name="cancelVar"/>
</variables>
<sequence>
<receive createInstance="yes" name="Receive_enquiry"
operation="makeEnquiry" partnerLink="BuyerToBroker"
portType="tns:BrokerBehavior" variable="enquiryVar"/>
@@ -41,7 +41,7 @@
<sequence>
<scope>
<faultHandlers>
- <catch
faultMessageType="CreditCheckInvalid" faultName="invalidCredit"
faultVariable="creditCheckInvalidVar">
+ <catch
faultMessageType="tns:invalidCreditFault"
faultName="tns:invalidCredit"
faultVariable="creditCheckInvalidVar">
<sequence>
<reply faultName="tns:rejected"
name="Send_orderRejected" operation="buy"
partnerLink="BuyerToBroker" portType="tns:BrokerBehavior"
variable="orderRejectedVar"/>
</sequence>
Modified:
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Buyer.bpel
===================================================================
---
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Buyer.bpel 2010-07-01
19:42:28 UTC (rev 291)
+++
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Buyer.bpel 2010-07-02
19:14:49 UTC (rev 292)
@@ -7,11 +7,11 @@
<partnerLink myRole="BuyerRequester" name="BuyerToBroker"
partnerLinkType="tns:BuyerToBrokerLT"
partnerRole="BrokerRequester"/>
</partnerLinks>
<variables>
- <variable messageType="enquiry" name="enquiryVar"/>
- <variable messageType="quoteList"
name="quoteListVar"/>
- <variable messageType="buy" name="buyVar"/>
- <variable messageType="bookingReference"
name="bookingReferenceVar"/>
- <variable messageType="cancel" name="cancelVar"/>
+ <variable messageType="tns:makeEnquiryRequest"
name="enquiryVar"/>
+ <variable messageType="tns:makeEnquiryResponse"
name="quoteListVar"/>
+ <variable messageType="tns:buyRequest" name="buyVar"/>
+ <variable messageType="tns:buyResponse"
name="bookingReferenceVar"/>
+ <variable messageType="tns:cancelRequest"
name="cancelVar"/>
</variables>
<sequence>
<invoke inputVariable="enquiryVar" name="Send_enquiry"
operation="makeEnquiry" partnerLink="BuyerToBroker"
portType="tns:BrokerBehavior"/>
@@ -22,7 +22,7 @@
<sequence>
<scope>
<faultHandlers>
- <catch faultMessageType="orderRejected"
faultName="rejected" faultVariable="orderRejectedVar">
+ <catch faultMessageType="tns:rejectedFault"
faultName="tns:rejected" faultVariable="orderRejectedVar">
<sequence/>
</catch>
</faultHandlers>
Modified:
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)CreditAgency.bpel
===================================================================
---
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)CreditAgency.bpel 2010-07-01
19:42:28 UTC (rev 291)
+++
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)CreditAgency.bpel 2010-07-02
19:14:49 UTC (rev 292)
@@ -7,9 +7,9 @@
<partnerLink myRole="CreditAgencyService"
name="BrokerToCreditAgency"
partnerLinkType="tns:BrokerToCreditAgencyServiceLT"/>
</partnerLinks>
<variables>
- <variable messageType="CreditCheckRequest"
name="creditCheckRequestVar"/>
- <variable messageType="CreditCheckOk"
name="creditCheckOkVar"/>
- <variable messageType="CreditCheckInvalid"
name="creditCheckInvalidVar"/>
+ <variable messageType="tns:checkCreditRequest"
name="creditCheckRequestVar"/>
+ <variable messageType="tns:checkCreditResponse"
name="creditCheckOkVar"/>
+ <variable messageType="tns:invalidCreditFault"
name="creditCheckInvalidVar"/>
</variables>
<sequence>
<pick>
Modified:
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel
===================================================================
---
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel 2010-07-01
19:42:28 UTC (rev 291)
+++
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel 2010-07-02
19:14:49 UTC (rev 292)
@@ -5,8 +5,8 @@
<partnerLink myRole="SupplierQuoteEngineService"
name="BrokerToSupplierQuoteEngine"
partnerLinkType="ns1:BrokerToSupplierQuoteEngineServiceLT"/>
</partnerLinks>
<variables>
- <variable messageType="requestForQuote"
name="requestForQuoteVar"/>
- <variable messageType="quote" name="quoteVar"/>
+ <variable messageType="ns1:getQuoteRequest"
name="requestForQuoteVar"/>
+ <variable messageType="ns1:getQuoteResponse"
name="quoteVar"/>
</variables>
<sequence>
<receive createInstance="yes"
name="Receive_requestForQuote" operation="getQuote"
partnerLink="BrokerToSupplierQuoteEngine"
portType="tns:SupplierBehavior" variable="requestForQuoteVar"/>
Modified:
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel
===================================================================
---
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel 2010-07-01
19:42:28 UTC (rev 291)
+++
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel 2010-07-02
19:14:49 UTC (rev 292)
@@ -5,8 +5,8 @@
<partnerLink myRole="SupplierTxnProcessorService"
name="BrokerToSupplierTxnProcessor"
partnerLinkType="ns2:BrokerToSupplierTxnProcessorServiceLT"/>
</partnerLinks>
<variables>
- <variable messageType="orderConfirmed"
name="orderConfirmedVar"/>
- <variable messageType="bookingReference"
name="bookingReferenceVar"/>
+ <variable messageType="ns1:confirmRequest"
name="orderConfirmedVar"/>
+ <variable messageType="ns1:confirmResponse"
name="bookingReferenceVar"/>
</variables>
<sequence>
<pick createInstance="yes">
Modified:
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Buyer.bpel
===================================================================
---
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Buyer.bpel 2010-07-01
19:42:28 UTC (rev 291)
+++
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Buyer.bpel 2010-07-02
19:14:49 UTC (rev 292)
@@ -6,13 +6,13 @@
<partnerLink name="BuyerToStore"
partnerLinkType="tns:BuyerToStoreLT"
partnerRole="StoreRequester"/>
</partnerLinks>
<variables>
- <variable messageType="sto:BuyRequest"
name="buyRequestVar"/>
- <variable messageType="sto:BuyConfirmed"
name="buyConfirmedVar"/>
+ <variable messageType="sto:buyRequest"
name="buyRequestVar"/>
+ <variable messageType="sto:buyResponse"
name="buyConfirmedVar"/>
</variables>
<sequence>
<scope>
<faultHandlers>
- <catch faultMessageType="sto:BuyFailed"
faultName="sto:BuyFailed" faultVariable="buyFailedVar">
+ <catch faultMessageType="sto:BuyFailedFault"
faultName="sto:BuyFailed" faultVariable="buyFailedVar">
<sequence/>
</catch>
</faultHandlers>
Modified:
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)CreditAgency.bpel
===================================================================
---
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)CreditAgency.bpel 2010-07-01
19:42:28 UTC (rev 291)
+++
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)CreditAgency.bpel 2010-07-02
19:14:49 UTC (rev 292)
@@ -6,9 +6,9 @@
<partnerLink myRole="CreditAgencyService"
name="StoreToCreditAgency"
partnerLinkType="pur:StoreToCreditAgencyServiceLT"/>
</partnerLinks>
<variables>
- <variable messageType="pur:CreditCheckRequest"
name="creditCheckRequestVar"/>
- <variable messageType="pur:CreditCheckOk"
name="creditCheckOkVar"/>
- <variable messageType="pur:CreditCheckInvalid"
name="creditCheckInvalidVar"/>
+ <variable messageType="pur:checkCreditRequest"
name="creditCheckRequestVar"/>
+ <variable messageType="pur:checkCreditResponse"
name="creditCheckOkVar"/>
+ <variable messageType="pur:CreditCheckFailedFault"
name="creditCheckInvalidVar"/>
</variables>
<sequence>
<receive createInstance="yes"
name="Receive_CreditCheckRequest" operation="checkCredit"
partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface"
variable="creditCheckRequestVar"/>
Modified:
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Store.bpel
===================================================================
---
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Store.bpel 2010-07-01
19:42:28 UTC (rev 291)
+++
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Store.bpel 2010-07-02
19:14:49 UTC (rev 292)
@@ -7,17 +7,17 @@
<partnerLink name="StoreToCreditAgency"
partnerLinkType="sto:StoreToCreditAgencyLT"
partnerRole="CreditAgencyRequester"/>
</partnerLinks>
<variables>
- <variable messageType="sto:BuyRequest"
name="buyRequestVar"/>
- <variable messageType="pur:CreditCheckRequest"
name="creditCheckRequestVar"/>
- <variable messageType="pur:CreditCheckOk"
name="creditCheckOkVar"/>
- <variable messageType="sto:BuyConfirmed"
name="buyConfirmedVar"/>
- <variable messageType="sto:BuyFailed"
name="buyFailedVar"/>
+ <variable messageType="sto:buyRequest"
name="buyRequestVar"/>
+ <variable messageType="pur:checkCreditRequest"
name="creditCheckRequestVar"/>
+ <variable messageType="pur:checkCreditResponse"
name="creditCheckOkVar"/>
+ <variable messageType="sto:buyResponse"
name="buyConfirmedVar"/>
+ <variable messageType="sto:BuyFailedFault"
name="buyFailedVar"/>
</variables>
<sequence>
<receive createInstance="yes" name="Receive_BuyRequest"
operation="buy" partnerLink="BuyerToStore"
portType="sto:StoreInterface" variable="buyRequestVar"/>
<scope>
<faultHandlers>
- <catch faultMessageType="pur:CreditCheckInvalid"
faultName="pur:CreditCheckFailed"
faultVariable="creditCheckInvalidVar">
+ <catch faultMessageType="pur:CreditCheckFailedFault"
faultName="pur:CreditCheckFailed"
faultVariable="creditCheckInvalidVar">
<sequence>
<reply faultName="sto:BuyFailed"
name="Send_BuyFailed" operation="buy"
partnerLink="BuyerToStore" portType="sto:StoreInterface"
variable="buyFailedVar"/>
</sequence>
Modified:
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Buyer.bpel
===================================================================
---
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Buyer.bpel 2010-07-01
19:42:28 UTC (rev 291)
+++
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Buyer.bpel 2010-07-02
19:14:49 UTC (rev 292)
@@ -5,13 +5,13 @@
<partnerLink name="BuyerToSeller"
partnerLinkType="tns:BuyerToSellerLT"
partnerRole="SellerRequester"/>
</partnerLinks>
<variables>
- <variable messageType="CreditCheckRequest"
name="creditCheckRequestVar"/>
- <variable messageType="CreditCheckOk"
name="creditCheckOkVar"/>
+ <variable messageType="tns:checkCreditRequest"
name="creditCheckRequestVar"/>
+ <variable messageType="tns:checkCreditResponse"
name="creditCheckOkVar"/>
</variables>
<sequence>
<scope>
<faultHandlers>
- <catch faultMessageType="CreditCheckInvalid"
faultName="insufficientCredit"
faultVariable="creditCheckInvalidVar">
+ <catch faultMessageType="tns:insufficientCreditFault"
faultName="tns:insufficientCredit"
faultVariable="creditCheckInvalidVar">
<sequence/>
</catch>
</faultHandlers>
Modified:
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Seller.bpel
===================================================================
---
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Seller.bpel 2010-07-01
19:42:28 UTC (rev 291)
+++
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Seller.bpel 2010-07-02
19:14:49 UTC (rev 292)
@@ -5,9 +5,9 @@
<partnerLink myRole="SellerService" name="BuyerToSeller"
partnerLinkType="tns:BuyerToSellerServiceLT"/>
</partnerLinks>
<variables>
- <variable messageType="CreditCheckRequest"
name="creditCheckRequestVar"/>
- <variable messageType="CreditCheckOk"
name="creditCheckOkVar"/>
- <variable messageType="CreditCheckInvalid"
name="creditCheckInvalidVar"/>
+ <variable messageType="tns:checkCreditRequest"
name="creditCheckRequestVar"/>
+ <variable messageType="tns:checkCreditResponse"
name="creditCheckOkVar"/>
+ <variable messageType="tns:insufficientCreditFault"
name="creditCheckInvalidVar"/>
</variables>
<sequence>
<receive createInstance="yes"
name="Receive_CreditCheckRequest" operation="checkCredit"
partnerLink="BuyerToSeller" portType="tns:SellerBehavior"
variable="creditCheckRequestVar"/>
Modified:
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker(a)Broker.scv
===================================================================
---
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker(a)Broker.scv 2010-07-01
19:42:28 UTC (rev 291)
+++
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker(a)Broker.scv 2010-07-02
19:14:49 UTC (rev 292)
@@ -6,6 +6,7 @@
getQuote(requestForQuote) from Broker to SupplierQuoteEngine;
getQuote(quote) from SupplierQuoteEngine to Broker;
}
+ ;
makeEnquiry(quoteList) from Broker to Buyer;
if {
buy(buy) from Buyer to Broker;
Modified:
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java
===================================================================
---
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java 2010-07-01
19:42:28 UTC (rev 291)
+++
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java 2010-07-02
19:14:49 UTC (rev 292)
@@ -350,6 +350,9 @@
if (InteractionUtil.isRequest(interaction)) {
qname = WSDLGeneratorUtil.getRequestMessageType(contract.getNamespace(),
interaction.getMessageSignature().getOperation());
+ } else if (InteractionPatterns.isFaultResponse(interaction)) {
+ qname = WSDLGeneratorUtil.getFaultMessageType(contract.getNamespace(),
+ InteractionPatterns.getFaultName(interaction));
} else {
qname = WSDLGeneratorUtil.getResponseMessageType(contract.getNamespace(),
interaction.getMessageSignature().getOperation());
Modified:
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Broker.bpel
===================================================================
---
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Broker.bpel 2010-07-01
19:42:28 UTC (rev 291)
+++
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Broker.bpel 2010-07-02
19:14:49 UTC (rev 292)
@@ -10,17 +10,17 @@
<partnerLink name="BrokerToSupplierTxnProcessor"
partnerLinkType="tns:BrokerToSupplierTxnProcessorLT"
partnerRole="SupplierTxnProcessorRequester"/>
</partnerLinks>
<variables>
- <variable messageType="enquiry" name="enquiryVar"/>
- <variable messageType="requestForQuote"
name="requestForQuoteVar"/>
- <variable messageType="quote" name="quoteVar"/>
- <variable messageType="quoteList"
name="quoteListVar"/>
- <variable messageType="buy" name="buyVar"/>
- <variable messageType="CreditCheckRequest"
name="creditCheckRequestVar"/>
- <variable messageType="CreditCheckOk"
name="creditCheckOkVar"/>
- <variable messageType="orderConfirmed"
name="orderConfirmedVar"/>
- <variable messageType="bookingReference"
name="bookingReferenceVar"/>
- <variable messageType="orderRejected"
name="orderRejectedVar"/>
- <variable messageType="cancel" name="cancelVar"/>
+ <variable messageType="tns:makeEnquiryRequest"
name="enquiryVar"/>
+ <variable messageType="ns1:getQuoteRequest"
name="requestForQuoteVar"/>
+ <variable messageType="ns1:getQuoteResponse"
name="quoteVar"/>
+ <variable messageType="tns:makeEnquiryResponse"
name="quoteListVar"/>
+ <variable messageType="tns:buyRequest" name="buyVar"/>
+ <variable messageType="tns:checkCreditRequest"
name="creditCheckRequestVar"/>
+ <variable messageType="tns:checkCreditResponse"
name="creditCheckOkVar"/>
+ <variable messageType="ns1:confirmRequest"
name="orderConfirmedVar"/>
+ <variable messageType="ns1:confirmResponse"
name="bookingReferenceVar"/>
+ <variable messageType="tns:rejectedFault"
name="orderRejectedVar"/>
+ <variable messageType="tns:cancelRequest"
name="cancelVar"/>
</variables>
<sequence>
<receive createInstance="yes" name="Receive_enquiry"
operation="makeEnquiry" partnerLink="BuyerToBroker"
portType="tns:BrokerBehavior" variable="enquiryVar"/>
@@ -41,7 +41,7 @@
<sequence>
<scope>
<faultHandlers>
- <catch
faultMessageType="CreditCheckInvalid" faultName="invalidCredit"
faultVariable="creditCheckInvalidVar">
+ <catch
faultMessageType="tns:invalidCreditFault"
faultName="tns:invalidCredit"
faultVariable="creditCheckInvalidVar">
<sequence>
<reply faultName="tns:rejected"
name="Send_orderRejected" operation="buy"
partnerLink="BuyerToBroker" portType="tns:BrokerBehavior"
variable="orderRejectedVar"/>
</sequence>
Modified:
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Buyer.bpel
===================================================================
---
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Buyer.bpel 2010-07-01
19:42:28 UTC (rev 291)
+++
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Buyer.bpel 2010-07-02
19:14:49 UTC (rev 292)
@@ -7,11 +7,11 @@
<partnerLink myRole="BuyerRequester" name="BuyerToBroker"
partnerLinkType="tns:BuyerToBrokerLT"
partnerRole="BrokerRequester"/>
</partnerLinks>
<variables>
- <variable messageType="enquiry" name="enquiryVar"/>
- <variable messageType="quoteList"
name="quoteListVar"/>
- <variable messageType="buy" name="buyVar"/>
- <variable messageType="bookingReference"
name="bookingReferenceVar"/>
- <variable messageType="cancel" name="cancelVar"/>
+ <variable messageType="tns:makeEnquiryRequest"
name="enquiryVar"/>
+ <variable messageType="tns:makeEnquiryResponse"
name="quoteListVar"/>
+ <variable messageType="tns:buyRequest" name="buyVar"/>
+ <variable messageType="tns:buyResponse"
name="bookingReferenceVar"/>
+ <variable messageType="tns:cancelRequest"
name="cancelVar"/>
</variables>
<sequence>
<invoke inputVariable="enquiryVar" name="Send_enquiry"
operation="makeEnquiry" partnerLink="BuyerToBroker"
portType="tns:BrokerBehavior"/>
@@ -22,7 +22,7 @@
<sequence>
<scope>
<faultHandlers>
- <catch faultMessageType="orderRejected"
faultName="rejected" faultVariable="orderRejectedVar">
+ <catch faultMessageType="tns:rejectedFault"
faultName="tns:rejected" faultVariable="orderRejectedVar">
<sequence/>
</catch>
</faultHandlers>
Modified:
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)CreditAgency.bpel
===================================================================
---
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)CreditAgency.bpel 2010-07-01
19:42:28 UTC (rev 291)
+++
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)CreditAgency.bpel 2010-07-02
19:14:49 UTC (rev 292)
@@ -7,9 +7,9 @@
<partnerLink myRole="CreditAgencyService"
name="BrokerToCreditAgency"
partnerLinkType="tns:BrokerToCreditAgencyServiceLT"/>
</partnerLinks>
<variables>
- <variable messageType="CreditCheckRequest"
name="creditCheckRequestVar"/>
- <variable messageType="CreditCheckOk"
name="creditCheckOkVar"/>
- <variable messageType="CreditCheckInvalid"
name="creditCheckInvalidVar"/>
+ <variable messageType="tns:checkCreditRequest"
name="creditCheckRequestVar"/>
+ <variable messageType="tns:checkCreditResponse"
name="creditCheckOkVar"/>
+ <variable messageType="tns:invalidCreditFault"
name="creditCheckInvalidVar"/>
</variables>
<sequence>
<pick>
Modified:
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel
===================================================================
---
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel 2010-07-01
19:42:28 UTC (rev 291)
+++
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel 2010-07-02
19:14:49 UTC (rev 292)
@@ -5,8 +5,8 @@
<partnerLink myRole="SupplierQuoteEngineService"
name="BrokerToSupplierQuoteEngine"
partnerLinkType="ns1:BrokerToSupplierQuoteEngineServiceLT"/>
</partnerLinks>
<variables>
- <variable messageType="requestForQuote"
name="requestForQuoteVar"/>
- <variable messageType="quote" name="quoteVar"/>
+ <variable messageType="ns1:getQuoteRequest"
name="requestForQuoteVar"/>
+ <variable messageType="ns1:getQuoteResponse"
name="quoteVar"/>
</variables>
<sequence>
<receive createInstance="yes"
name="Receive_requestForQuote" operation="getQuote"
partnerLink="BrokerToSupplierQuoteEngine"
portType="tns:SupplierBehavior" variable="requestForQuoteVar"/>
Modified:
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel
===================================================================
---
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel 2010-07-01
19:42:28 UTC (rev 291)
+++
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel 2010-07-02
19:14:49 UTC (rev 292)
@@ -5,8 +5,8 @@
<partnerLink myRole="SupplierTxnProcessorService"
name="BrokerToSupplierTxnProcessor"
partnerLinkType="ns2:BrokerToSupplierTxnProcessorServiceLT"/>
</partnerLinks>
<variables>
- <variable messageType="orderConfirmed"
name="orderConfirmedVar"/>
- <variable messageType="bookingReference"
name="bookingReferenceVar"/>
+ <variable messageType="ns1:confirmRequest"
name="orderConfirmedVar"/>
+ <variable messageType="ns1:confirmResponse"
name="bookingReferenceVar"/>
</variables>
<sequence>
<pick createInstance="yes">
Modified:
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Buyer.bpel
===================================================================
---
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Buyer.bpel 2010-07-01
19:42:28 UTC (rev 291)
+++
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Buyer.bpel 2010-07-02
19:14:49 UTC (rev 292)
@@ -6,13 +6,13 @@
<partnerLink name="BuyerToStore"
partnerLinkType="tns:BuyerToStoreLT"
partnerRole="StoreRequester"/>
</partnerLinks>
<variables>
- <variable messageType="sto:BuyRequest"
name="buyRequestVar"/>
- <variable messageType="sto:BuyConfirmed"
name="buyConfirmedVar"/>
+ <variable messageType="sto:buyRequest"
name="buyRequestVar"/>
+ <variable messageType="sto:buyResponse"
name="buyConfirmedVar"/>
</variables>
<sequence>
<scope>
<faultHandlers>
- <catch faultMessageType="sto:BuyFailed"
faultName="sto:BuyFailed" faultVariable="buyFailedVar">
+ <catch faultMessageType="sto:BuyFailedFault"
faultName="sto:BuyFailed" faultVariable="buyFailedVar">
<sequence/>
</catch>
</faultHandlers>
Modified:
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)CreditAgency.bpel
===================================================================
---
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)CreditAgency.bpel 2010-07-01
19:42:28 UTC (rev 291)
+++
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)CreditAgency.bpel 2010-07-02
19:14:49 UTC (rev 292)
@@ -6,9 +6,9 @@
<partnerLink myRole="CreditAgencyService"
name="StoreToCreditAgency"
partnerLinkType="pur:StoreToCreditAgencyServiceLT"/>
</partnerLinks>
<variables>
- <variable messageType="pur:CreditCheckRequest"
name="creditCheckRequestVar"/>
- <variable messageType="pur:CreditCheckOk"
name="creditCheckOkVar"/>
- <variable messageType="pur:CreditCheckInvalid"
name="creditCheckInvalidVar"/>
+ <variable messageType="pur:checkCreditRequest"
name="creditCheckRequestVar"/>
+ <variable messageType="pur:checkCreditResponse"
name="creditCheckOkVar"/>
+ <variable messageType="pur:CreditCheckFailedFault"
name="creditCheckInvalidVar"/>
</variables>
<sequence>
<receive createInstance="yes"
name="Receive_CreditCheckRequest" operation="checkCredit"
partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface"
variable="creditCheckRequestVar"/>
Modified:
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Store.bpel
===================================================================
---
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Store.bpel 2010-07-01
19:42:28 UTC (rev 291)
+++
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Store.bpel 2010-07-02
19:14:49 UTC (rev 292)
@@ -7,17 +7,17 @@
<partnerLink name="StoreToCreditAgency"
partnerLinkType="sto:StoreToCreditAgencyLT"
partnerRole="CreditAgencyRequester"/>
</partnerLinks>
<variables>
- <variable messageType="sto:BuyRequest"
name="buyRequestVar"/>
- <variable messageType="pur:CreditCheckRequest"
name="creditCheckRequestVar"/>
- <variable messageType="pur:CreditCheckOk"
name="creditCheckOkVar"/>
- <variable messageType="sto:BuyConfirmed"
name="buyConfirmedVar"/>
- <variable messageType="sto:BuyFailed"
name="buyFailedVar"/>
+ <variable messageType="sto:buyRequest"
name="buyRequestVar"/>
+ <variable messageType="pur:checkCreditRequest"
name="creditCheckRequestVar"/>
+ <variable messageType="pur:checkCreditResponse"
name="creditCheckOkVar"/>
+ <variable messageType="sto:buyResponse"
name="buyConfirmedVar"/>
+ <variable messageType="sto:BuyFailedFault"
name="buyFailedVar"/>
</variables>
<sequence>
<receive createInstance="yes" name="Receive_BuyRequest"
operation="buy" partnerLink="BuyerToStore"
portType="sto:StoreInterface" variable="buyRequestVar"/>
<scope>
<faultHandlers>
- <catch faultMessageType="pur:CreditCheckInvalid"
faultName="pur:CreditCheckFailed"
faultVariable="creditCheckInvalidVar">
+ <catch faultMessageType="pur:CreditCheckFailedFault"
faultName="pur:CreditCheckFailed"
faultVariable="creditCheckInvalidVar">
<sequence>
<reply faultName="sto:BuyFailed"
name="Send_BuyFailed" operation="buy"
partnerLink="BuyerToStore" portType="sto:StoreInterface"
variable="buyFailedVar"/>
</sequence>
Modified:
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Buyer.bpel
===================================================================
---
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Buyer.bpel 2010-07-01
19:42:28 UTC (rev 291)
+++
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Buyer.bpel 2010-07-02
19:14:49 UTC (rev 292)
@@ -5,13 +5,13 @@
<partnerLink name="BuyerToSeller"
partnerLinkType="tns:BuyerToSellerLT"
partnerRole="SellerRequester"/>
</partnerLinks>
<variables>
- <variable messageType="CreditCheckRequest"
name="creditCheckRequestVar"/>
- <variable messageType="CreditCheckOk"
name="creditCheckOkVar"/>
+ <variable messageType="tns:checkCreditRequest"
name="creditCheckRequestVar"/>
+ <variable messageType="tns:checkCreditResponse"
name="creditCheckOkVar"/>
</variables>
<sequence>
<scope>
<faultHandlers>
- <catch faultMessageType="CreditCheckInvalid"
faultName="insufficientCredit"
faultVariable="creditCheckInvalidVar">
+ <catch faultMessageType="tns:insufficientCreditFault"
faultName="tns:insufficientCredit"
faultVariable="creditCheckInvalidVar">
<sequence/>
</catch>
</faultHandlers>
Modified:
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Seller.bpel
===================================================================
---
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Seller.bpel 2010-07-01
19:42:28 UTC (rev 291)
+++
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Seller.bpel 2010-07-02
19:14:49 UTC (rev 292)
@@ -5,9 +5,9 @@
<partnerLink myRole="SellerService" name="BuyerToSeller"
partnerLinkType="tns:BuyerToSellerServiceLT"/>
</partnerLinks>
<variables>
- <variable messageType="CreditCheckRequest"
name="creditCheckRequestVar"/>
- <variable messageType="CreditCheckOk"
name="creditCheckOkVar"/>
- <variable messageType="CreditCheckInvalid"
name="creditCheckInvalidVar"/>
+ <variable messageType="tns:checkCreditRequest"
name="creditCheckRequestVar"/>
+ <variable messageType="tns:checkCreditResponse"
name="creditCheckOkVar"/>
+ <variable messageType="tns:insufficientCreditFault"
name="creditCheckInvalidVar"/>
</variables>
<sequence>
<receive createInstance="yes"
name="Receive_CreditCheckRequest" operation="checkCredit"
partnerLink="BuyerToSeller" portType="tns:SellerBehavior"
variable="creditCheckRequestVar"/>
Modified:
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker(a)Broker.scv
===================================================================
---
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker(a)Broker.scv 2010-07-01
19:42:28 UTC (rev 291)
+++
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker(a)Broker.scv 2010-07-02
19:14:49 UTC (rev 292)
@@ -6,6 +6,7 @@
getQuote(requestForQuote) from Broker to SupplierQuoteEngine;
getQuote(quote) from SupplierQuoteEngine to Broker;
}
+ ;
makeEnquiry(quoteList) from Broker to Buyer;
if {
buy(buy) from Buyer to Broker;