[savara-commits] savara SVN: r685 - in branches/experimental/2.0.x/bundles: org.savara.bpel/src/test/resources/results/bpel and 2 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Feb 17 14:59:21 EST 2011
Author: objectiser
Date: 2011-02-17 14:59:20 -0500 (Thu, 17 Feb 2011)
New Revision: 685
Modified:
branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionModelChangeRule.java
branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ESBBroker at Broker.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ESBBroker at CreditAgency.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ESBBroker at SupplierQuoteEngine.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ESBBroker at SupplierTxnProcessor.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/PolicyQuote at PolicyQuoteProcessService.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/PurchaseGoods at CreditAgency.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/PurchaseGoods at Store.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ReqRespFault at Seller.bpel
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConditionalConverterRuleImpl.java
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/PolicyQuote.spr
Log:
Fix issue with missing interface annotation for interaction found in a conditional block.
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionModelChangeRule.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionModelChangeRule.java 2011-02-17 16:51:31 UTC (rev 684)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionModelChangeRule.java 2011-02-17 19:59:20 UTC (rev 685)
@@ -346,8 +346,13 @@
} else if (InteractionPatterns.isInteractionPickPathTrigger(interaction) == false) {
act = new TReceive();
- String intfName=(String)interaction.getProperties().get("interfaceName");
+ String intfName=null;
+ Annotation intfAnn=AnnotationDefinitions.getAnnotation(interaction.getAnnotations(), AnnotationDefinitions.INTERFACE);
+ if (intfAnn != null) {
+ intfName = (String)intfAnn.getProperties().get(AnnotationDefinitions.NAME_PROPERTY);
+ }
+
if (intfName != null && intfName.trim().length() > 0) {
intfName = javax.xml.namespace.QName.valueOf(intfName).getLocalPart();
} else {
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ESBBroker at Broker.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ESBBroker at Broker.bpel 2011-02-17 16:51:31 UTC (rev 684)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ESBBroker at Broker.bpel 2011-02-17 19:59:20 UTC (rev 685)
@@ -4,7 +4,7 @@
<import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_SupplierTxnProcessor.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/>
<import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_BrokerArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Broker"/>
<partnerLinks>
- <partnerLink myRole="Broker" name="BuyerToBroker" partnerLinkType="brk:BuyerToBrokerServiceLT"/>
+ <partnerLink myRole="BrokerBehavior" name="BuyerToBroker" partnerLinkType="brk:BuyerToBrokerServiceLT"/>
<partnerLink name="BrokerToSupplierQuoteEngine" partnerLinkType="brk:BrokerToSupplierQuoteEngineLT" partnerRole="SupplierQuoteEngineRequester"/>
<partnerLink name="BrokerToCreditAgency" partnerLinkType="brk:BrokerToCreditAgencyLT" partnerRole="CreditAgencyRequester"/>
<partnerLink name="BrokerToSupplierTxnProcessor" partnerLinkType="brk:BrokerToSupplierTxnProcessorLT" partnerRole="SupplierTxnProcessorRequester"/>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ESBBroker at CreditAgency.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ESBBroker at CreditAgency.bpel 2011-02-17 16:51:31 UTC (rev 684)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ESBBroker at CreditAgency.bpel 2011-02-17 19:59:20 UTC (rev 685)
@@ -2,7 +2,7 @@
<import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/>
<import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_CreditAgencyArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/>
<partnerLinks>
- <partnerLink myRole="CreditAgency" name="BrokerToCreditAgency" partnerLinkType="cay:BrokerToCreditAgencyServiceLT"/>
+ <partnerLink myRole="CreditAgencyBehavior" name="BrokerToCreditAgency" partnerLinkType="cay:BrokerToCreditAgencyServiceLT"/>
</partnerLinks>
<variables>
<variable messageType="cay:checkCreditRequest" name="checkCreditRequestVar"/>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ESBBroker at SupplierQuoteEngine.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ESBBroker at SupplierQuoteEngine.bpel 2011-02-17 16:51:31 UTC (rev 684)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ESBBroker at SupplierQuoteEngine.bpel 2011-02-17 19:59:20 UTC (rev 685)
@@ -2,7 +2,7 @@
<import importType="http://schemas.xmlsoap.org/wsdl/" location="RequestForQuote_SupplierQuoteEngine.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/>
<import importType="http://schemas.xmlsoap.org/wsdl/" location="RequestForQuote_SupplierQuoteEngineArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/>
<partnerLinks>
- <partnerLink myRole="SupplierQuoteEngine" name="BrokerToSupplierQuoteEngine" partnerLinkType="spr:BrokerToSupplierQuoteEngineServiceLT"/>
+ <partnerLink myRole="SupplierBehavior" name="BrokerToSupplierQuoteEngine" partnerLinkType="spr:BrokerToSupplierQuoteEngineServiceLT"/>
</partnerLinks>
<variables>
<variable messageType="spr:getQuoteRequest" name="getQuoteRequestVar"/>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ESBBroker at SupplierTxnProcessor.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ESBBroker at SupplierTxnProcessor.bpel 2011-02-17 16:51:31 UTC (rev 684)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ESBBroker at SupplierTxnProcessor.bpel 2011-02-17 19:59:20 UTC (rev 685)
@@ -2,7 +2,7 @@
<import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_SupplierTxnProcessor.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/>
<import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_SupplierTxnProcessorArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/>
<partnerLinks>
- <partnerLink myRole="SupplierTxnProcessor" name="BrokerToSupplierTxnProcessor" partnerLinkType="spr:BrokerToSupplierTxnProcessorServiceLT"/>
+ <partnerLink myRole="SupplierBehavior" name="BrokerToSupplierTxnProcessor" partnerLinkType="spr:BrokerToSupplierTxnProcessorServiceLT"/>
</partnerLinks>
<variables>
<variable messageType="spr:confirmRequest" name="confirmRequestVar"/>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/PolicyQuote at PolicyQuoteProcessService.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/PolicyQuote at PolicyQuoteProcessService.bpel 2011-02-17 16:51:31 UTC (rev 684)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/PolicyQuote at PolicyQuoteProcessService.bpel 2011-02-17 19:59:20 UTC (rev 685)
@@ -8,7 +8,7 @@
<partnerLinks>
<partnerLink myRole="PolicyQuoteProcessService" name="DriverToPolicyQuoteProcessService" partnerLinkType="pps:DriverToPolicyQuoteProcessServiceServiceLT"/>
<partnerLink name="PolicyQuoteProcessServiceToDrivingRecordService" partnerLinkType="pps:PolicyQuoteProcessServiceToDrivingRecordServiceLT" partnerRole="DrivingRecordServiceRequester"/>
- <partnerLink myRole="PolicyQuoteProcessService" name="DrivingRecordServiceToPolicyQuoteProcessService" partnerLinkType="pps:DrivingRecordServiceToPolicyQuoteProcessServiceServiceLT"/>
+ <partnerLink myRole="DrivingRecordCallbackService" name="DrivingRecordServiceToPolicyQuoteProcessService" partnerLinkType="pps:DrivingRecordServiceToPolicyQuoteProcessServiceServiceLT"/>
<partnerLink name="PolicyQuoteProcessServiceToCreditCheckService" partnerLinkType="pps:PolicyQuoteProcessServiceToCreditCheckServiceLT" partnerRole="CreditCheckServiceRequester"/>
<partnerLink name="PolicyQuoteProcessServiceToPolicyQuoteCalculationService" partnerLinkType="pps:PolicyQuoteProcessServiceToPolicyQuoteCalculationServiceLT" partnerRole="PolicyQuoteCalculationServiceRequester"/>
<partnerLink name="PolicyQuoteProcessServiceToPolicyQuoteEntityService" partnerLinkType="pps:PolicyQuoteProcessServiceToPolicyQuoteEntityServiceLT" partnerRole="PolicyQuoteEntityServiceRequester"/>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/PurchaseGoods at CreditAgency.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/PurchaseGoods at CreditAgency.bpel 2011-02-17 16:51:31 UTC (rev 684)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/PurchaseGoods at CreditAgency.bpel 2011-02-17 19:59:20 UTC (rev 685)
@@ -2,7 +2,7 @@
<import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_CreditAgency.wsdl" namespace="java:org.jboss.savara.examples.purchasing"/>
<import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_CreditAgencyArtifacts.wsdl" namespace="java:org.jboss.savara.examples.purchasing"/>
<partnerLinks>
- <partnerLink myRole="CreditAgency" name="StoreToCreditAgency" partnerLinkType="pur:StoreToCreditAgencyServiceLT"/>
+ <partnerLink myRole="CreditAgencyInterface" name="StoreToCreditAgency" partnerLinkType="pur:StoreToCreditAgencyServiceLT"/>
</partnerLinks>
<variables>
<variable messageType="pur:checkCreditRequest" name="checkCreditRequestVar"/>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/PurchaseGoods at Store.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/PurchaseGoods at Store.bpel 2011-02-17 16:51:31 UTC (rev 684)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/PurchaseGoods at Store.bpel 2011-02-17 19:59:20 UTC (rev 685)
@@ -3,7 +3,7 @@
<import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_CreditAgency.wsdl" namespace="java:org.jboss.savara.examples.purchasing"/>
<import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_StoreArtifacts.wsdl" namespace="http://www.jboss.org/examples/store"/>
<partnerLinks>
- <partnerLink myRole="Store" name="BuyerToStore" partnerLinkType="sto:BuyerToStoreServiceLT"/>
+ <partnerLink myRole="StoreInterface" name="BuyerToStore" partnerLinkType="sto:BuyerToStoreServiceLT"/>
<partnerLink name="StoreToCreditAgency" partnerLinkType="sto:StoreToCreditAgencyLT" partnerRole="CreditAgencyRequester"/>
</partnerLinks>
<variables>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ReqRespFault at Seller.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ReqRespFault at Seller.bpel 2011-02-17 16:51:31 UTC (rev 684)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/resources/results/bpel/ReqRespFault at Seller.bpel 2011-02-17 19:59:20 UTC (rev 685)
@@ -2,7 +2,7 @@
<import importType="http://schemas.xmlsoap.org/wsdl/" location="ReqRespFaultProcess_Seller.wsdl" namespace="http://www.pi4soa.org/ReqRespFault/Seller"/>
<import importType="http://schemas.xmlsoap.org/wsdl/" location="ReqRespFaultProcess_SellerArtifacts.wsdl" namespace="http://www.pi4soa.org/ReqRespFault/Seller"/>
<partnerLinks>
- <partnerLink myRole="Seller" name="BuyerToSeller" partnerLinkType="slr:BuyerToSellerServiceLT"/>
+ <partnerLink myRole="SellerBehavior" name="BuyerToSeller" partnerLinkType="slr:BuyerToSellerServiceLT"/>
</partnerLinks>
<variables>
<variable messageType="slr:checkCreditRequest" name="checkCreditRequestVar"/>
Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConditionalConverterRuleImpl.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConditionalConverterRuleImpl.java 2011-02-17 16:51:31 UTC (rev 684)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConditionalConverterRuleImpl.java 2011-02-17 19:59:20 UTC (rev 685)
@@ -86,6 +86,20 @@
if (locator.getInteraction() != null &&
locator.getInteraction().getExchangeDetails().size() > 0) {
+ scannotation=new Annotation(AnnotationDefinitions.SOURCE_COMPONENT);
+
+ scannotation.getProperties().put(AnnotationDefinitions.ID_PROPERTY,
+ CDLTypeUtil.getURIFragment(locator.getInteraction()));
+ block.getAnnotations().add(scannotation);
+
+ if (locator.getInteraction().getToRoleType() != null) {
+ // TODO: Deal with interfaces that have multiple behaviours
+ Annotation annotation=new Annotation(AnnotationDefinitions.INTERFACE);
+ annotation.getProperties().put(AnnotationDefinitions.NAME_PROPERTY,
+ InteractionConverterRuleImpl.getInterfaceName(locator.getInteraction()));
+ block.getAnnotations().add(annotation);
+ }
+
// Get the first exchange details
ExchangeDetails ed=locator.getInteraction().getExchangeDetails().get(0);
Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/PolicyQuote.spr
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/PolicyQuote.spr 2011-02-17 16:51:31 UTC (rev 684)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/results/protocol/PolicyQuote.spr 2011-02-17 19:59:20 UTC (rev 685)
@@ -40,6 +40,8 @@
[[ SourceComponent(id=//@choreographies.0/@activities.3) ]]
choice {
label0():
+ [[ SourceComponent(id=//@choreographies.0/@activities.3/@activities.0/@activities.0/@activities.0) ]]
+ [[ Interface(name={http://creditagency.com/creditCheckService}CreditCheckService) ]]
[[ Correlation(request=checkCredit) ]]
checkCredit(CreditCheckRequest) from PolicyQuoteProcessService to CreditCheckService;
[[ SourceComponent(id=//@choreographies.0/@activities.3/@activities.0/@activities.0/@activities.0/@exchangeDetails.1) ]]
@@ -68,6 +70,8 @@
receivePolicyQuote(PolicyQuoteReply) from PolicyQuoteProcessService to Driver;
label1():
+ [[ SourceComponent(id=//@choreographies.0/@activities.3/@activities.1/@activities.0) ]]
+ [[ Interface(name={http://www.example.org/policyQuoteProcessService}PolicyQuoteProcessService) ]]
[[ Fault(name=policyQuoteFault) ]]
[[ Correlation(replyTo=receivePolicyQuote) ]]
receivePolicyQuote(PolicyQuoteFault) from PolicyQuoteProcessService to Driver;
More information about the savara-commits
mailing list