savara SVN: r564 - in branches/experimental/2.0.x/bundles: org.savara.bpel.tests/src/test/java/org/savara/bpel/generator and 11 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-01-09 18:22:28 -0500 (Sun, 09 Jan 2011)
New Revision: 564
Modified:
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)Broker.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)Buyer.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)CreditAgency.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)Buyer.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)CreditAgency.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)Store.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ReqRespFault(a)Buyer.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ReqRespFault(a)Seller.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/testmodels/ESBBroker.cdm
branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ChoiceModelChangeRule.java
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/InteractionPatterns.java
branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/InteractionUtil.java
branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/PropertyName.java
branches/experimental/2.0.x/bundles/org.savara.contract/META-INF/MANIFEST.MF
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/ContractGenerator.java
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractGeneratorImpl.java
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractIntrospector.java
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Contract.java
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/FaultDetails.java
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Interface.java
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/OneWayRequestMEP.java
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/RequestResponseMEP.java
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Type.java
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/TypeDefinition.java
branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/savara/contract/generator/ContractGeneratorTest.java
branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/savara/contract/generator/impl/ContractIntrospectorTest.java
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/CDMProtocolParser.java
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ChoiceConverterRuleImpl.java
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/ConverterContext.java
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConverterUtil.java
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/DefaultConverterContext.java
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/InteractionConverterRuleImpl.java
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolConverterRuleImpl.java
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolModelConverterRuleImpl.java
Log:
Update to use contract derived from protocol model.
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ChoiceModelChangeRule.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ChoiceModelChangeRule.java 2011-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ChoiceModelChangeRule.java 2011-01-09 23:22:28 UTC (rev 564)
@@ -108,18 +108,18 @@
java.util.List<When> paths=elem.getWhens();
Role role=null;
- String roleNamespace=null;
+ //String roleNamespace=null;
if (elem.enclosingProtocol() != null) {
role = elem.enclosingProtocol().getRole();
}
- Contract contract=ModelChangeUtils.getContract(context,
- elem.enclosingProtocol().getRole());
+ //Contract contract=ModelChangeUtils.getContract(context,
+ // elem.enclosingProtocol().getRole());
- if (contract != null) {
- roleNamespace = contract.getNamespace();
- }
+ //if (contract != null) {
+ // roleNamespace = contract.getNamespace();
+ //}
// Check if the 'If' construct is to handle responses
// to a preceding request being sent
@@ -169,8 +169,8 @@
TSequence subseq=null;
if (//act instanceof Interaction &&
- InteractionPatterns.isFaultResponse(path)) {
- String faultName=InteractionPatterns.getFaultName(path);
+ InteractionUtil.isFaultResponse(path)) {
+ String faultName=InteractionUtil.getFaultName(path);
Contract fromContract = ModelChangeUtils.getContract(context,
(elem.getFromRole()==null?role:elem.getFromRole()));
@@ -221,9 +221,9 @@
if (InteractionUtil.isRequest(path)) {
qname = WSDLGeneratorUtil.getRequestMessageType(fromContract.getNamespace(),
path.getMessageSignature().getOperation());
- } else if (InteractionPatterns.isFaultResponse(path)) {
+ } else if (InteractionUtil.isFaultResponse(path)) {
qname = WSDLGeneratorUtil.getFaultMessageType(fromContract.getNamespace(),
- InteractionPatterns.getFaultName(path));
+ InteractionUtil.getFaultName(path));
} else {
qname = WSDLGeneratorUtil.getResponseMessageType(fromContract.getNamespace(),
path.getMessageSignature().getOperation());
@@ -303,6 +303,8 @@
// other direction
TPartnerLink prev=
PartnerLinkUtil.getPartnerLink(bpelModel, prevPLName);
+
+ Contract contract=null;
if (InteractionUtil.isRequest(path) && prev == null) {
@@ -312,23 +314,25 @@
String plt=elem.getFromRole().getName()+"To"+role.getName()+"Service"+"LT";
- pl.setPartnerLinkType(new QName(roleNamespace, plt));
-
contract = ModelChangeUtils.getContract(context, role);
- if (contract != null && contract.getInterfaces().size() > 0) {
- Interface intf = contract.getInterfaces().iterator().next();
+ if (contract != null) {
+ pl.setPartnerLinkType(new QName(contract.getNamespace(), plt)); //roleNamespace, plt));
- portType = intf.getName();
- namespace = intf.getNamespace();
-
- /* TODO: namespace issue
- String prefix = bpelModel.addNamespace(intf.getNamespace());
-
- if (prefix != null) {
- portType = prefix+":"+portType;
+ if (contract.getInterfaces().size() > 0) {
+ Interface intf = contract.getInterfaces().iterator().next();
+
+ portType = intf.getName();
+ namespace = intf.getNamespace();
+
+ /* TODO: namespace issue
+ String prefix = bpelModel.addNamespace(intf.getNamespace());
+
+ if (prefix != null) {
+ portType = prefix+":"+portType;
+ }
+ */
}
- */
}
} else {
pl.setMyRole(role.getName()+"Requester");
@@ -337,25 +341,29 @@
String plt=role.getName()+"To"+elem.getFromRole().getName()+"Requester"+"LT";
- pl.setPartnerLinkType(new QName(roleNamespace, plt));
//portType = role.getName()+
// recv.getFromRole().getName()+"CallbackPT";
- Contract fromContract = ModelChangeUtils.getContract(context, elem.getFromRole());
- if (fromContract != null && fromContract.getInterfaces().size() > 0) {
- Interface intf = fromContract.getInterfaces().iterator().next();
-
- portType = intf.getName();
- namespace = intf.getNamespace();
-
- /* TODO: Namespace issue
- String prefix = bpelModel.addNamespace(intf.getNamespace());
-
- if (prefix != null) {
- portType = prefix+":"+portType;
+ contract = ModelChangeUtils.getContract(context, elem.getFromRole());
+
+ if (contract != null) {
+ pl.setPartnerLinkType(new QName(contract.getNamespace(), plt)); //roleNamespace, plt));
+
+ if (contract.getInterfaces().size() > 0) {
+ Interface intf = contract.getInterfaces().iterator().next();
+
+ portType = intf.getName();
+ namespace = intf.getNamespace();
+
+ /* TODO: Namespace issue
+ String prefix = bpelModel.addNamespace(intf.getNamespace());
+
+ if (prefix != null) {
+ portType = prefix+":"+portType;
+ }
+ */
}
- */
}
}
@@ -363,9 +371,9 @@
if (InteractionUtil.isRequest(path)) {
qname = WSDLGeneratorUtil.getRequestMessageType(contract.getNamespace(),
path.getMessageSignature().getOperation());
- } else if (InteractionPatterns.isFaultResponse(path)) {
+ } else if (InteractionUtil.isFaultResponse(path)) {
qname = WSDLGeneratorUtil.getFaultMessageType(contract.getNamespace(),
- InteractionPatterns.getFaultName(path));
+ InteractionUtil.getFaultName(path));
} else {
qname = WSDLGeneratorUtil.getResponseMessageType(contract.getNamespace(),
path.getMessageSignature().getOperation());
@@ -428,15 +436,26 @@
TSequence seq=new TSequence();
+ Contract contract=null;
+
+ if ((InteractionUtil.isRequest(path) && !InteractionUtil.isSend(path)) ||
+ (InteractionUtil.isResponse(path) && InteractionUtil.isSend(path))) {
+ contract = ModelChangeUtils.getContract(context, role);
+ } else if (InteractionUtil.isRequest(path)) {
+ contract = ModelChangeUtils.getContract(context, elem.getToRole());
+ } else {
+ contract = ModelChangeUtils.getContract(context, elem.getFromRole());
+ }
+
// Handle when message signature
if (InteractionUtil.isResponse(path)) {
QName qname=null;
if (InteractionUtil.isRequest(path)) {
qname = WSDLGeneratorUtil.getRequestMessageType(contract.getNamespace(),
path.getMessageSignature().getOperation());
- } else if (InteractionPatterns.isFaultResponse(path)) {
+ } else if (InteractionUtil.isFaultResponse(path)) {
qname = WSDLGeneratorUtil.getFaultMessageType(contract.getNamespace(),
- InteractionPatterns.getFaultName(path));
+ InteractionUtil.getFaultName(path));
} else {
qname = WSDLGeneratorUtil.getResponseMessageType(contract.getNamespace(),
path.getMessageSignature().getOperation());
@@ -466,12 +485,12 @@
String plt=elem.getToRole().getName()+"To"+role.getName()+"Service"+"LT";
- pl.setPartnerLinkType(new QName(roleNamespace, plt));
+ pl.setPartnerLinkType(new QName(contract.getNamespace(), plt)); //roleNamespace, plt));
//portType = role.getName()+"PT";
- if (InteractionPatterns.isFaultResponse(path)) {
- String faultName=InteractionPatterns.getFaultName(path);
+ if (InteractionUtil.isFaultResponse(path)) {
+ String faultName=InteractionUtil.getFaultName(path);
// TODO: Not sure what to do about namespace here?
reply.setFaultName(new QName(contract.getNamespace(), faultName));
@@ -515,9 +534,9 @@
if (InteractionUtil.isRequest(path)) {
qname = WSDLGeneratorUtil.getRequestMessageType(contract.getNamespace(),
path.getMessageSignature().getOperation());
- } else if (InteractionPatterns.isFaultResponse(path)) {
+ } else if (InteractionUtil.isFaultResponse(path)) {
qname = WSDLGeneratorUtil.getFaultMessageType(contract.getNamespace(),
- InteractionPatterns.getFaultName(path));
+ InteractionUtil.getFaultName(path));
} else {
qname = WSDLGeneratorUtil.getResponseMessageType(contract.getNamespace(),
path.getMessageSignature().getOperation());
@@ -547,7 +566,7 @@
String plt=role.getName()+"To"+elem.getToRole().getName()+"LT";
- pl.setPartnerLinkType(new QName(roleNamespace, plt));
+ pl.setPartnerLinkType(new QName(contract.getNamespace(), plt)); //roleNamespace, plt));
//portType = interaction.getToRole().getName()+"PT";
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-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionModelChangeRule.java 2011-01-09 23:22:28 UTC (rev 564)
@@ -122,17 +122,29 @@
//String mainPrefix=null;
- Contract contract=ModelChangeUtils.getContract(context,
- interaction.enclosingProtocol().getRole());
+ //Contract contract=ModelChangeUtils.getContract(context,
+ // interaction.enclosingProtocol().getRole());
+ Contract contract=null;
+
+ if ((InteractionUtil.isRequest(interaction) && !InteractionUtil.isSend(interaction)) ||
+ (InteractionUtil.isResponse(interaction) && InteractionUtil.isSend(interaction))) {
+ contract = ModelChangeUtils.getContract(context, role);
+ } else if (InteractionUtil.isRequest(interaction)) {
+ contract = ModelChangeUtils.getContract(context, interaction.getToRoles().get(0));
+ } else {
+ contract = ModelChangeUtils.getContract(context, interaction.getFromRole());
+ }
+
/* TODO: Namespace issue
if (contract != null) {
mainPrefix = bpelModel.getBPELProcess().addNamespace(contract.getNamespace());
}
*/
- if (contract != null) {
- roleNamespace = contract.getNamespace();
+ Contract roleContract=ModelChangeUtils.getContract(context, role);
+ if (roleContract != null) {
+ roleNamespace = roleContract.getNamespace();
}
Role roleType=null;
@@ -153,7 +165,7 @@
}
if (roleType != null) {
- contract = ModelChangeUtils.getContract(context, roleType);
+ //contract = ModelChangeUtils.getContract(context, roleType);
if (contract != null) {
if (interaction.getProperties().containsKey(INTERFACE_NAME)) {
@@ -189,9 +201,9 @@
if (InteractionUtil.isRequest(interaction)) {
qname = WSDLGeneratorUtil.getRequestMessageType(contract.getNamespace(),
interaction.getMessageSignature().getOperation());
- } else if (InteractionPatterns.isFaultResponse(interaction)) {
+ } else if (InteractionUtil.isFaultResponse(interaction)) {
qname = WSDLGeneratorUtil.getFaultMessageType(contract.getNamespace(),
- InteractionPatterns.getFaultName(interaction));
+ InteractionUtil.getFaultName(interaction));
} else {
qname = WSDLGeneratorUtil.getResponseMessageType(contract.getNamespace(),
interaction.getMessageSignature().getOperation());
@@ -282,8 +294,8 @@
//portType = role.getName()+"PT";
- if (InteractionPatterns.isFaultResponse(interaction)) {
- String faultName=InteractionPatterns.getFaultName(interaction);
+ if (InteractionUtil.isFaultResponse(interaction)) {
+ String faultName=InteractionUtil.getFaultName(interaction);
// Find namespace prefix
//if (intf != null) {
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionPatterns.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionPatterns.java 2011-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionPatterns.java 2011-01-09 23:22:28 UTC (rev 564)
@@ -328,40 +328,6 @@
return(getRequestForResponseInFaultHandler(interaction) != null);
}
- public static boolean isFaultResponse(Interaction interaction) {
- boolean ret=false;
-
- if (InteractionUtil.isRequest(interaction) == false &&
- interaction.getMessageSignature().getProperties().
- keySet().contains(PropertyName.FAULT_NAME)) {
- ret = true;
- }
-
- return(ret);
- }
-
- public static boolean isFaultResponse(When interaction) {
- boolean ret=false;
-
- if (InteractionUtil.isRequest(interaction) == false &&
- interaction.getMessageSignature().getProperties().
- keySet().contains(PropertyName.FAULT_NAME)) {
- ret = true;
- }
-
- return(ret);
- }
-
- public static String getFaultName(Interaction interaction) {
- return((String)interaction.
- getMessageSignature().getProperties().get(PropertyName.FAULT_NAME));
- }
-
- public static String getFaultName(When interaction) {
- return((String)interaction.
- getMessageSignature().getProperties().get(PropertyName.FAULT_NAME));
- }
-
/*
public static String getMessageTypeLocalPart(Interaction interaction) {
return((String)interaction.
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java 2011-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java 2011-01-09 23:22:28 UTC (rev 564)
@@ -26,7 +26,9 @@
import org.savara.bpel.util.BPELModelUtil;
import org.savara.common.model.generator.ModelGenerator;
import org.savara.common.model.util.PropertyName;
+import org.savara.common.util.ScribbleServices;
import org.scribble.common.logging.CachedJournal;
+import org.scribble.protocol.model.Role;
import org.savara.pi4soa.cdm.parser.CDMProtocolParser;
public class GeneratorTest {
@@ -34,7 +36,7 @@
public static Test suite() {
TestSuite suite = new TestSuite("Choreography->BPEL Generator Tests");
- suite.addTest(new ChoreographyToBPELTester("ESBBroker", "Buyer"));
+ suite.addTest(new ChoreographyToBPELTester("ESBBroker", "Buyer"));
suite.addTest(new ChoreographyToBPELTester("ESBBroker", "SupplierTxnProcessor"));
suite.addTest(new ChoreographyToBPELTester("ESBBroker", "CreditAgency"));
suite.addTest(new ChoreographyToBPELTester("ESBBroker", "Broker"));
@@ -46,7 +48,7 @@
suite.addTest(new ChoreographyToBPELTester("ReqRespFault", "Buyer"));
suite.addTest(new ChoreographyToBPELTester("ReqRespFault", "Seller"));
-
+
return suite;
}
@@ -89,6 +91,11 @@
* @param result The test result
*/
public void run(TestResult result) {
+ // Setup scribble services
+ ScribbleServices.setProtocolProjector(
+ new org.scribble.protocol.projection.impl.ProtocolProjectorImpl());
+
+ // Run test
result.startTest(this);
String filename="generator/testmodels/"+m_name+".cdm";
@@ -159,6 +166,8 @@
}
*/
+ java.util.List<Role> projectedRoles=projected.getRoles();
+
ModelGenerator generator=new ProtocolToBPELModelGenerator();
//defn = projected.getProtocol();
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)Broker.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)Broker.bpel 2011-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)Broker.bpel 2011-01-09 23:22:28 UTC (rev 564)
@@ -2,7 +2,7 @@
<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" targetNamespace="http://www.pi4soa.org/ESBBroker/Broker" name="ESBBrokerProcess_Broker">
<import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Broker.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Broker"/>
<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_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/>
+ <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" partnerLinkType="brk:BuyerToBrokerServiceLT" name="BuyerToBroker"/>
@@ -25,37 +25,37 @@
<variable messageType="brk:cancelRequest" name="cancelRequestVar"/>
</variables>
<sequence>
- <receive createInstance="yes" variable="makeEnquiryRequestVar" operation="makeEnquiry" portType="brk:BrokerBehavior" partnerLink="BuyerToBroker" name="Receive_enquiry"/>
+ <receive createInstance="yes" variable="makeEnquiryRequestVar" operation="makeEnquiry" portType="brk:Broker" partnerLink="BuyerToBroker" name="Receive_enquiry"/>
<while>
<sequence>
<scope>
<sequence>
- <invoke outputVariable="getQuoteResponseVar" inputVariable="getQuoteRequestVar" operation="getQuote" portType="spr:SupplierBehavior" partnerLink="BrokerToSupplierQuoteEngine" name="Send_requestForQuote"/>
+ <invoke outputVariable="getQuoteResponseVar" inputVariable="getQuoteRequestVar" operation="getQuote" portType="spr:SupplierQuoteEngine" partnerLink="BrokerToSupplierQuoteEngine" name="Send_requestForQuote"/>
</sequence>
</scope>
</sequence>
</while>
- <reply variable="makeEnquiryResponseVar" operation="makeEnquiry" portType="brk:BrokerBehavior" partnerLink="BuyerToBroker" name="Send_quoteList"/>
+ <reply variable="makeEnquiryResponseVar" operation="makeEnquiry" portType="brk:Broker" partnerLink="BuyerToBroker" name="Send_quoteList"/>
<pick>
- <onMessage variable="buyRequestVar" operation="buy" portType="brk:BrokerBehavior" partnerLink="BuyerToBroker">
+ <onMessage variable="buyRequestVar" operation="buy" portType="brk:Broker" partnerLink="BuyerToBroker">
<sequence>
<scope>
<faultHandlers>
<catch faultMessageType="cay:invalidCreditFault" faultVariable="invalidCreditFaultVar" faultName="cay:invalidCredit">
<sequence>
- <reply faultName="brk:rejected" variable="rejectedFaultVar" operation="buy" portType="brk:BrokerBehavior" partnerLink="BuyerToBroker" name="Send_orderRejected"/>
+ <reply faultName="brk:rejected" variable="rejectedFaultVar" operation="buy" portType="brk:Broker" partnerLink="BuyerToBroker" name="Send_orderRejected"/>
</sequence>
</catch>
</faultHandlers>
<sequence>
- <invoke outputVariable="checkCreditResponseVar" inputVariable="checkCreditRequestVar" operation="checkCredit" portType="cay:CreditAgencyBehavior" partnerLink="BrokerToCreditAgency" name="Send_CreditCheckRequest"/>
- <invoke outputVariable="confirmResponseVar" inputVariable="confirmRequestVar" operation="confirm" portType="spr:SupplierBehavior" partnerLink="BrokerToSupplierTxnProcessor" name="Send_orderConfirmed"/>
- <reply variable="buyResponseVar" operation="buy" portType="brk:BrokerBehavior" partnerLink="BuyerToBroker" name="Send_bookingReference"/>
+ <invoke outputVariable="checkCreditResponseVar" inputVariable="checkCreditRequestVar" operation="checkCredit" portType="cay:CreditAgency" partnerLink="BrokerToCreditAgency" name="Send_CreditCheckRequest"/>
+ <invoke outputVariable="confirmResponseVar" inputVariable="confirmRequestVar" operation="confirm" portType="spr:SupplierTxnProcessor" partnerLink="BrokerToSupplierTxnProcessor" name="Send_orderConfirmed"/>
+ <reply variable="buyResponseVar" operation="buy" portType="brk:Broker" partnerLink="BuyerToBroker" name="Send_bookingReference"/>
</sequence>
</scope>
</sequence>
</onMessage>
- <onMessage variable="cancelRequestVar" operation="cancel" portType="brk:BrokerBehavior" partnerLink="BuyerToBroker">
+ <onMessage variable="cancelRequestVar" operation="cancel" portType="brk:Broker" partnerLink="BuyerToBroker">
<sequence/>
</onMessage>
</pick>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)Buyer.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)Buyer.bpel 2011-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)Buyer.bpel 2011-01-09 23:22:28 UTC (rev 564)
@@ -2,7 +2,7 @@
<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" targetNamespace="http://www.pi4soa.org/ESBBroker/Buyer" name="ESBBrokerProcess_Buyer">
<import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Broker.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Broker"/>
<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_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/>
+ <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_BuyerArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Buyer"/>
<partnerLinks>
<partnerLink partnerRole="BrokerRequester" partnerLinkType="byr:BuyerToBrokerLT" name="BuyerToBroker"/>
@@ -10,12 +10,12 @@
<variables>
<variable messageType="brk:makeEnquiryRequest" name="makeEnquiryRequestVar"/>
<variable messageType="brk:makeEnquiryResponse" name="makeEnquiryResponseVar"/>
- <variable messageType="byr:buyRequest" name="buyRequestVar"/>
+ <variable messageType="brk:buyRequest" name="buyRequestVar"/>
<variable messageType="brk:buyResponse" name="buyResponseVar"/>
- <variable messageType="byr:cancelRequest" name="cancelRequestVar"/>
+ <variable messageType="brk:cancelRequest" name="cancelRequestVar"/>
</variables>
<sequence>
- <invoke outputVariable="makeEnquiryResponseVar" inputVariable="makeEnquiryRequestVar" operation="makeEnquiry" portType="brk:BrokerBehavior" partnerLink="BuyerToBroker" name="Send_enquiry"/>
+ <invoke outputVariable="makeEnquiryResponseVar" inputVariable="makeEnquiryRequestVar" operation="makeEnquiry" portType="brk:Broker" partnerLink="BuyerToBroker" name="Send_enquiry"/>
<if>
<sequence>
<scope>
@@ -25,13 +25,13 @@
</catch>
</faultHandlers>
<sequence>
- <invoke outputVariable="buyResponseVar" inputVariable="buyRequestVar" operation="buy" portType="byr:BuyerBehavior" partnerLink="BuyerToBroker" name="Send_buy"/>
+ <invoke outputVariable="buyResponseVar" inputVariable="buyRequestVar" operation="buy" portType="brk:Broker" partnerLink="BuyerToBroker" name="Send_buy"/>
</sequence>
</scope>
</sequence>
<else>
<sequence>
- <invoke inputVariable="cancelRequestVar" operation="cancel" portType="byr:BuyerBehavior" partnerLink="BuyerToBroker" name="Send_cancel"/>
+ <invoke inputVariable="cancelRequestVar" operation="cancel" portType="brk:Broker" partnerLink="BuyerToBroker" name="Send_cancel"/>
</sequence>
</else>
</if>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)CreditAgency.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)CreditAgency.bpel 2011-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)CreditAgency.bpel 2011-01-09 23:22:28 UTC (rev 564)
@@ -2,7 +2,6 @@
<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" targetNamespace="http://www.pi4soa.org/ESBBroker/CreditAgency" name="ESBBrokerProcess_CreditAgency">
<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_Broker.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Broker"/>
- <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/>
<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_CreditAgencyArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/>
<partnerLinks>
@@ -14,14 +13,14 @@
<variable messageType="cay:invalidCreditFault" name="invalidCreditFaultVar"/>
</variables>
<sequence>
- <receive createInstance="yes" variable="checkCreditRequestVar" operation="checkCredit" portType="cay:CreditAgencyBehavior" partnerLink="BrokerToCreditAgency" name="Receive_CreditCheckRequest"/>
+ <receive createInstance="yes" variable="checkCreditRequestVar" operation="checkCredit" portType="cay:CreditAgency" partnerLink="BrokerToCreditAgency" name="Receive_CreditCheckRequest"/>
<if>
<sequence>
- <reply variable="checkCreditResponseVar" operation="checkCredit" portType="cay:CreditAgencyBehavior" partnerLink="BrokerToCreditAgency" name="Send_CreditCheckOk"/>
+ <reply variable="checkCreditResponseVar" operation="checkCredit" portType="cay:CreditAgency" partnerLink="BrokerToCreditAgency" name="Send_CreditCheckOk"/>
</sequence>
<else>
<sequence>
- <reply faultName="cay:invalidCredit" variable="invalidCreditFaultVar" operation="checkCredit" portType="cay:CreditAgencyBehavior" partnerLink="BrokerToCreditAgency" name="Send_CreditCheckInvalid"/>
+ <reply faultName="cay:invalidCredit" variable="invalidCreditFaultVar" operation="checkCredit" portType="cay:CreditAgency" partnerLink="BrokerToCreditAgency" name="Send_CreditCheckInvalid"/>
</sequence>
</else>
</if>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel 2011-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel 2011-01-09 23:22:28 UTC (rev 564)
@@ -10,7 +10,7 @@
<variable messageType="spr:getQuoteResponse" name="getQuoteResponseVar"/>
</variables>
<sequence>
- <receive createInstance="yes" variable="getQuoteRequestVar" operation="getQuote" portType="spr:SupplierBehavior" partnerLink="BrokerToSupplierQuoteEngine" name="Receive_requestForQuote"/>
- <reply variable="getQuoteResponseVar" operation="getQuote" portType="spr:SupplierBehavior" partnerLink="BrokerToSupplierQuoteEngine" name="Send_quote"/>
+ <receive createInstance="yes" variable="getQuoteRequestVar" operation="getQuote" portType="spr:SupplierQuoteEngine" partnerLink="BrokerToSupplierQuoteEngine" name="Receive_requestForQuote"/>
+ <reply variable="getQuoteResponseVar" operation="getQuote" portType="spr:SupplierQuoteEngine" partnerLink="BrokerToSupplierQuoteEngine" name="Send_quote"/>
</sequence>
</process>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel 2011-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel 2011-01-09 23:22:28 UTC (rev 564)
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier" name="CompleteTransaction_SupplierTxnProcessor">
- <import importType="http://schemas.xmlsoap.org/wsdl/" location="CompleteTransaction_SupplierTxnProcessor.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/>
- <import importType="http://schemas.xmlsoap.org/wsdl/" location="CompleteTransaction_SupplierTxnProcessorArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/>
+<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier" name="ESBBrokerProcess_SupplierTxnProcessor">
+ <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_Broker.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Broker"/>
+ <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_SupplierTxnProcessorArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/>
<partnerLinks>
<partnerLink myRole="SupplierTxnProcessor" partnerLinkType="spr:BrokerToSupplierTxnProcessorServiceLT" name="BrokerToSupplierTxnProcessor"/>
</partnerLinks>
@@ -10,7 +12,7 @@
<variable messageType="spr:confirmResponse" name="confirmResponseVar"/>
</variables>
<sequence>
- <receive createInstance="yes" variable="confirmRequestVar" operation="confirm" portType="spr:SupplierBehavior" partnerLink="BrokerToSupplierTxnProcessor" name="Receive_orderConfirmed"/>
- <reply variable="confirmResponseVar" operation="confirm" portType="spr:SupplierBehavior" partnerLink="BrokerToSupplierTxnProcessor" name="Send_bookingReference"/>
+ <receive createInstance="yes" variable="confirmRequestVar" operation="confirm" portType="spr:SupplierTxnProcessor" partnerLink="BrokerToSupplierTxnProcessor" name="Receive_orderConfirmed"/>
+ <reply variable="confirmResponseVar" operation="confirm" portType="spr:SupplierTxnProcessor" partnerLink="BrokerToSupplierTxnProcessor" name="Send_bookingReference"/>
</sequence>
</process>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)Buyer.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)Buyer.bpel 2011-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)Buyer.bpel 2011-01-09 23:22:28 UTC (rev 564)
@@ -18,7 +18,7 @@
</catch>
</faultHandlers>
<sequence>
- <invoke outputVariable="buyResponseVar" inputVariable="buyRequestVar" operation="buy" portType="sto:StoreInterface" partnerLink="BuyerToStore" name="Send_BuyRequest"/>
+ <invoke outputVariable="buyResponseVar" inputVariable="buyRequestVar" operation="buy" portType="sto:Store" partnerLink="BuyerToStore" name="Send_BuyRequest"/>
</sequence>
</scope>
</sequence>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)CreditAgency.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)CreditAgency.bpel 2011-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)CreditAgency.bpel 2011-01-09 23:22:28 UTC (rev 564)
@@ -12,14 +12,14 @@
<variable messageType="pur:CreditCheckFailedFault" name="CreditCheckFailedFaultVar"/>
</variables>
<sequence>
- <receive createInstance="yes" variable="checkCreditRequestVar" operation="checkCredit" portType="pur:CreditAgencyInterface" partnerLink="StoreToCreditAgency" name="Receive_CreditCheckRequest"/>
+ <receive createInstance="yes" variable="checkCreditRequestVar" operation="checkCredit" portType="pur:CreditAgency" partnerLink="StoreToCreditAgency" name="Receive_CreditCheckRequest"/>
<if>
<sequence>
- <reply variable="checkCreditResponseVar" operation="checkCredit" portType="pur:CreditAgencyInterface" partnerLink="StoreToCreditAgency" name="Send_CreditCheckOk"/>
+ <reply variable="checkCreditResponseVar" operation="checkCredit" portType="pur:CreditAgency" partnerLink="StoreToCreditAgency" name="Send_CreditCheckOk"/>
</sequence>
<else>
<sequence>
- <reply faultName="pur:CreditCheckFailed" variable="CreditCheckFailedFaultVar" operation="checkCredit" portType="pur:CreditAgencyInterface" partnerLink="StoreToCreditAgency" name="Send_CreditCheckInvalid"/>
+ <reply faultName="pur:CreditCheckFailed" variable="CreditCheckFailedFaultVar" operation="checkCredit" portType="pur:CreditAgency" partnerLink="StoreToCreditAgency" name="Send_CreditCheckInvalid"/>
</sequence>
</else>
</if>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)Store.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)Store.bpel 2011-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)Store.bpel 2011-01-09 23:22:28 UTC (rev 564)
@@ -15,18 +15,18 @@
<variable messageType="sto:BuyFailedFault" name="BuyFailedFaultVar"/>
</variables>
<sequence>
- <receive createInstance="yes" variable="buyRequestVar" operation="buy" portType="sto:StoreInterface" partnerLink="BuyerToStore" name="Receive_BuyRequest"/>
+ <receive createInstance="yes" variable="buyRequestVar" operation="buy" portType="sto:Store" partnerLink="BuyerToStore" name="Receive_BuyRequest"/>
<scope>
<faultHandlers>
<catch faultMessageType="pur:CreditCheckFailedFault" faultVariable="CreditCheckFailedFaultVar" faultName="pur:CreditCheckFailed">
<sequence>
- <reply faultName="sto:BuyFailed" variable="BuyFailedFaultVar" operation="buy" portType="sto:StoreInterface" partnerLink="BuyerToStore" name="Send_BuyFailed"/>
+ <reply faultName="sto:BuyFailed" variable="BuyFailedFaultVar" operation="buy" portType="sto:Store" partnerLink="BuyerToStore" name="Send_BuyFailed"/>
</sequence>
</catch>
</faultHandlers>
<sequence>
- <invoke outputVariable="checkCreditResponseVar" inputVariable="checkCreditRequestVar" operation="checkCredit" portType="pur:CreditAgencyInterface" partnerLink="StoreToCreditAgency" name="Send_CreditCheckRequest"/>
- <reply variable="buyResponseVar" operation="buy" portType="sto:StoreInterface" partnerLink="BuyerToStore" name="Send_BuyConfirmed"/>
+ <invoke outputVariable="checkCreditResponseVar" inputVariable="checkCreditRequestVar" operation="checkCredit" portType="pur:CreditAgency" partnerLink="StoreToCreditAgency" name="Send_CreditCheckRequest"/>
+ <reply variable="buyResponseVar" operation="buy" portType="sto:Store" partnerLink="BuyerToStore" name="Send_BuyConfirmed"/>
</sequence>
</scope>
</sequence>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ReqRespFault(a)Buyer.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ReqRespFault(a)Buyer.bpel 2011-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ReqRespFault(a)Buyer.bpel 2011-01-09 23:22:28 UTC (rev 564)
@@ -17,7 +17,7 @@
</catch>
</faultHandlers>
<sequence>
- <invoke outputVariable="checkCreditResponseVar" inputVariable="checkCreditRequestVar" operation="checkCredit" portType="slr:SellerBehavior" partnerLink="BuyerToSeller" name="Send_CreditCheckRequest"/>
+ <invoke outputVariable="checkCreditResponseVar" inputVariable="checkCreditRequestVar" operation="checkCredit" portType="slr:Seller" partnerLink="BuyerToSeller" name="Send_CreditCheckRequest"/>
</sequence>
</scope>
</sequence>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ReqRespFault(a)Seller.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ReqRespFault(a)Seller.bpel 2011-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ReqRespFault(a)Seller.bpel 2011-01-09 23:22:28 UTC (rev 564)
@@ -11,14 +11,14 @@
<variable messageType="slr:insufficientCreditFault" name="insufficientCreditFaultVar"/>
</variables>
<sequence>
- <receive createInstance="yes" variable="checkCreditRequestVar" operation="checkCredit" portType="slr:SellerBehavior" partnerLink="BuyerToSeller" name="Receive_CreditCheckRequest"/>
+ <receive createInstance="yes" variable="checkCreditRequestVar" operation="checkCredit" portType="slr:Seller" partnerLink="BuyerToSeller" name="Receive_CreditCheckRequest"/>
<if>
<sequence>
- <reply variable="checkCreditResponseVar" operation="checkCredit" portType="slr:SellerBehavior" partnerLink="BuyerToSeller" name="Send_CreditCheckOk"/>
+ <reply variable="checkCreditResponseVar" operation="checkCredit" portType="slr:Seller" partnerLink="BuyerToSeller" name="Send_CreditCheckOk"/>
</sequence>
<else>
<sequence>
- <reply faultName="slr:insufficientCredit" variable="insufficientCreditFaultVar" operation="checkCredit" portType="slr:SellerBehavior" partnerLink="BuyerToSeller" name="Send_CreditCheckInvalid"/>
+ <reply faultName="slr:insufficientCredit" variable="insufficientCreditFaultVar" operation="checkCredit" portType="slr:Seller" partnerLink="BuyerToSeller" name="Send_CreditCheckInvalid"/>
</sequence>
</else>
</if>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/testmodels/ESBBroker.cdm
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/testmodels/ESBBroker.cdm 2011-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/testmodels/ESBBroker.cdm 2011-01-09 23:22:28 UTC (rev 564)
@@ -54,7 +54,7 @@
</typeDefinitions>
<choreographies description="Choreography flow for the ESBBroker process" name="ESBBrokerProcess" root="true">
<enclosedChoreographies name="CompleteTransaction">
- <participantDefinitions name="SupplierTxnProcessor" roleTypes="//@typeDefinitions/(a)roleTypes.3">
+ <participantDefinitions name="spr:SupplierTxnProcessor" roleTypes="//@typeDefinitions/(a)roleTypes.3">
<semanticAnnotations annotation="overlord.cdl.samples.LoanBroker@SupplierTxnProcessor" name="conversationType"/>
</participantDefinitions>
<variableDefinitions description="Channel to facilitate interaction to Broker" name="BrokerChannel" type="//@typeDefinitions/(a)channelTypes.0" free="true" roleTypes="//@typeDefinitions/(a)roleTypes.0 //@typeDefinitions/(a)roleTypes.1"/>
@@ -90,7 +90,7 @@
</activities>
</enclosedChoreographies>
<enclosedChoreographies name="RequestForQuote">
- <participantDefinitions name="SupplierQuoteEngine" roleTypes="//@typeDefinitions/(a)roleTypes.3">
+ <participantDefinitions name="spr:SupplierQuoteEngine" roleTypes="//@typeDefinitions/(a)roleTypes.3">
<semanticAnnotations annotation="overlord.cdl.samples.LoanBroker@SupplierQuoteEngine" name="conversationType"/>
</participantDefinitions>
<variableDefinitions description="Channel to facilitate interaction to Supplier" name="SupplierChannel" type="//@typeDefinitions/(a)channelTypes.2"/>
Modified: branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/InteractionUtil.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/InteractionUtil.java 2011-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/InteractionUtil.java 2011-01-09 23:22:28 UTC (rev 564)
@@ -17,8 +17,6 @@
*/
package org.savara.common.model.util;
-import java.util.logging.Logger;
-
import org.scribble.protocol.model.*;
/**
@@ -26,8 +24,6 @@
*/
public class InteractionUtil {
- private static Logger logger = Logger.getLogger(InteractionUtil.class.getName());
-
/**
* This method returns the name associated with the interaction.
*
@@ -212,4 +208,66 @@
return(ret);
}
+ /**
+ * This method determines if the supplied interaction is a fault
+ * response.
+ *
+ * @param interaction The interaction
+ * @return Whether the interaction is a fault response
+ */
+ public static boolean isFaultResponse(Interaction interaction) {
+ boolean ret=false;
+
+ if (isResponse(interaction) &&
+ interaction.getMessageSignature().getProperties().
+ keySet().contains(PropertyName.FAULT_NAME)) {
+ ret = true;
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method determines if the supplied interaction is a fault
+ * response.
+ *
+ * @param interaction The interaction
+ * @return Whether the interaction is a fault response
+ */
+ public static boolean isFaultResponse(When interaction) {
+ boolean ret=false;
+
+ if (InteractionUtil.isResponse(interaction) &&
+ interaction.getMessageSignature().getProperties().
+ keySet().contains(PropertyName.FAULT_NAME)) {
+ ret = true;
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method returns the fault name associated with the supplied
+ * interaction.
+ *
+ * @param interaction The interaction
+ * @return The fault name, or null if not found
+ */
+ public static String getFaultName(Interaction interaction) {
+ return((String)interaction.
+ getMessageSignature().getProperties().get(PropertyName.FAULT_NAME));
+ }
+
+ /**
+ * This method returns the fault name associated with the supplied
+ * interaction.
+ *
+ * @param interaction The interaction
+ * @return The fault name, or null if not found
+ */
+ public static String getFaultName(When interaction) {
+ return((String)interaction.
+ getMessageSignature().getProperties().get(PropertyName.FAULT_NAME));
+ }
+
}
Modified: branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/PropertyName.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/PropertyName.java 2011-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/PropertyName.java 2011-01-09 23:22:28 UTC (rev 564)
@@ -23,7 +23,9 @@
public static final String SCHEMA_LOCATIONS="SchemaLocations";
- public static final String MESSAGE_TYPE = "MessageType";
+ public static final String NAMESPACE = "Namespace";
+
+ public static final String DATA_TYPE = "DataType";
public static final String INTERFACE_NAME = "InterfaceName";
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/META-INF/MANIFEST.MF 2011-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/META-INF/MANIFEST.MF 2011-01-09 23:22:28 UTC (rev 564)
@@ -10,4 +10,5 @@
org.osgi.framework
Require-Bundle: org.scribble.common,
org.savara.common
-Export-Package: org.savara.contract.model
+Export-Package: org.savara.contract.generator,
+ org.savara.contract.model
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/ContractGenerator.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/ContractGenerator.java 2011-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/ContractGenerator.java 2011-01-09 23:22:28 UTC (rev 564)
@@ -18,7 +18,9 @@
package org.savara.contract.generator;
import org.savara.contract.model.Contract;
+import org.scribble.common.logging.Journal;
import org.scribble.protocol.model.Protocol;
+import org.scribble.protocol.model.ProtocolModel;
/**
* This interface represents the capability that generates a contract
@@ -28,12 +30,24 @@
public interface ContractGenerator {
/**
+ * This method creates contracts for the roles associated with the
+ * supplied protocol model and associates them with the relevant
+ * roles.
+ *
+ * @param pm The protocol model
+ * @param journal The journal
+ * @throws IllegalArgumentException
+ */
+ public void generate(ProtocolModel pm, Journal journal) throws IllegalArgumentException;
+
+ /**
* This method generates a contract associated with a supplied located
* protocol.
*
* @param cm The protocol
+ * @param journal The journal
* @return The contract
*/
- public Contract generate(Protocol cm) throws IllegalArgumentException;
+ public Contract generate(Protocol cm, Journal journal) throws IllegalArgumentException;
}
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractGeneratorImpl.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractGeneratorImpl.java 2011-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractGeneratorImpl.java 2011-01-09 23:22:28 UTC (rev 564)
@@ -19,9 +19,15 @@
import java.text.MessageFormat;
+import org.savara.common.util.ScribbleServices;
import org.savara.contract.model.Contract;
import org.savara.contract.generator.ContractGenerator;
+import org.scribble.common.logging.CachedJournal;
+import org.scribble.common.logging.Journal;
import org.scribble.protocol.model.Protocol;
+import org.scribble.protocol.model.ProtocolModel;
+import org.scribble.protocol.model.Role;
+import org.scribble.protocol.model.RoleList;
/**
* This class generates a contract from a protocol defining the behaviour of
@@ -31,13 +37,51 @@
public class ContractGeneratorImpl implements ContractGenerator {
/**
+ * This method creates contracts for the roles associated with the
+ * supplied protocol model and associates them with the relevant
+ * roles.
+ *
+ * @param pm The protocol model
+ * @param journal The journal
+ * @throws IllegalArgumentException
+ */
+ public void generate(ProtocolModel pm, Journal journal) throws IllegalArgumentException {
+ java.util.List<Role> roles=pm.getRoles();
+
+ for (Role r : roles) {
+ ProtocolModel lm=ScribbleServices.getProtocolProjector().project(pm, r, journal);
+
+ if (lm != null) {
+ Contract c=generate(lm.getProtocol(), journal);
+
+ if (c != null) {
+ r.getProperties().put(Contract.class.getName(), c);
+
+ /*
+ // Find role definition in local projection
+ java.util.List<Role> localRoles=lm.getRoles();
+
+ for (Role lr : localRoles) {
+ if (lr.getName().equals(r.getName())) {
+ lr.getProperties().put(Contract.class.getName(), c);
+ break;
+ }
+ }
+ */
+ }
+ }
+ }
+ }
+
+ /**
* This method generates a contract associated with a supplied located
* protocol.
*
* @param cm The protocol
+ * @param journal The journal
* @return The contract
*/
- public Contract generate(Protocol cm) throws IllegalArgumentException {
+ public Contract generate(Protocol cm, Journal journal) throws IllegalArgumentException {
// Check parameters
if (cm == null) {
@@ -53,7 +97,7 @@
getString("SAVARAPC-00002"), (Object)null));
}
- ContractIntrospector introspector=new ContractIntrospector(cm);
+ ContractIntrospector introspector=new ContractIntrospector(cm, journal);
introspector.process();
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractIntrospector.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractIntrospector.java 2011-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractIntrospector.java 2011-01-09 23:22:28 UTC (rev 564)
@@ -27,19 +27,23 @@
import org.savara.common.model.util.InteractionUtil;
import org.savara.common.model.util.PropertyName;
import org.savara.contract.model.Contract;
+import org.savara.contract.model.FaultDetails;
import org.savara.contract.model.Interface;
import org.savara.contract.model.MessageExchangePattern;
import org.savara.contract.model.OneWayRequestMEP;
import org.savara.contract.model.RequestResponseMEP;
import org.savara.contract.model.Type;
import org.savara.contract.model.TypeDefinition;
+import org.scribble.common.logging.Journal;
import org.scribble.protocol.model.AbstractModelObjectVisitor;
+import org.scribble.protocol.model.Choice;
import org.scribble.protocol.model.Protocol;
import org.scribble.protocol.model.Interaction;
import org.scribble.protocol.model.Run;
import org.scribble.protocol.model.ModelObject;
import org.scribble.protocol.model.Role;
import org.scribble.protocol.model.TypeReference;
+import org.scribble.protocol.model.When;
/**
* This class examines a protocol to determine the contract that represents
@@ -52,6 +56,7 @@
private java.util.Set<Protocol> m_processedProtocols=null;
private Role m_role=null;
private Protocol m_protocol=null;
+ private Journal m_journal=null;
private static Logger logger = Logger.getLogger(ContractIntrospector.class.getName());
@@ -60,8 +65,8 @@
*
* @param protocol The protocol to introspect
*/
- public ContractIntrospector(Protocol protocol) {
- this(protocol, null, null);
+ public ContractIntrospector(Protocol protocol, Journal journal) {
+ this(protocol, null, null, journal);
}
/**
@@ -72,11 +77,23 @@
* @param processed The optional set of protocols currently processed
*/
public ContractIntrospector(Protocol protocol, Contract contract,
- java.util.Set<Protocol> processed) {
+ java.util.Set<Protocol> processed, Journal journal) {
m_contract = contract;
+ if (protocol != null) {
+ m_role = protocol.getRole();
+ }
+
if (m_contract == null) {
m_contract = new Contract();
+
+ m_contract.setName(m_role.getName());
+
+ String namespace=(String)m_role.getProperties().get(PropertyName.NAMESPACE);
+
+ if (namespace != null) {
+ m_contract.setNamespace(namespace);
+ }
}
if (processed != null) {
@@ -86,10 +103,6 @@
}
m_protocol = protocol;
-
- if (protocol != null) {
- m_role = protocol.getRole();
- }
}
/**
@@ -102,6 +115,15 @@
}
/**
+ * This method returns the journal.
+ *
+ * @return The journal
+ */
+ public Journal getJournal() {
+ return(m_journal);
+ }
+
+ /**
* This method returns the interface.
*
* @return The interface
@@ -114,6 +136,18 @@
ret = new Interface();
ret.setName(m_role.getName());
+ // TODO: Need to consider how to manage different interfaces,
+ // in case the choreography has multiple interfaces. Each
+ // interaction could have an 'INTERFACE_NAME' property which
+ // could determine the interface - and if not defined default
+ // to using an interface named after the role
+
+ String namespace=(String)m_role.getProperties().get(PropertyName.NAMESPACE);
+
+ if (namespace != null) {
+ ret.setNamespace(namespace);
+ }
+
getContract().getInterfaces().add(ret);
}
@@ -166,7 +200,7 @@
m_processedProtocols.add(toProtocol);
ContractIntrospector ci=new ContractIntrospector(toProtocol,
- getContract(), getProcessedProtocols());
+ getContract(), getProcessedProtocols(), getJournal());
ci.process();
} else {
@@ -187,6 +221,10 @@
*/
public void accept(Interaction interaction) {
+ // Receiving a request - so record this in the contract
+ Interface intf=getInterface();
+
+ /*
// Check if the interacton is being received
if (interaction.getFromRole() != null &&
interaction.getFromRole().equals(m_role) == false) {
@@ -195,10 +233,11 @@
// has been set, indicating it is receiving a response
if (InteractionUtil.getReplyToLabel(interaction) == null ||
InteractionUtil.getReplyToLabel(interaction).trim().length() == 0) {
+ */
+
+ // Check if receiving a request
+ if (InteractionUtil.isRequest(interaction) && !InteractionUtil.isSend(interaction)) {
- // Receiving a request - so record this in the contract
- Interface intf=getInterface();
-
if (interaction.getMessageSignature().getOperation() != null) {
// Check if message exchange pattern exists for operation
@@ -223,10 +262,170 @@
}
}
+ //} else {
+
+ //}
+
+ } else if (InteractionUtil.isResponse(interaction) && InteractionUtil.isSend(interaction)) {
+
+ if (interaction.getMessageSignature().getOperation() != null) {
+
+ // Check if message exchange pattern exists for operation
+ MessageExchangePattern mep=intf.getMessageExchangePatternForOperation(
+ interaction.getMessageSignature().getOperation());
+
+ if (mep instanceof RequestResponseMEP) {
+ RequestResponseMEP rrmep=(RequestResponseMEP)mep;
+
+ if (InteractionUtil.isFaultResponse(interaction)) {
+ String faultName=InteractionUtil.getFaultName(interaction);
+
+ if (rrmep.getFaultDetails(faultName) == null) {
+ FaultDetails fd=new FaultDetails();
+ fd.setName(faultName);
+
+ for (int i=0; i < interaction.getMessageSignature().getTypeReferences().size(); i++) {
+ fd.getTypes().add(convertType(interaction.getMessageSignature().getTypeReferences().get(i)));
+ }
+
+ rrmep.getFaultDetails().add(fd);
+ }
+
+ } else if (rrmep.getResponseTypes().size() == 0) {
+
+ if (interaction.getMessageSignature().getTypeReferences().size() > 1) {
+ getJournal().error("Response has more than one type", null);
+ } else if (interaction.getMessageSignature().getTypeReferences().size() == 1) {
+ rrmep.getResponseTypes().add(convertType(
+ interaction.getMessageSignature().getTypeReferences().get(0)));
+ }
+ }
+ }
+ }
+ }
+ }
+
+ /**
+ * This method introspects the supplied interaction to generate Message Exchange
+ * Patterns on the contract interface.
+ *
+ * @param interaction The interaction
+ */
+ public boolean start(When when) {
+
+ // Receiving a request - so record this in the contract
+ Interface intf=getInterface();
+
+ // Check if receiving a request
+ if (InteractionUtil.isRequest(when) && !InteractionUtil.isSend(when)) {
+
+ if (when.getMessageSignature().getOperation() != null) {
+
+ // Check if message exchange pattern exists for operation
+ MessageExchangePattern mep=intf.getMessageExchangePatternForOperation(
+ when.getMessageSignature().getOperation());
+
+ if (mep == null) {
+ // Create new MEP
+ if (InteractionUtil.getRequestLabel(when) != null) {
+ mep = new RequestResponseMEP();
+ } else {
+ mep = new OneWayRequestMEP();
+ }
+
+ mep.setOperation(when.getMessageSignature().getOperation());
+
+ for (int i=0; i < when.getMessageSignature().getTypeReferences().size(); i++) {
+ mep.getTypes().add(convertType(when.getMessageSignature().getTypeReferences().get(i)));
+ }
+
+ intf.getMessageExchangePatterns().add(mep);
+ }
+ }
+ } else if (InteractionUtil.isResponse(when) && InteractionUtil.isSend(when)) {
+
+ if (when.getMessageSignature().getOperation() != null) {
+
+ // Check if message exchange pattern exists for operation
+ MessageExchangePattern mep=intf.getMessageExchangePatternForOperation(
+ when.getMessageSignature().getOperation());
+
+ if (mep instanceof RequestResponseMEP) {
+ RequestResponseMEP rrmep=(RequestResponseMEP)mep;
+
+ if (InteractionUtil.isFaultResponse(when)) {
+ String faultName=InteractionUtil.getFaultName(when);
+
+ if (rrmep.getFaultDetails(faultName) == null) {
+ FaultDetails fd=new FaultDetails();
+ fd.setName(faultName);
+
+ for (int i=0; i < when.getMessageSignature().getTypeReferences().size(); i++) {
+ fd.getTypes().add(convertType(when.getMessageSignature().getTypeReferences().get(i)));
+ }
+
+ rrmep.getFaultDetails().add(fd);
+ }
+
+ } else if (rrmep.getResponseTypes().size() == 0) {
+
+ if (when.getMessageSignature().getTypeReferences().size() > 1) {
+ getJournal().error("Response has more than one type", null);
+ } else if (when.getMessageSignature().getTypeReferences().size() == 1) {
+ rrmep.getResponseTypes().add(convertType(
+ when.getMessageSignature().getTypeReferences().get(0)));
+ }
+ }
+ }
+ }
+ }
+
+ /*
+ Choice choice=(Choice)when.getParent();
+
+ // Check if the interacton is being received
+ if (choice.getFromRole() != null &&
+ choice.getFromRole().equals(m_role) == false) {
+
+ // Received by the role, but need to check if its replyTo
+ // has been set, indicating it is receiving a response
+ if (InteractionUtil.getReplyToLabel(when) == null ||
+ InteractionUtil.getReplyToLabel(when).trim().length() == 0) {
+
+ // Receiving a request - so record this in the contract
+ Interface intf=getInterface();
+
+ if (when.getMessageSignature().getOperation() != null) {
+
+ // Check if message exchange pattern exists for operation
+ MessageExchangePattern mep=intf.getMessageExchangePatternForOperation(
+ when.getMessageSignature().getOperation());
+
+ if (mep == null) {
+ // Create new MEP
+ if (InteractionUtil.getRequestLabel(when) != null) {
+ mep = new RequestResponseMEP();
+ } else {
+ mep = new OneWayRequestMEP();
+ }
+
+ mep.setOperation(when.getMessageSignature().getOperation());
+
+ for (int i=0; i < when.getMessageSignature().getTypeReferences().size(); i++) {
+ mep.getTypes().add(convertType(when.getMessageSignature().getTypeReferences().get(i)));
+ }
+
+ intf.getMessageExchangePatterns().add(mep);
+ }
+ }
+
} else {
}
}
+ */
+
+ return(true);
}
/**
@@ -242,7 +441,7 @@
TypeDefinition td=new TypeDefinition();
td.setName(tref.getName());
- td.setDataType((String)tref.getProperties().get(PropertyName.MESSAGE_TYPE));
+ td.setDataType((String)tref.getProperties().get(PropertyName.DATA_TYPE));
// Copy properties that may provide additional information about the type
td.getProperties().putAll(tref.getProperties());
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Contract.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Contract.java 2011-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Contract.java 2011-01-09 23:22:28 UTC (rev 564)
@@ -148,4 +148,22 @@
public java.util.Set<Namespace> getNamespaces() {
return(m_namespaces);
}
+
+ public String toString() {
+ StringBuffer buf=new StringBuffer();
+
+ buf.append("Contract {"+m_namespace+"}"+m_name+" {\r\n");
+
+ for (TypeDefinition td : getTypeDefinitions()) {
+ buf.append(td.toString());
+ }
+
+ for (Interface intf : getInterfaces()) {
+ buf.append(intf.toString());
+ }
+
+ buf.append("}\r\n");
+
+ return(buf.toString());
+ }
}
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/FaultDetails.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/FaultDetails.java 2011-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/FaultDetails.java 2011-01-09 23:22:28 UTC (rev 564)
@@ -23,7 +23,6 @@
public class FaultDetails extends ContractObject {
private String m_name=null;
- private String m_namespace=null;
private java.util.List<Type> m_types=
new java.util.Vector<Type>();
@@ -53,25 +52,6 @@
}
/**
- * This method returns the namespace associated with the
- * fault.
- *
- * @return The namespace
- */
- public String getNamespace() {
- return(m_namespace);
- }
-
- /**
- * This method sets the namespace of the fault.
- *
- * @param namespace The namespace
- */
- public void setNamespace(String namespace) {
- m_namespace = namespace;
- }
-
- /**
* This method returns the list of types.
*
* @return The list of types
@@ -79,4 +59,19 @@
public java.util.List<Type> getTypes() {
return(m_types);
}
+
+ public String toString() {
+ StringBuffer buf=new StringBuffer();
+
+ buf.append("Fault "+getName()+"( ");
+
+ for (Type t : getTypes()) {
+ buf.append(t.toString()+" ");
+ }
+
+ buf.append(")");
+
+ return(buf.toString());
+ }
+
}
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Interface.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Interface.java 2011-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Interface.java 2011-01-09 23:22:28 UTC (rev 564)
@@ -103,4 +103,18 @@
return(ret);
}
+
+ public String toString() {
+ StringBuffer buf=new StringBuffer();
+
+ buf.append("\tInterface {"+m_namespace+"}"+m_name+" {\r\n");
+
+ for (MessageExchangePattern mep : getMessageExchangePatterns()) {
+ buf.append(mep.toString());
+ }
+
+ buf.append("\t}\r\n");
+
+ return(buf.toString());
+ }
}
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/OneWayRequestMEP.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/OneWayRequestMEP.java 2011-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/OneWayRequestMEP.java 2011-01-09 23:22:28 UTC (rev 564)
@@ -28,4 +28,17 @@
public OneWayRequestMEP() {
}
+ public String toString() {
+ StringBuffer buf=new StringBuffer();
+
+ buf.append("\t\tOneWayRequestMEP "+getOperation()+"( ");
+
+ for (Type t : getTypes()) {
+ buf.append(t.toString()+" ");
+ }
+
+ buf.append(")\r\n");
+
+ return(buf.toString());
+ }
}
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/RequestResponseMEP.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/RequestResponseMEP.java 2011-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/RequestResponseMEP.java 2011-01-09 23:22:28 UTC (rev 564)
@@ -50,4 +50,44 @@
public java.util.List<FaultDetails> getFaultDetails() {
return(m_faultDetails);
}
+
+ /**
+ * This method returns the fault details for the supplied
+ * name.
+ *
+ * @param faultName The fault name
+ * @return The fault details, or null if not found
+ */
+ public FaultDetails getFaultDetails(String faultName) {
+ for (FaultDetails fd : m_faultDetails) {
+ if (fd.getName().equals(faultName)) {
+ return(fd);
+ }
+ }
+ return(null);
+ }
+
+ public String toString() {
+ StringBuffer buf=new StringBuffer();
+
+ buf.append("\t\tRequestResponseMEP "+getOperation()+"( ");
+
+ for (Type t : getTypes()) {
+ buf.append(t.toString()+" ");
+ }
+
+ buf.append(") : ");
+
+ for (Type t : getResponseTypes()) {
+ buf.append(t.toString()+" ");
+ }
+
+ for (FaultDetails fd : getFaultDetails()) {
+ buf.append(fd.toString()+" ");
+ }
+
+ buf.append("\r\n");
+
+ return(buf.toString());
+ }
}
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Type.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Type.java 2011-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Type.java 2011-01-09 23:22:28 UTC (rev 564)
@@ -51,4 +51,7 @@
m_name = name;
}
+ public String toString() {
+ return(getName());
+ }
}
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/TypeDefinition.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/TypeDefinition.java 2011-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/TypeDefinition.java 2011-01-09 23:22:28 UTC (rev 564)
@@ -109,4 +109,9 @@
public void setTypeSystem(String typeSystem) {
m_typeSystem = typeSystem;
}
+
+ public String toString() {
+ return("\tTypeDef "+m_name+" type="+m_dataType+
+ " location="+m_location+" typeSystem="+m_typeSystem+"\r\n");
+ }
}
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/savara/contract/generator/ContractGeneratorTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/savara/contract/generator/ContractGeneratorTest.java 2011-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/savara/contract/generator/ContractGeneratorTest.java 2011-01-09 23:22:28 UTC (rev 564)
@@ -4,8 +4,14 @@
import org.savara.contract.generator.ContractGenerator;
import org.savara.contract.generator.ContractGeneratorFactory;
+import org.savara.contract.model.Contract;
+import org.scribble.common.logging.CachedJournal;
+import org.scribble.common.logging.Journal;
+import org.scribble.protocol.model.Interaction;
+import org.scribble.protocol.model.MessageSignature;
import org.scribble.protocol.model.Protocol;
import org.scribble.protocol.model.Role;
+import org.scribble.protocol.model.TypeReference;
public class ContractGeneratorTest {
@@ -17,8 +23,10 @@
try {
Protocol conv=null;
- generator.generate(conv);
+ Journal journal=new CachedJournal();
+ generator.generate(conv, journal);
+
fail("Should have thrown IllegalArgumentException");
} catch(IllegalArgumentException iae) {
@@ -35,8 +43,10 @@
Protocol conv=new Protocol();
conv.setName("NonLocatedProtocol");
- generator.generate(conv);
+ Journal journal=new CachedJournal();
+ generator.generate(conv, journal);
+
fail("Should have thrown IllegalArgumentException");
} catch(IllegalArgumentException iae) {
@@ -54,10 +64,61 @@
conv.setRole(new Role());
conv.setName("LocatedProtocol");
- generator.generate(conv);
+ Journal journal=new CachedJournal();
+ generator.generate(conv, journal);
+
} catch(IllegalArgumentException iae) {
fail("Should NOT have thrown IllegalArgumentException");
}
}
+
+ @org.junit.Test
+ public void testGenerateOneWayRequestSend() {
+
+ ContractGenerator generator=ContractGeneratorFactory.getContractGenerator();
+
+ try {
+ Role fromRole=new Role();
+ fromRole.setName("from");
+
+ Role toRole=new Role();
+ toRole.setName("to");
+
+ Protocol conv=new Protocol();
+ conv.setRole(fromRole);
+ conv.setName("LocatedProtocol");
+
+ Interaction interaction=new Interaction();
+ interaction.getToRoles().add(toRole);
+
+ MessageSignature ms=new MessageSignature();
+ ms.setOperation("op");
+
+ interaction.setMessageSignature(ms);
+
+ TypeReference tref1=new TypeReference();
+ tref1.setName("type");
+ ms.getTypeReferences().add(tref1);
+
+ conv.getBlock().add(interaction);
+
+ Journal journal=new CachedJournal();
+
+ Contract c=generator.generate(conv, journal);
+
+ if (c == null) {
+ fail("Contract is null");
+ }
+
+ if (c.getInterfaces().size() != 1) {
+ fail("Only one interface expected");
+ }
+
+
+
+ } catch(IllegalArgumentException iae) {
+ fail("Should NOT have thrown IllegalArgumentException");
+ }
+ }
}
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/savara/contract/generator/impl/ContractIntrospectorTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/savara/contract/generator/impl/ContractIntrospectorTest.java 2011-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/savara/contract/generator/impl/ContractIntrospectorTest.java 2011-01-09 23:22:28 UTC (rev 564)
@@ -29,6 +29,8 @@
import org.savara.contract.model.RequestResponseMEP;
import org.savara.contract.model.Type;
import org.savara.contract.generator.impl.ContractIntrospector;
+import org.scribble.common.logging.CachedJournal;
+import org.scribble.common.logging.Journal;
import org.scribble.protocol.model.Protocol;
import org.scribble.protocol.model.Interaction;
import org.scribble.protocol.model.ProtocolReference;
@@ -76,8 +78,10 @@
mid.getBlock().getContents().add(run);
mid.getBlock().getContents().add(sub);
- ContractIntrospector introspector=new ContractIntrospector(top);
+ Journal journal=new CachedJournal();
+ ContractIntrospector introspector=new ContractIntrospector(top, journal);
+
introspector.process();
if (introspector.getProcessedProtocols().size() != 0) {
@@ -124,8 +128,10 @@
mid.getBlock().getContents().add(run2);
mid.getBlock().getContents().add(sub);
- ContractIntrospector introspector=new ContractIntrospector(top);
+ Journal journal=new CachedJournal();
+ ContractIntrospector introspector=new ContractIntrospector(top, journal);
+
introspector.process();
if (introspector.getProcessedProtocols().size() != 2) {
@@ -148,8 +154,10 @@
role.setName(MY_ROLE);
protocol.setRole(role);
- ContractIntrospector introspector=new ContractIntrospector(protocol);
+ Journal journal=new CachedJournal();
+ ContractIntrospector introspector=new ContractIntrospector(protocol, journal);
+
if (introspector.getContract().getInterfaces().size() != 0) {
fail("Should be 0 interfaces: "+introspector.getContract().getInterfaces().size());
}
@@ -182,8 +190,10 @@
role.setName(MY_ROLE);
protocol.setRole(role);
- ContractIntrospector introspector=new ContractIntrospector(protocol);
+ Journal journal=new CachedJournal();
+ ContractIntrospector introspector=new ContractIntrospector(protocol, journal);
+
Interaction interaction=new Interaction();
MessageSignature msig=new MessageSignature();
@@ -236,8 +246,10 @@
role.setName(MY_ROLE);
protocol.setRole(role);
- ContractIntrospector introspector=new ContractIntrospector(protocol);
+ Journal journal=new CachedJournal();
+ ContractIntrospector introspector=new ContractIntrospector(protocol, journal);
+
Interaction interaction=new Interaction();
MessageSignature msig=new MessageSignature();
Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/CDMProtocolParser.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/CDMProtocolParser.java 2011-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/CDMProtocolParser.java 2011-01-09 23:22:28 UTC (rev 564)
@@ -61,7 +61,7 @@
if (rule != null) {
ConverterContext cctxt=
- new DefaultConverterContext();
+ new DefaultConverterContext(journal);
ret = (ProtocolModel)rule.convert(cctxt,
ProtocolModel.class, cdlpack);
Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ChoiceConverterRuleImpl.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ChoiceConverterRuleImpl.java 2011-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ChoiceConverterRuleImpl.java 2011-01-09 23:22:28 UTC (rev 564)
@@ -24,6 +24,8 @@
import org.pi4soa.cdl.Package;
import org.pi4soa.cdl.Parallel;
import org.pi4soa.cdl.util.CDLTypeUtil;
+import org.pi4soa.cdl.util.InteractionUtil;
+import org.savara.common.model.util.PropertyName;
import org.scribble.protocol.model.*;
import org.scribble.protocol.model.Choice;
import org.scribble.protocol.model.When;
@@ -128,7 +130,16 @@
}
if (ed.getAction() == ExchangeActionType.RESPOND) {
- block.getProperties().put("ReplyToLabel", ConverterUtil.getLabel(ed));
+ block.getProperties().put(PropertyName.REPLY_TO_LABEL, ConverterUtil.getLabel(ed));
+ } else {
+ // Check if request has response/fault exchanges
+ java.util.List<ExchangeDetails> resps=
+ InteractionUtil.getResponseExchangeDetails(ed);
+
+ if (resps != null && resps.size() > 0) {
+ block.getProperties().put(PropertyName.REQUEST_LABEL,
+ ConverterUtil.getLabel(ed));
+ }
}
}
}
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-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConditionalConverterRuleImpl.java 2011-01-09 23:22:28 UTC (rev 564)
@@ -21,6 +21,8 @@
import org.pi4soa.cdl.*;
import org.pi4soa.cdl.util.CDLTypeUtil;
+import org.pi4soa.cdl.util.InteractionUtil;
+import org.savara.common.model.util.PropertyName;
import org.savara.pi4soa.cdm.parser.rules.ChoiceConverterRuleImpl.InteractionLocator;
import org.scribble.protocol.model.*;
import org.scribble.protocol.model.When;
@@ -95,6 +97,19 @@
ret.setToRole(new Role(InteractionConverterRuleImpl.getToRole(context,
ed)));
+
+ if (ed.getAction() == ExchangeActionType.RESPOND) {
+ block.getProperties().put(PropertyName.REPLY_TO_LABEL, ConverterUtil.getLabel(ed));
+ } else {
+ // Check if request has response/fault exchanges
+ java.util.List<ExchangeDetails> resps=
+ InteractionUtil.getResponseExchangeDetails(ed);
+
+ if (resps != null && resps.size() > 0) {
+ block.getProperties().put(PropertyName.REQUEST_LABEL,
+ ConverterUtil.getLabel(ed));
+ }
+ }
}
}
Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConverterContext.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConverterContext.java 2011-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConverterContext.java 2011-01-09 23:22:28 UTC (rev 564)
@@ -21,11 +21,19 @@
import org.pi4soa.cdl.Choreography;
import org.pi4soa.cdl.ExchangeDetails;
+import org.scribble.common.logging.Journal;
import org.scribble.protocol.model.*;
public interface ConverterContext {
/**
+ * This method returns the journal for reporting issues.
+ *
+ * @return The journal
+ */
+ public Journal getJournal();
+
+ /**
* This method returns the source model reference.
*
* @return The source model reference
Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConverterUtil.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConverterUtil.java 2011-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConverterUtil.java 2011-01-09 23:22:28 UTC (rev 564)
@@ -22,6 +22,8 @@
import javax.xml.namespace.QName;
import org.pi4soa.cdl.ExchangeDetails;
+import org.savara.common.model.util.PropertyName;
+import org.savara.common.model.util.TypeSystem;
import org.scribble.protocol.model.*;
/**
@@ -54,17 +56,20 @@
if (org.pi4soa.common.util.NamesUtil.isSet(infoType.getTypeName())) {
typeName = infoType.getTypeName();
+ ret.getProperties().put(PropertyName.XSD_TYPE, "true");
} else if (org.pi4soa.common.util.NamesUtil.isSet(infoType.getElementName())) {
typeName = infoType.getElementName();
+ ret.getProperties().put(PropertyName.XSD_ELEMENT, "true");
}
if (typeName != null) {
ret.setName(org.pi4soa.common.xml.XMLUtils.getLocalname(typeName));
- ret.getProperties().put(QNAME,
+ ret.getProperties().put(PropertyName.DATA_TYPE,
(new QName(org.pi4soa.common.xml.XMLUtils.getNamespace(typeName, resolver, null),
org.pi4soa.common.xml.XMLUtils.getLocalname(typeName))).toString());
+ ret.getProperties().put(PropertyName.TYPE_SYSTEM, TypeSystem.XSD);
//ret.setNamespace(org.pi4soa.common.xml.XMLUtils.getNamespace(typeName, resolver, null));
}
Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/DefaultConverterContext.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/DefaultConverterContext.java 2011-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/DefaultConverterContext.java 2011-01-09 23:22:28 UTC (rev 564)
@@ -23,6 +23,7 @@
import org.pi4soa.cdl.Choreography;
import org.pi4soa.cdl.ExchangeDetails;
+import org.scribble.common.logging.Journal;
import org.scribble.protocol.model.*;
/**
@@ -30,10 +31,13 @@
*/
public class DefaultConverterContext implements ConverterContext {
+ private Journal m_journal=null;
+
/**
* Default constructor.
*/
- public DefaultConverterContext() {
+ public DefaultConverterContext(Journal journal) {
+ m_journal = journal;
}
/**
@@ -60,6 +64,15 @@
*/
/**
+ * This method returns the journal for reporting issues.
+ *
+ * @return The journal
+ */
+ public Journal getJournal() {
+ return(m_journal);
+ }
+
+ /**
* This method returns the declaration associated
* with the supplied name.
*
Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/InteractionConverterRuleImpl.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/InteractionConverterRuleImpl.java 2011-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/InteractionConverterRuleImpl.java 2011-01-09 23:22:28 UTC (rev 564)
@@ -382,7 +382,7 @@
InteractionUtil.getResponseExchangeDetails(details);
if (resps != null && resps.size() > 0) {
- interaction.getProperties().put("RequestLabel", ConverterUtil.getLabel(details));
+ interaction.getProperties().put(PropertyName.REQUEST_LABEL, ConverterUtil.getLabel(details));
}
// Check if fault thrown
@@ -438,7 +438,7 @@
}
if (details.getAction() == ExchangeActionType.RESPOND) {
- interaction.getProperties().put("ReplyToLabel", ConverterUtil.getLabel(details));
+ interaction.getProperties().put(PropertyName.REPLY_TO_LABEL, ConverterUtil.getLabel(details));
}
// Check if fault thrown
@@ -751,7 +751,7 @@
String lp=XMLUtils.getLocalname(itype.getTypeName());
QName qname=new QName(ns, lp);
- ms.getProperties().put(PropertyName.MESSAGE_TYPE, qname.toString());
+ ms.getProperties().put(PropertyName.DATA_TYPE, qname.toString());
ms.getProperties().put(PropertyName.XSD_TYPE, "true");
@@ -771,7 +771,7 @@
String lp=XMLUtils.getLocalname(itype.getElementName());
QName qname=new QName(ns, lp);
- ms.getProperties().put(PropertyName.MESSAGE_TYPE, qname.toString());
+ ms.getProperties().put(PropertyName.DATA_TYPE, qname.toString());
ms.getProperties().put(PropertyName.XSD_ELEMENT, "true");
Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolConverterRuleImpl.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolConverterRuleImpl.java 2011-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolConverterRuleImpl.java 2011-01-09 23:22:28 UTC (rev 564)
@@ -41,8 +41,6 @@
public class ProtocolConverterRuleImpl implements ConverterRule {
- private static final String CONVERSATION_TYPE = "conversationType";
-
/**
* This method determines whether the rule can be applied
* to the supplied CDL type.
@@ -256,8 +254,8 @@
protected static void defineRoles(ConverterContext context,
final Choreography choreo, Block block) {
- org.pi4soa.cdl.interfaces.InterfaceDeriver intfDeriver=
- org.pi4soa.cdl.interfaces.InterfaceFactory.getInterfaceDeriver();
+ //org.pi4soa.cdl.interfaces.InterfaceDeriver intfDeriver=
+ // org.pi4soa.cdl.interfaces.InterfaceFactory.getInterfaceDeriver();
final java.util.List<ParticipantType> partTypes=new java.util.Vector<ParticipantType>();
final java.util.List<Participant> partInstances=new java.util.Vector<Participant>();
@@ -310,7 +308,9 @@
while (piter.hasNext()) {
Role role=new Role();
Participant pinst=piter.next();
- role.setName(pinst.getName());
+ role.setName(XMLUtils.getLocalname(pinst.getName()));
+ role.getProperties().put(PropertyName.NAMESPACE,
+ CDLTypeUtil.getNamespace(pinst.getName(), pinst, true));
if (roleList == null) {
roleList = new RoleList();
@@ -326,6 +326,7 @@
//registerRole(context, choreo, conv, roleList, role, pinst);
// Setup interfaces
+ /*
for (int i=0; i < pinst.getRoleTypes().size(); i++) {
Contract contract=null;
@@ -373,6 +374,7 @@
setupInterfaces((org.pi4soa.cdl.RoleType)pinst.getRoleTypes().get(i),
contract, intfDeriver);
}
+ */
}
java.util.Iterator<ParticipantType> ptiter=partTypes.iterator();
@@ -387,6 +389,8 @@
Role role=new Role();
ParticipantType ptype=ptiter.next();
role.setName(XMLUtils.getLocalname(ptype.getName()));
+ role.getProperties().put(PropertyName.NAMESPACE,
+ CDLTypeUtil.getNamespace(ptype.getName(), ptype, true));
if (roleList == null) {
roleList = new RoleList();
@@ -406,6 +410,7 @@
//registerRole(context, choreo, conv, roleList, role, ptype);
// Setup interfaces
+ /*
for (int i=0; i < ptype.getRoleTypes().size(); i++) {
Contract contract=null;
@@ -439,10 +444,12 @@
setupInterfaces((org.pi4soa.cdl.RoleType)ptype.getRoleTypes().get(i),
contract, intfDeriver);
}
+ */
}
}
}
+ /*
protected static void setupInterfaces(org.pi4soa.cdl.RoleType roleType, Contract contract,
org.pi4soa.cdl.interfaces.InterfaceDeriver intfDeriver) {
@@ -453,6 +460,7 @@
rtd.visit(iv);
}
+ */
/*
protected void convertVariables(ConverterContext context,
@@ -737,7 +745,7 @@
FaultDetails fault=new FaultDetails();
fault.setName(defn.getFaultName());
- fault.setNamespace(defn.getFaultNamespace());
+ //fault.setNamespace(defn.getFaultNamespace());
fault.getTypes().add(createType(defn));
Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolModelConverterRuleImpl.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolModelConverterRuleImpl.java 2011-01-08 23:39:18 UTC (rev 563)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolModelConverterRuleImpl.java 2011-01-09 23:22:28 UTC (rev 564)
@@ -24,6 +24,8 @@
import org.pi4soa.cdl.*;
import org.pi4soa.cdl.util.CDLTypeUtil;
import org.savara.common.model.util.PropertyName;
+import org.savara.contract.generator.ContractGenerator;
+import org.savara.contract.generator.ContractGeneratorFactory;
import org.scribble.protocol.model.*;
public class ProtocolModelConverterRuleImpl implements ConverterRule {
@@ -145,6 +147,12 @@
}
*/
+ // Derive contracts associated with the protocol model
+ ContractGenerator cg=ContractGeneratorFactory.getContractGenerator();
+ if (cg != null) {
+ cg.generate(ret, context.getJournal());
+ }
+
return(ret);
}
13 years, 5 months
- 1
- 0
savara SVN: r563 - in branches/experimental/2.0.x: bundles/org.savara.contract and 23 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-01-08 18:39:18 -0500 (Sat, 08 Jan 2011)
New Revision: 563
Added:
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/resources/
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/resources/org/
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/resources/org/savara/
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/resources/org/savara/contract/
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/resources/org/savara/contract/Messages.properties
branches/experimental/2.0.x/bundles/org.savara.contract/src/test/
branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/
branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/
branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/savara/
branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/savara/contract/
branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/savara/contract/generator/
branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/savara/contract/generator/ContractGeneratorTest.java
branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/savara/contract/generator/impl/
branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/savara/contract/generator/impl/ContractIntrospectorTest.java
Modified:
branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/InteractionUtil.java
branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/PropertyName.java
branches/experimental/2.0.x/bundles/org.savara.contract/.classpath
branches/experimental/2.0.x/bundles/org.savara.contract/META-INF/MANIFEST.MF
branches/experimental/2.0.x/bundles/org.savara.contract/pom.xml
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractGeneratorImpl.java
branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature/
branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature/pom.xml
branches/experimental/2.0.x/tools/features/org.savara.tools.feature/
branches/experimental/2.0.x/tools/features/org.savara.tools.feature/feature.xml
branches/experimental/2.0.x/tools/features/org.savara.tools.feature/pom.xml
branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/
branches/experimental/2.0.x/tools/plugins/org.savara.tools.validator/
branches/experimental/2.0.x/tools/plugins/pom.xml
branches/experimental/2.0.x/tools/pom.xml
branches/experimental/2.0.x/tools/site/
branches/experimental/2.0.x/tools/site/pom.xml
branches/experimental/2.0.x/tools/tests/pom.xml
Log:
Fix tools building with maven.
Modified: branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/InteractionUtil.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/InteractionUtil.java 2011-01-08 20:53:26 UTC (rev 562)
+++ branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/InteractionUtil.java 2011-01-08 23:39:18 UTC (rev 563)
@@ -127,19 +127,19 @@
}
public static String getRequestLabel(Interaction interaction) {
- return((String)interaction.getProperties().get("RequestLabel"));
+ return((String)interaction.getProperties().get(PropertyName.REQUEST_LABEL));
}
public static String getReplyToLabel(Interaction interaction) {
- return((String)interaction.getProperties().get("ReplyToLabel"));
+ return((String)interaction.getProperties().get(PropertyName.REPLY_TO_LABEL));
}
public static String getRequestLabel(When interaction) {
- return((String)interaction.getProperties().get("RequestLabel"));
+ return((String)interaction.getProperties().get(PropertyName.REQUEST_LABEL));
}
public static String getReplyToLabel(When interaction) {
- return((String)interaction.getProperties().get("ReplyToLabel"));
+ return((String)interaction.getProperties().get(PropertyName.REPLY_TO_LABEL));
}
/**
Modified: branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/PropertyName.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/PropertyName.java 2011-01-08 20:53:26 UTC (rev 562)
+++ branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/PropertyName.java 2011-01-08 23:39:18 UTC (rev 563)
@@ -28,6 +28,9 @@
public static final String INTERFACE_NAME = "InterfaceName";
public static final String FAULT_NAME = "FaultName";
+
+ public static final String REQUEST_LABEL = "RequestLabel";
+ public static final String REPLY_TO_LABEL = "ReplyToLabel";
// TODO: Determine if required (SAVARA-158)
public static final String TYPE_SYSTEM = "TypeSystem";
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/.classpath
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/.classpath 2011-01-08 20:53:26 UTC (rev 562)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/.classpath 2011-01-08 23:39:18 UTC (rev 563)
@@ -1,11 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
+ <classpathentry including="**/*.java" kind="src" path="src/test/java"/>
+ <classpathentry kind="src" path="src/main/resources"/>
<classpathentry kind="var" path="M2_REPO/org/apache/felix/org.apache.felix.framework/3.0.1/org.apache.felix.framework-3.0.1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.core/1.4.0/org.osgi.core-1.4.0.jar"/>
<classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT-sources.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry combineaccessrules="false" kind="src" path="/org.savara.common"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/META-INF/MANIFEST.MF 2011-01-08 20:53:26 UTC (rev 562)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/META-INF/MANIFEST.MF 2011-01-08 23:39:18 UTC (rev 563)
@@ -6,7 +6,8 @@
Bundle-Activator: org.savara.contract.osgi.Activator
Bundle-Vendor: www.savara.org
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.osgi.framework
+Import-Package: org.junit,
+ org.osgi.framework
Require-Bundle: org.scribble.common,
org.savara.common
Export-Package: org.savara.contract.model
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/pom.xml
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/pom.xml 2011-01-08 20:53:26 UTC (rev 562)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/pom.xml 2011-01-08 23:39:18 UTC (rev 563)
@@ -34,5 +34,11 @@
<artifactId>org.osgi.core</artifactId>
<version>${osgi.version}</version>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractGeneratorImpl.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractGeneratorImpl.java 2011-01-08 20:53:26 UTC (rev 562)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractGeneratorImpl.java 2011-01-08 23:39:18 UTC (rev 563)
@@ -43,13 +43,13 @@
if (cm == null) {
throw new IllegalArgumentException(MessageFormat.format(
java.util.PropertyResourceBundle.getBundle(
- "org.savara.protocol.contract.Messages").
+ "org.savara.contract.Messages").
getString("SAVARAPC-00001"), (Object)null));
} else if (cm.getRole() == null) {
throw new IllegalArgumentException(MessageFormat.format(
java.util.PropertyResourceBundle.getBundle(
- "org.savara.protocol.contract.Messages").
+ "org.savara.contract.Messages").
getString("SAVARAPC-00002"), (Object)null));
}
Added: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/resources/org/savara/contract/Messages.properties
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/resources/org/savara/contract/Messages.properties (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/resources/org/savara/contract/Messages.properties 2011-01-08 23:39:18 UTC (rev 563)
@@ -0,0 +1,20 @@
+#/*
+# * JBoss, Home of Professional Open Source
+# * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+# * by the @authors tag. All rights reserved.
+# * See the copyright.txt in the distribution for a
+# * full listing of individual contributors.
+# * This copyrighted material is made available to anyone wishing to use,
+# * modify, copy, or redistribute it subject to the terms and conditions
+# * of the GNU Lesser General Public License, v. 2.1.
+# * This program is distributed in the hope that it will be useful, but WITHOUT A
+# * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+# * You should have received a copy of the GNU Lesser General Public License,
+# * v.2.1 along with this distribution; if not, write to the Free Software
+# * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+# * MA 02110-1301, USA.
+# */
+
+SAVARAPC-00001=Protocol must be supplied
+SAVARAPC-00002=Contract generation requires a protocol that represents the local behaviour associated with a particular role
Added: branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/savara/contract/generator/ContractGeneratorTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/savara/contract/generator/ContractGeneratorTest.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/savara/contract/generator/ContractGeneratorTest.java 2011-01-08 23:39:18 UTC (rev 563)
@@ -0,0 +1,63 @@
+package org.savara.contract.generator;
+
+import static org.junit.Assert.*;
+
+import org.savara.contract.generator.ContractGenerator;
+import org.savara.contract.generator.ContractGeneratorFactory;
+import org.scribble.protocol.model.Protocol;
+import org.scribble.protocol.model.Role;
+
+public class ContractGeneratorTest {
+
+ @org.junit.Test
+ public void testGenerateProtocolNull() {
+
+ ContractGenerator generator=ContractGeneratorFactory.getContractGenerator();
+
+ try {
+ Protocol conv=null;
+
+ generator.generate(conv);
+
+ fail("Should have thrown IllegalArgumentException");
+
+ } catch(IllegalArgumentException iae) {
+ // Test worked
+ }
+ }
+
+ @org.junit.Test
+ public void testGenerateProtocolNotLocated() {
+
+ ContractGenerator generator=ContractGeneratorFactory.getContractGenerator();
+
+ try {
+ Protocol conv=new Protocol();
+ conv.setName("NonLocatedProtocol");
+
+ generator.generate(conv);
+
+ fail("Should have thrown IllegalArgumentException");
+
+ } catch(IllegalArgumentException iae) {
+ // Test worked
+ }
+ }
+
+ @org.junit.Test
+ public void testGenerateConversationAndRoleNotNull2() {
+
+ ContractGenerator generator=ContractGeneratorFactory.getContractGenerator();
+
+ try {
+ Protocol conv=new Protocol();
+ conv.setRole(new Role());
+ conv.setName("LocatedProtocol");
+
+ generator.generate(conv);
+
+ } catch(IllegalArgumentException iae) {
+ fail("Should NOT have thrown IllegalArgumentException");
+ }
+ }
+}
Added: branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/savara/contract/generator/impl/ContractIntrospectorTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/savara/contract/generator/impl/ContractIntrospectorTest.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/savara/contract/generator/impl/ContractIntrospectorTest.java 2011-01-08 23:39:18 UTC (rev 563)
@@ -0,0 +1,286 @@
+/*
+ * JBoss, Home of Professional Open Source.
+ * Copyright 2006, Red Hat Middleware LLC, and individual contributors
+ * as indicated by the @author tags. See the copyright.txt file in the
+ * distribution for a full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.savara.contract.generator.impl;
+
+import org.savara.common.model.util.PropertyName;
+import org.savara.contract.model.Contract;
+import org.savara.contract.model.Interface;
+import org.savara.contract.model.MessageExchangePattern;
+import org.savara.contract.model.OneWayRequestMEP;
+import org.savara.contract.model.RequestResponseMEP;
+import org.savara.contract.model.Type;
+import org.savara.contract.generator.impl.ContractIntrospector;
+import org.scribble.protocol.model.Protocol;
+import org.scribble.protocol.model.Interaction;
+import org.scribble.protocol.model.ProtocolReference;
+import org.scribble.protocol.model.Run;
+import org.scribble.protocol.model.MessageSignature;
+import org.scribble.protocol.model.Role;
+import org.scribble.protocol.model.TypeReference;
+import org.scribble.protocol.util.InteractionUtil;
+
+import static org.junit.Assert.*;
+
+public class ContractIntrospectorTest {
+
+ private static final String MY_ROLE = "myRole";
+ private static final String TYPE_NS = "typeNS";
+ private static final String TYPE_LP = "typeLP";
+ private static final String OP_NAME = "opName";
+
+ @org.junit.Test
+ public void testNoSubProtocolWithoutRun() {
+ Role r=new Role();
+ r.setName("role");
+
+ Protocol top=new Protocol();
+ top.setName("top");
+ top.setRole(r);
+
+ Protocol mid=new Protocol();
+ mid.setName("mid");
+ mid.setRole(r);
+
+ Protocol sub=new Protocol();
+ sub.setName("sub");
+ sub.setRole(r);
+
+ ProtocolReference ref=new ProtocolReference();
+ ref.setName("sub");
+ ref.setRole(r);
+
+ Run run=new Run();
+ run.setProtocolReference(ref);
+
+ top.getBlock().getContents().add(mid);
+
+ mid.getBlock().getContents().add(run);
+ mid.getBlock().getContents().add(sub);
+
+ ContractIntrospector introspector=new ContractIntrospector(top);
+
+ introspector.process();
+
+ if (introspector.getProcessedProtocols().size() != 0) {
+ fail("Expecting 0 processed protocol, but got: "+introspector.getProcessedProtocols().size());
+ }
+ }
+
+ @org.junit.Test
+ public void testSubProtocolWithRun() {
+ Role r=new Role();
+ r.setName("role");
+
+ Protocol top=new Protocol();
+ top.setName("top");
+ top.setRole(r);
+
+ Protocol mid=new Protocol();
+ mid.setName("mid");
+ mid.setRole(r);
+
+ Protocol sub=new Protocol();
+ sub.setName("sub");
+ sub.setRole(r);
+
+ ProtocolReference ref1=new ProtocolReference();
+ ref1.setName("mid");
+ ref1.setRole(r);
+ ref1.setInner(true);
+
+ Run run1=new Run();
+ run1.setProtocolReference(ref1);
+
+ top.getBlock().getContents().add(run1);
+ top.getBlock().getContents().add(mid);
+
+ ProtocolReference ref2=new ProtocolReference();
+ ref2.setName("sub");
+ ref2.setRole(r);
+ ref2.setInner(true);
+
+ Run run2=new Run();
+ run2.setProtocolReference(ref2);
+
+ mid.getBlock().getContents().add(run2);
+ mid.getBlock().getContents().add(sub);
+
+ ContractIntrospector introspector=new ContractIntrospector(top);
+
+ introspector.process();
+
+ if (introspector.getProcessedProtocols().size() != 2) {
+ fail("Expecting 2 processed protocol, but got: "+introspector.getProcessedProtocols().size());
+ }
+
+ if (introspector.getProcessedProtocols().contains(mid) == false) {
+ fail("Should contain mid");
+ }
+
+ if (introspector.getProcessedProtocols().contains(sub) == false) {
+ fail("Should contain sub");
+ }
+ }
+
+ @org.junit.Test
+ public void testCreateSingleInterface() {
+ Protocol protocol=new Protocol();
+ Role role=new Role();
+ role.setName(MY_ROLE);
+ protocol.setRole(role);
+
+ ContractIntrospector introspector=new ContractIntrospector(protocol);
+
+ if (introspector.getContract().getInterfaces().size() != 0) {
+ fail("Should be 0 interfaces: "+introspector.getContract().getInterfaces().size());
+ }
+
+ Interface intf=introspector.getInterface();
+
+ if (intf == null) {
+ fail("Interface not created");
+ }
+
+ if (introspector.getContract().getInterfaces().size() != 1) {
+ fail("Should be 1 interface: "+introspector.getContract().getInterfaces().size());
+ }
+
+ Interface intf2=introspector.getInterface();
+
+ if (intf2 != intf) {
+ fail("Interfaces are different");
+ }
+
+ if (introspector.getContract().getInterfaces().size() != 1) {
+ fail("Should still only be 1 interface: "+introspector.getContract().getInterfaces().size());
+ }
+ }
+
+ @org.junit.Test
+ public void testVisitInteractionOneWayRequestRPC() {
+ Protocol protocol=new Protocol();
+ Role role=new Role();
+ role.setName(MY_ROLE);
+ protocol.setRole(role);
+
+ ContractIntrospector introspector=new ContractIntrospector(protocol);
+
+ Interaction interaction=new Interaction();
+
+ MessageSignature msig=new MessageSignature();
+ msig.setOperation(OP_NAME);
+
+ TypeReference tref=new TypeReference();
+ tref.setName(TYPE_LP);
+ //tref.setNamespace(TYPE_NS);
+ msig.getTypeReferences().add(tref);
+
+ interaction.setMessageSignature(msig);
+ interaction.setFromRole(new Role());
+
+ introspector.accept(interaction);
+
+ Contract contract=introspector.getContract();
+
+ Interface intf=contract.getInterface(role.getName());
+
+ if (intf == null) {
+ fail("Interface '"+role.getName()+"' not found");
+ }
+
+ MessageExchangePattern mep=intf.getMessageExchangePatternForOperation(OP_NAME);
+
+ if (mep == null) {
+ fail("Operation '"+OP_NAME+"' not found");
+ }
+
+ if ((mep instanceof OneWayRequestMEP) == false) {
+ fail("Not a oneway request");
+ }
+
+ if (mep.getTypes().size() != 1) {
+ fail("One type expected, but got: "+mep.getTypes().size());
+ }
+
+ Type t=mep.getTypes().get(0);
+
+ if (t.getName().equals(TYPE_LP) == false) {
+ fail("Type name not correct: "+t.getName());
+ }
+ }
+
+
+ @org.junit.Test
+ public void testVisitInteractionRequestResponseRPCOnlyRequest() {
+ Protocol protocol=new Protocol();
+ Role role=new Role();
+ role.setName(MY_ROLE);
+ protocol.setRole(role);
+
+ ContractIntrospector introspector=new ContractIntrospector(protocol);
+
+ Interaction interaction=new Interaction();
+
+ MessageSignature msig=new MessageSignature();
+ msig.setOperation(OP_NAME);
+
+ TypeReference tref=new TypeReference();
+ tref.setName(TYPE_LP);
+ //tref.setNamespace(TYPE_NS);
+ msig.getTypeReferences().add(tref);
+
+ interaction.setMessageSignature(msig);
+ interaction.setFromRole(new Role());
+
+ interaction.getProperties().put(PropertyName.REQUEST_LABEL, "label");
+
+ introspector.accept(interaction);
+
+ Contract contract=introspector.getContract();
+
+ Interface intf=contract.getInterface(role.getName());
+
+ if (intf == null) {
+ fail("Interface '"+role.getName()+"' not found");
+ }
+
+ MessageExchangePattern mep=intf.getMessageExchangePatternForOperation(OP_NAME);
+
+ if (mep == null) {
+ fail("Operation '"+OP_NAME+"' not found");
+ }
+
+ if ((mep instanceof RequestResponseMEP) == false) {
+ fail("Not a request/response MEP");
+ }
+
+ if (mep.getTypes().size() != 1) {
+ fail("One type expected, but got: "+mep.getTypes().size());
+ }
+
+ Type t=mep.getTypes().get(0);
+
+ if (t.getName().equals(TYPE_LP) == false) {
+ fail("Type name not correct: "+t.getName());
+ }
+ }
+}
Property changes on: branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature
___________________________________________________________________
Name: svn:ignore
+ target
Modified: branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature/pom.xml 2011-01-08 20:53:26 UTC (rev 562)
+++ branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature/pom.xml 2011-01-08 23:39:18 UTC (rev 563)
@@ -35,6 +35,11 @@
<version>${savara.version}</version>
</dependency>
<dependency>
+ <groupId>org.savara.bundles</groupId>
+ <artifactId>org.savara.pi4soa.cdm</artifactId>
+ <version>${savara.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.scribble.bundles</groupId>
<artifactId>org.scribble.protocol</artifactId>
<version>${scribble.version}</version>
Property changes on: branches/experimental/2.0.x/tools/features/org.savara.tools.feature
___________________________________________________________________
Name: svn:ignore
+ target
Modified: branches/experimental/2.0.x/tools/features/org.savara.tools.feature/feature.xml
===================================================================
--- branches/experimental/2.0.x/tools/features/org.savara.tools.feature/feature.xml 2011-01-08 20:53:26 UTC (rev 562)
+++ branches/experimental/2.0.x/tools/features/org.savara.tools.feature/feature.xml 2011-01-08 23:39:18 UTC (rev 563)
@@ -187,13 +187,6 @@
unpack="false"/>
<plugin
- id="org.savara.protocol.contract"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
id="org.savara.common"
download-size="0"
install-size="0"
@@ -256,6 +249,7 @@
version="0.0.0"
unpack="false"/>
+<!--
<plugin
id="org.savara.tap.eclipse"
download-size="0"
@@ -276,5 +270,6 @@
install-size="0"
version="0.0.0"
unpack="false"/>
+-->
</feature>
Modified: branches/experimental/2.0.x/tools/features/org.savara.tools.feature/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/features/org.savara.tools.feature/pom.xml 2011-01-08 20:53:26 UTC (rev 562)
+++ branches/experimental/2.0.x/tools/features/org.savara.tools.feature/pom.xml 2011-01-08 23:39:18 UTC (rev 563)
@@ -54,11 +54,6 @@
<artifactId>org.savara.tools.wsdl</artifactId>
<version>${savara.version}</version>
</dependency>
- <dependency>
- <groupId>org.savara.tools</groupId>
- <artifactId>org.savara.protocol.contract</artifactId>
- <version>${savara.version}</version>
- </dependency>
</dependencies>
</project>
Property changes on: branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor
___________________________________________________________________
Name: svn:ignore
- classes
+ classes
target
Property changes on: branches/experimental/2.0.x/tools/plugins/org.savara.tools.validator
___________________________________________________________________
Name: svn:ignore
- bin
+ bin
target
Modified: branches/experimental/2.0.x/tools/plugins/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/plugins/pom.xml 2011-01-08 20:53:26 UTC (rev 562)
+++ branches/experimental/2.0.x/tools/plugins/pom.xml 2011-01-08 23:39:18 UTC (rev 563)
@@ -16,7 +16,6 @@
<modules>
<!--
- <module>org.savara.protocol.contract</module>
<module>org.savara.tap.eclipse</module>
<module>org.savara.tap.model</module>
<module>org.savara.tap.validation</module>
Modified: branches/experimental/2.0.x/tools/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/pom.xml 2011-01-08 20:53:26 UTC (rev 562)
+++ branches/experimental/2.0.x/tools/pom.xml 2011-01-08 23:39:18 UTC (rev 563)
@@ -114,7 +114,7 @@
</repository>
<repository>
<id>pi4soa</id>
- <url>http://download.jboss.org/jbosstools/builds/staging/pi4soa/all/repo/</url>
+ <url>http://download.jboss.org/jbosstools/builds/staging/jbosstools-pi4soa-3.1...</url>
<layout>p2</layout>
<snapshots>
<enabled>true</enabled>
@@ -124,6 +124,17 @@
</releases>
</repository>
<repository>
+ <id>scribble</id>
+ <url>http://download.jboss.org/jbosstools/builds/staging/scribble/all/</url>
+ <layout>p2</layout>
+ <snapshots>
+ <enabled>true</enabled>
+ </snapshots>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </repository>
+ <repository>
<id>eclipse-helios</id>
<url>http://download.eclipse.org/releases/helios</url>
<layout>p2</layout>
Property changes on: branches/experimental/2.0.x/tools/site
___________________________________________________________________
Name: svn:ignore
+ target
Modified: branches/experimental/2.0.x/tools/site/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/site/pom.xml 2011-01-08 20:53:26 UTC (rev 562)
+++ branches/experimental/2.0.x/tools/site/pom.xml 2011-01-08 23:39:18 UTC (rev 563)
@@ -34,6 +34,11 @@
<artifactId>org.savara.contract</artifactId>
<version>${savara.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.savara.bundles</groupId>
+ <artifactId>org.savara.pi4soa.cdm</artifactId>
+ <version>${savara.version}</version>
+ </dependency>
<dependency>
<groupId>org.scribble.bundles</groupId>
<artifactId>org.scribble.common</artifactId>
Modified: branches/experimental/2.0.x/tools/tests/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/tests/pom.xml 2011-01-08 20:53:26 UTC (rev 562)
+++ branches/experimental/2.0.x/tools/tests/pom.xml 2011-01-08 23:39:18 UTC (rev 563)
@@ -15,7 +15,6 @@
</parent>
<modules>
- <module>org.savara.protocol.contract.tests</module>
</modules>
</project>
13 years, 5 months
- 1
- 0
savara SVN: r562 - branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/tools/wsdl.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-01-08 15:53:26 -0500 (Sat, 08 Jan 2011)
New Revision: 562
Removed:
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/tools/wsdl/tests/
Log:
13 years, 5 months
- 1
- 0
savara SVN: r561 - in branches/experimental/2.0.x: bundles/org.savara.bpel.tests and 9 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-01-08 15:51:39 -0500 (Sat, 08 Jan 2011)
New Revision: 561
Added:
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/wsdl/
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/wsdl/generator/
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/wsdl/generator/WSDLGeneratorTest.java
Removed:
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/wsdl/generator/WSDLGeneratorTest.java
Modified:
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/pom.xml
branches/experimental/2.0.x/bundles/org.savara.bpel/pom.xml
branches/experimental/2.0.x/bundles/org.savara.contract/pom.xml
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/pom.xml
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/main/java/org/savara/wsdl/generator/impl/WSDLGeneratorImpl.java
branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature/pom.xml
branches/experimental/2.0.x/tools/features/org.savara.tools.feature/feature.xml
branches/experimental/2.0.x/tools/features/org.savara.tools.feature/pom.xml
branches/experimental/2.0.x/tools/site/pom.xml
Log:
Updates to get the maven build of the main distribution working again.
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/pom.xml
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/pom.xml 2011-01-07 23:15:35 UTC (rev 560)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/pom.xml 2011-01-08 20:51:39 UTC (rev 561)
@@ -31,7 +31,7 @@
</dependency>
<dependency>
<groupId>org.savara.bundles</groupId>
- <artifactId>org.savara.core</artifactId>
+ <artifactId>org.savara.common</artifactId>
<version>${savara.version}</version>
</dependency>
<dependency>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/pom.xml
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/pom.xml 2011-01-07 23:15:35 UTC (rev 560)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/pom.xml 2011-01-08 20:51:39 UTC (rev 561)
@@ -36,7 +36,7 @@
</dependency>
<dependency>
<groupId>org.savara.bundles</groupId>
- <artifactId>org.savara.core</artifactId>
+ <artifactId>org.savara.common</artifactId>
<version>${savara.version}</version>
</dependency>
<dependency>
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/pom.xml
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/pom.xml 2011-01-07 23:15:35 UTC (rev 560)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/pom.xml 2011-01-08 20:51:39 UTC (rev 561)
@@ -24,6 +24,11 @@
<artifactId>org.scribble.protocol</artifactId>
<version>${scribble.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.savara.bundles</groupId>
+ <artifactId>org.savara.common</artifactId>
+ <version>${savara.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.osgi.core</artifactId>
Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/pom.xml
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/pom.xml 2011-01-07 23:15:35 UTC (rev 560)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/pom.xml 2011-01-08 20:51:39 UTC (rev 561)
@@ -31,7 +31,7 @@
</dependency>
<dependency>
<groupId>org.savara.bundles</groupId>
- <artifactId>org.savara.core</artifactId>
+ <artifactId>org.savara.common</artifactId>
<version>${savara.version}</version>
</dependency>
<dependency>
Modified: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/main/java/org/savara/wsdl/generator/impl/WSDLGeneratorImpl.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/main/java/org/savara/wsdl/generator/impl/WSDLGeneratorImpl.java 2011-01-07 23:15:35 UTC (rev 560)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/main/java/org/savara/wsdl/generator/impl/WSDLGeneratorImpl.java 2011-01-08 20:51:39 UTC (rev 561)
@@ -498,7 +498,7 @@
if (td != null && TypeSystem.XSD.equals(td.getTypeSystem())) {
javax.xml.namespace.QName qname=
- new javax.xml.namespace.QName(td.getDataType());
+ javax.xml.namespace.QName.valueOf(td.getDataType());
javax.wsdl.Definition defn=
getDefinition(wsdls, contract, msgname.getNamespaceURI(), wsdlBinding);
Copied: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/wsdl/generator (from rev 558, branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/tools/wsdl/tests)
Deleted: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/wsdl/generator/WSDLGeneratorTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/tools/wsdl/tests/WSDLGeneratorTest.java 2011-01-07 20:02:45 UTC (rev 558)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/wsdl/generator/WSDLGeneratorTest.java 2011-01-08 20:51:39 UTC (rev 561)
@@ -1,591 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.savara.tools.wsdl.tests;
-
-import javax.wsdl.Part;
-import javax.xml.namespace.QName;
-
-import org.savara.contract.model.*;
-import org.savara.wsdl.generator.WSDLGenerator;
-import org.savara.wsdl.generator.WSDLGeneratorFactory;
-import org.savara.wsdl.generator.impl.WSDLGeneratorImpl;
-
-import junit.framework.TestCase;
-
-public class WSDLGeneratorTest extends TestCase {
-
- private static final String TEST_LOCALPART = "test.localpart";
- private static final String HTTP_TEST_NAMESPACE = "http://test.namespace";
- private static final String TEST_TYPE_NS = "testTypeNS";
- private static final String TEST_TYPE_LP = "testTypeLP";
- private static final String TEST_NAME_SPACE = "testNameSpace";
- private static final String TEST_NAME_SPACE2 = "testNameSpace2";
- private static final String TEST_NAME_SPACE3 = "testNameSpace3";
- private static final String TEST_NAME = "testName";
-
- public void testDefnNameAndNamespace() {
-
- Contract c=new Contract();
-
- c.setName(TEST_NAME);
- c.setNamespace(TEST_NAME_SPACE);
-
- WSDLGeneratorImpl gen=new WSDLGeneratorImpl();
-
- java.util.List<javax.wsdl.Definition> defns=gen.generate(c, null);
-
- if (defns.size() != 1) {
- fail("Only one Definition found: "+defns.size());
- }
-
- javax.wsdl.Definition defn=defns.get(0);
-
- if (defn.getTargetNamespace() == null) {
- fail("Target namespace not set");
- }
-
- if (TEST_NAME_SPACE.equals(defn.getTargetNamespace()) == false) {
- fail("Target namespace not correct: "+defn.getTargetNamespace());
- }
-
- if (defn.getQName() == null) {
- fail("QName not set");
- }
-
- if (defn.getQName().getLocalPart() == null) {
- fail("QName localpart not set");
- }
-
- if (TEST_NAME.equals(defn.getQName().getLocalPart()) == false) {
- fail("QName localpart not correct: "+defn.getQName().getLocalPart());
- }
- }
-
- public void testPortTypeNameAndNamespace() {
- Interface src=new Interface();
-
- src.setName(TEST_NAME);
- src.setNamespace(TEST_NAME_SPACE);
-
- WSDLGeneratorImpl gen=new WSDLGeneratorImpl();
-
- java.util.List<javax.wsdl.Definition> defns=new java.util.Vector<javax.wsdl.Definition>();
-
- javax.wsdl.PortType result=gen.createPortType(defns, new Contract(), src, null);
-
- if (result == null) {
- fail("PortType is null");
- }
-
- if (result.getQName() == null) {
- fail("QName not set");
- }
-
- if (result.getQName().getNamespaceURI() == null) {
- fail("QName namespace not set");
- }
-
- if (TEST_NAME_SPACE.equals(result.getQName().getNamespaceURI()) == false) {
- fail("Namespace not correct: "+result.getQName().getNamespaceURI());
- }
-
- if (result.getQName().getLocalPart() == null) {
- fail("QName localpart not set");
- }
-
- if (TEST_NAME.equals(result.getQName().getLocalPart()) == false) {
- fail("QName localpart not correct: "+result.getQName().getLocalPart());
- }
- }
-
- public void testPortTypeBindingNameAndNamespace() {
- Interface src=new Interface();
-
- src.setName(TEST_NAME);
- src.setNamespace(TEST_NAME_SPACE);
-
- WSDLGeneratorImpl gen=new WSDLGeneratorImpl();
-
- java.util.List<javax.wsdl.Definition> defns=new java.util.Vector<javax.wsdl.Definition>();
-
- javax.wsdl.Binding result=gen.createBinding(defns, new Contract(), src, null, null);
-
- if (result == null) {
- fail("PortType is null");
- }
-
- if (result.getQName() == null) {
- fail("QName not set");
- }
-
- if (result.getQName().getNamespaceURI() == null) {
- fail("QName namespace not set");
- }
-
- if (TEST_NAME_SPACE.equals(result.getQName().getNamespaceURI()) == false) {
- fail("Namespace not correct: "+result.getQName().getNamespaceURI());
- }
-
- if (result.getQName().getLocalPart() == null) {
- fail("QName localpart not set");
- }
-
- if (result.getQName().getLocalPart().equals(TEST_NAME+WSDLGeneratorImpl.BINDING_SUFFIX) == false) {
- fail("QName localpart not correct: "+result.getQName().getLocalPart());
- }
- }
-
- public void testDefnWithPortTypesAndBindings() {
-
- Contract c=new Contract();
- c.setNamespace(TEST_NAME_SPACE);
-
- Interface i1=new Interface();
- i1.setName("I1");
- i1.setNamespace(TEST_NAME_SPACE);
-
- // Need to associate a message, to ensure port type
- // is generated
- OneWayRequestMEP m1=new OneWayRequestMEP();
-
- m1.setOperation(TEST_NAME);
-
- Type tref1=new Type();
- TypeDefinition ref1=new TypeDefinition();
- tref1.getTypeDefinitions().add(ref1);
- ref1.setName(TEST_TYPE_LP);
- ref1.setNamespace(TEST_NAME_SPACE);
- ref1.setTypeSystem(TypeDefinition.XSD_TYPE);
- m1.getTypes().add(tref1);
-
- i1.getMessageExchangePatterns().add(m1);
-
- Interface i2=new Interface();
- i2.setName("I2");
- i2.setNamespace(TEST_NAME_SPACE);
-
- OneWayRequestMEP m2=new OneWayRequestMEP();
-
- m2.setOperation(TEST_NAME);
-
- Type tref2=new Type();
- TypeDefinition ref2=new TypeDefinition();
- tref2.getTypeDefinitions().add(ref1);
- ref2.setName(TEST_TYPE_LP);
- ref2.setNamespace(TEST_NAME_SPACE);
- ref2.setTypeSystem(TypeDefinition.XSD_TYPE);
- m2.getTypes().add(tref2);
-
- i2.getMessageExchangePatterns().add(m2);
-
- Interface i3=new Interface();
- i3.setName("I3");
- i3.setNamespace(TEST_NAME_SPACE);
-
- OneWayRequestMEP m3=new OneWayRequestMEP();
-
- m3.setOperation(TEST_NAME);
-
- Type tref3=new Type();
- TypeDefinition ref3=new TypeDefinition();
- tref3.getTypeDefinitions().add(ref1);
- ref3.setName(TEST_TYPE_LP);
- ref3.setNamespace(TEST_NAME_SPACE);
- ref3.setTypeSystem(TypeDefinition.XSD_TYPE);
- m3.getTypes().add(tref3);
-
- i3.getMessageExchangePatterns().add(m3);
-
- c.getInterfaces().add(i1);
- c.getInterfaces().add(i2);
- c.getInterfaces().add(i3);
-
- WSDLGeneratorImpl gen=new WSDLGeneratorImpl();
-
- java.util.List<javax.wsdl.Definition> defns=gen.generate(c, null);
-
- if (defns.size() != 1) {
- fail("Only one Definition found: "+defns.size());
- }
-
- javax.wsdl.Definition defn=defns.get(0);
-
- if (defn.getPortTypes().size() != c.getInterfaces().size()) {
- fail("Number of port types ("+defn.getPortTypes().size()+
- ") does not match number of interfaces ("+
- c.getInterfaces().size()+")");
- }
-
- if (defn.getBindings().size() != c.getInterfaces().size()) {
- fail("Number of port type bindings ("+defn.getBindings().size()+
- ") does not match number of interfaces ("+
- c.getInterfaces().size()+")");
- }
- }
-
- public void testOperationOneWay() {
- javax.wsdl.Definition defn=null;
- try {
- javax.wsdl.factory.WSDLFactory fact=
- javax.wsdl.factory.WSDLFactory.newInstance();
-
- defn = fact.newDefinition();
-
- } catch(Exception e) {
- fail("Failed to get definition");
- }
-
- OneWayRequestMEP src=new OneWayRequestMEP();
-
- src.setOperation(TEST_NAME);
-
- Type tref=new Type();
- TypeDefinition ref=new TypeDefinition();
- tref.getTypeDefinitions().add(ref);
- ref.setName(TEST_TYPE_LP);
- ref.setNamespace(TEST_TYPE_NS);
- ref.setTypeSystem(TypeDefinition.XSD_TYPE);
- tref.setName(ref.getName());
- src.getTypes().add(tref);
-
- WSDLGeneratorImpl gen=new WSDLGeneratorImpl();
-
- java.util.List<javax.wsdl.Definition> defns=new java.util.Vector<javax.wsdl.Definition>();
- defns.add(defn);
-
- defn.setTargetNamespace(TEST_NAME_SPACE);
-
- javax.wsdl.PortType ptype=defn.createPortType();
- ptype.setQName(new javax.xml.namespace.QName(TEST_NAME_SPACE, TEST_NAME));
-
- javax.wsdl.Operation result=gen.createOperation(defns, new Contract(), ptype, src, null);
-
- if (result == null) {
- fail("Operation is null");
- }
-
- if (TEST_NAME.equals(result.getName()) == false) {
- fail("Operation name mismatch: "+result.getName());
- }
-
- if (result.getInput() == null) {
- fail("Input not set");
- }
-
- if (result.getOutput() != null) {
- fail("Output should NOT be set");
- }
-
- if (result.getFaults().size() != 0) {
- fail("Faults should NOT be defined");
- }
- }
-
- public void testOperationReqRespFaults() {
- javax.wsdl.Definition defn=null;
- try {
- javax.wsdl.factory.WSDLFactory fact=
- javax.wsdl.factory.WSDLFactory.newInstance();
-
- defn = fact.newDefinition();
-
- } catch(Exception e) {
- fail("Failed to get definition");
- }
-
- RequestResponseMEP src=new RequestResponseMEP();
-
- src.setOperation(TEST_NAME);
-
- Type tref1=new Type();
- TypeDefinition ref1=new TypeDefinition();
- tref1.getTypeDefinitions().add(ref1);
- ref1.setName(TEST_TYPE_LP);
- ref1.setNamespace(TEST_TYPE_NS);
- ref1.setTypeSystem(TypeDefinition.XSD_TYPE);
- src.getTypes().add(tref1);
-
- Type tref2=new Type();
- TypeDefinition ref2=new TypeDefinition();
- tref2.getTypeDefinitions().add(ref2);
- ref2.setName(TEST_TYPE_LP);
- ref2.setNamespace(TEST_TYPE_NS);
- ref2.setTypeSystem(TypeDefinition.XSD_TYPE);
- src.getResponseTypes().add(tref2);
-
- FaultDetails fd1=new FaultDetails();
- fd1.setName("faultName1");
-
- Type tref3=new Type();
- TypeDefinition ref3=new TypeDefinition();
- tref3.getTypeDefinitions().add(ref3);
- ref3.setName(TEST_TYPE_LP);
- ref3.setNamespace(TEST_TYPE_NS);
- ref3.setTypeSystem(TypeDefinition.XSD_TYPE);
- fd1.getTypes().add(tref3);
-
- src.getFaultDetails().add(fd1);
-
- FaultDetails fd2=new FaultDetails();
- fd2.setName("faultName2");
-
- Type tref4=new Type();
- TypeDefinition ref4=new TypeDefinition();
- tref4.getTypeDefinitions().add(ref4);
- ref4.setName(TEST_TYPE_LP);
- ref4.setNamespace(TEST_TYPE_NS);
- ref4.setTypeSystem(TypeDefinition.XSD_TYPE);
- fd2.getTypes().add(tref4);
-
- src.getFaultDetails().add(fd2);
-
- WSDLGeneratorImpl gen=new WSDLGeneratorImpl();
-
- java.util.List<javax.wsdl.Definition> defns=new java.util.Vector<javax.wsdl.Definition>();
- defns.add(defn);
-
- defn.setTargetNamespace(TEST_NAME_SPACE);
-
- javax.wsdl.PortType ptype=defn.createPortType();
- ptype.setQName(new javax.xml.namespace.QName(TEST_NAME_SPACE, TEST_NAME));
-
- javax.wsdl.Operation result=gen.createOperation(defns, new Contract(), ptype, src, null);
-
- if (result == null) {
- fail("Operation is null");
- }
-
- if (TEST_NAME.equals(result.getName()) == false) {
- fail("Operation name mismatch: "+result.getName());
- }
-
- if (result.getInput() == null) {
- fail("Input not set");
- }
-
- if (result.getOutput() == null) {
- fail("Output not set");
- }
-
- if (result.getFaults().size() != src.getFaultDetails().size()) {
- fail("Faults number ("+result.getFaults().size()+
- ") does not match contract ("+src.getFaultDetails().size()+")");
- }
- }
-
- public void testMessage() {
- javax.wsdl.Definition defn=null;
- try {
- javax.wsdl.factory.WSDLFactory fact=
- javax.wsdl.factory.WSDLFactory.newInstance();
-
- defn = fact.newDefinition();
-
- } catch(Exception e) {
- fail("Failed to get definition");
- }
-
- TypeDefinition src=new TypeDefinition();
- src.setName(TEST_TYPE_LP);
- src.setNamespace(TEST_TYPE_NS);
- src.setTypeSystem(TypeDefinition.XSD_TYPE);
-
- Type t=new Type();
- t.getTypeDefinitions().add(src);
-
- java.util.List<Type> refs=new java.util.Vector<Type>();
- refs.add(t);
-
- WSDLGeneratorImpl gen=new WSDLGeneratorImpl();
-
- java.util.List<javax.wsdl.Definition> defns=new java.util.Vector<javax.wsdl.Definition>();
-
- QName msgname=new QName(HTTP_TEST_NAMESPACE,TEST_LOCALPART);
-
- javax.wsdl.Message result=gen.getMessage(defns, new Contract(), msgname, refs, null);
-
- if (result == null) {
- fail("Message is null");
- }
-
- if (result.getQName() == null) {
- fail("QName not set");
- }
-
- if (result.getQName().getLocalPart() == null) {
- fail("QName localpart not set");
- }
-
- if (TEST_LOCALPART.equals(result.getQName().getLocalPart()) == false) {
- fail("QName localpart not correct: "+result.getQName().getLocalPart());
- }
-
- if (result.getQName().getNamespaceURI() == null) {
- fail("QName namespace not set");
- }
-
- if (HTTP_TEST_NAMESPACE.equals(result.getQName().getNamespaceURI()) == false) {
- fail("QName namespace not correct: "+result.getQName().getNamespaceURI());
- }
-
- if (result.getParts().size() != 1) {
- fail("Should be one part: "+result.getParts().size());
- }
-
- Part part=(Part)result.getParts().values().toArray()[0];
-
- if (part.getElementName() != null) {
- fail("Element name should not be set");
- }
-
- if (part.getTypeName() == null) {
- fail("Type name not set");
- }
-
- if (TEST_TYPE_NS.equals(part.getTypeName().getNamespaceURI()) == false) {
- fail("Element namespace incorrect: "+part.getTypeName().getNamespaceURI());
- }
-
- if (TEST_TYPE_LP.equals(part.getTypeName().getLocalPart()) == false) {
- fail("Element localpart incorrect: "+part.getTypeName().getLocalPart());
- }
- }
-
- public void testDefnWithPortTypesAndMesgsInDiffNamespaces() {
-
- Contract c=new Contract();
- c.setNamespace(TEST_NAME_SPACE);
-
- Interface i1=new Interface();
- i1.setName("I1");
- i1.setNamespace(TEST_NAME_SPACE);
-
- // Need to associate a message, to ensure port type
- // is generated
- OneWayRequestMEP m1=new OneWayRequestMEP();
-
- m1.setOperation(TEST_NAME);
-
- Type tref1=new Type();
- TypeDefinition ref1=new TypeDefinition();
- tref1.getTypeDefinitions().add(ref1);
- ref1.setName(TEST_TYPE_LP);
- ref1.setNamespace(TEST_NAME_SPACE);
- ref1.setTypeSystem(TypeDefinition.XSD_TYPE);
- m1.getTypes().add(tref1);
-
- i1.getMessageExchangePatterns().add(m1);
-
- Interface i2=new Interface();
- i2.setName("I2");
- i2.setNamespace(TEST_NAME_SPACE2);
-
- OneWayRequestMEP m2=new OneWayRequestMEP();
-
- m2.setOperation(TEST_NAME);
-
- Type tref2=new Type();
- TypeDefinition ref2=new TypeDefinition();
- tref2.getTypeDefinitions().add(ref2);
- ref2.setName(TEST_TYPE_LP);
- ref2.setNamespace(TEST_NAME_SPACE2);
- ref2.setTypeSystem(TypeDefinition.XSD_TYPE);
- m2.getTypes().add(tref2);
-
- i2.getMessageExchangePatterns().add(m2);
-
- Interface i3=new Interface();
- i3.setName("I3");
- i3.setNamespace(TEST_NAME_SPACE2);
-
- OneWayRequestMEP m3=new OneWayRequestMEP();
-
- m3.setOperation(TEST_NAME);
-
- Type tref3=new Type();
- TypeDefinition ref3=new TypeDefinition();
- tref3.getTypeDefinitions().add(ref3);
- ref3.setName(TEST_TYPE_LP);
- ref3.setNamespace(TEST_NAME_SPACE3);
- ref3.setTypeSystem(TypeDefinition.XSD_TYPE);
- m3.getTypes().add(tref3);
-
- i3.getMessageExchangePatterns().add(m3);
-
- c.getInterfaces().add(i1);
- c.getInterfaces().add(i2);
- c.getInterfaces().add(i3);
-
- WSDLGeneratorImpl gen=new WSDLGeneratorImpl();
-
- java.util.List<javax.wsdl.Definition> defns=gen.generate(c, null);
-
- if (defns.size() != 2) {
- fail("Two Definitions expected, but got: "+defns.size());
- }
-
- javax.wsdl.Definition defn1=defns.get(0);
-
- if (defn1.getPortTypes().size() != 1) {
- fail("1: Number of port types ("+defn1.getPortTypes().size()+
- ") does not match number expected (1)");
- }
-
- if (defn1.getBindings().size() != 1) {
- fail("1: Number of port type bindings ("+defn1.getBindings().size()+
- ") does not match number expected (1)");
- }
-
- if (defn1.getMessages().size() != 1) {
- fail("1: Number of message ("+defn1.getMessages().size()+
- ") does not match number expected (1)");
- }
-
- javax.wsdl.Definition defn2=defns.get(1);
-
- if (defn2.getPortTypes().size() != 2) {
- fail("2: Number of port types ("+defn2.getPortTypes().size()+
- ") does not match number expected (2)");
- }
-
- if (defn2.getBindings().size() != 2) {
- fail("2: Number of port type bindings ("+defn2.getBindings().size()+
- ") does not match number expected (2)");
- }
-
- if (defn2.getMessages().size() != 1) {
- fail("2: Number of message ("+defn2.getMessages().size()+
- ") does not match number expected (1)");
- }
-
- // Check service only associated with the first defn
- if (defn1.getServices().size() != 1) {
- fail("First definition should only have 1 service: "+defn1.getServices().size());
- }
-
- javax.wsdl.Service s=(javax.wsdl.Service)
- defn1.getServices().values().iterator().next();
- if (s.getPorts().size() != 3) {
- fail("Should be 3 ports: "+s.getPorts().size());
- }
-
- if (defn2.getServices().size() != 0) {
- fail("Second definition should not have any services: "+defn2.getServices().size());
- }
- }
-}
Copied: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/wsdl/generator/WSDLGeneratorTest.java (from rev 560, branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/tools/wsdl/tests/WSDLGeneratorTest.java)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/wsdl/generator/WSDLGeneratorTest.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/wsdl/generator/WSDLGeneratorTest.java 2011-01-08 20:51:39 UTC (rev 561)
@@ -0,0 +1,686 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.savara.wsdl.generator;
+
+import javax.wsdl.Part;
+import javax.xml.namespace.QName;
+
+import org.savara.common.model.util.PropertyName;
+import org.savara.common.model.util.TypeSystem;
+import org.savara.contract.model.*;
+import org.savara.wsdl.generator.WSDLGenerator;
+import org.savara.wsdl.generator.WSDLGeneratorFactory;
+import org.savara.wsdl.generator.impl.WSDLGeneratorImpl;
+
+import junit.framework.TestCase;
+
+public class WSDLGeneratorTest extends TestCase {
+
+ private static final String TEST_LOCALPART = "test.localpart";
+ private static final String HTTP_TEST_NAMESPACE = "http://test.namespace";
+ private static final String TEST_TYPE_NS = "testTypeNS";
+ private static final String TEST_TYPE_LP = "testTypeLP";
+ private static final String TEST_TYPE_LP2 = "testTypeLP2";
+ private static final String TEST_TYPE_LP3 = "testTypeLP3";
+ private static final String TEST_NAME_SPACE = "testNameSpace";
+ private static final String TEST_NAME_SPACE2 = "testNameSpace2";
+ private static final String TEST_NAME_SPACE3 = "testNameSpace3";
+ private static final String TEST_NAME = "testName";
+
+ public void testDefnNameAndNamespace() {
+
+ Contract c=new Contract();
+
+ c.setName(TEST_NAME);
+ c.setNamespace(TEST_NAME_SPACE);
+
+ WSDLGeneratorImpl gen=new WSDLGeneratorImpl();
+
+ java.util.List<javax.wsdl.Definition> defns=gen.generate(c, null);
+
+ if (defns.size() != 1) {
+ fail("Only one Definition found: "+defns.size());
+ }
+
+ javax.wsdl.Definition defn=defns.get(0);
+
+ if (defn.getTargetNamespace() == null) {
+ fail("Target namespace not set");
+ }
+
+ if (TEST_NAME_SPACE.equals(defn.getTargetNamespace()) == false) {
+ fail("Target namespace not correct: "+defn.getTargetNamespace());
+ }
+
+ if (defn.getQName() == null) {
+ fail("QName not set");
+ }
+
+ if (defn.getQName().getLocalPart() == null) {
+ fail("QName localpart not set");
+ }
+
+ if (TEST_NAME.equals(defn.getQName().getLocalPart()) == false) {
+ fail("QName localpart not correct: "+defn.getQName().getLocalPart());
+ }
+ }
+
+ public void testPortTypeNameAndNamespace() {
+ Interface src=new Interface();
+
+ src.setName(TEST_NAME);
+ src.setNamespace(TEST_NAME_SPACE);
+
+ WSDLGeneratorImpl gen=new WSDLGeneratorImpl();
+
+ java.util.List<javax.wsdl.Definition> defns=new java.util.Vector<javax.wsdl.Definition>();
+
+ javax.wsdl.PortType result=gen.createPortType(defns, new Contract(), src, null);
+
+ if (result == null) {
+ fail("PortType is null");
+ }
+
+ if (result.getQName() == null) {
+ fail("QName not set");
+ }
+
+ if (result.getQName().getNamespaceURI() == null) {
+ fail("QName namespace not set");
+ }
+
+ if (TEST_NAME_SPACE.equals(result.getQName().getNamespaceURI()) == false) {
+ fail("Namespace not correct: "+result.getQName().getNamespaceURI());
+ }
+
+ if (result.getQName().getLocalPart() == null) {
+ fail("QName localpart not set");
+ }
+
+ if (TEST_NAME.equals(result.getQName().getLocalPart()) == false) {
+ fail("QName localpart not correct: "+result.getQName().getLocalPart());
+ }
+ }
+
+ public void testPortTypeBindingNameAndNamespace() {
+ Interface src=new Interface();
+
+ src.setName(TEST_NAME);
+ src.setNamespace(TEST_NAME_SPACE);
+
+ WSDLGeneratorImpl gen=new WSDLGeneratorImpl();
+
+ java.util.List<javax.wsdl.Definition> defns=new java.util.Vector<javax.wsdl.Definition>();
+
+ javax.wsdl.Binding result=gen.createBinding(defns, new Contract(), src, null, null);
+
+ if (result == null) {
+ fail("PortType is null");
+ }
+
+ if (result.getQName() == null) {
+ fail("QName not set");
+ }
+
+ if (result.getQName().getNamespaceURI() == null) {
+ fail("QName namespace not set");
+ }
+
+ if (TEST_NAME_SPACE.equals(result.getQName().getNamespaceURI()) == false) {
+ fail("Namespace not correct: "+result.getQName().getNamespaceURI());
+ }
+
+ if (result.getQName().getLocalPart() == null) {
+ fail("QName localpart not set");
+ }
+
+ if (result.getQName().getLocalPart().equals(TEST_NAME+WSDLGeneratorImpl.BINDING_SUFFIX) == false) {
+ fail("QName localpart not correct: "+result.getQName().getLocalPart());
+ }
+ }
+
+ public void testDefnWithPortTypesAndBindings() {
+
+ Contract c=new Contract();
+ c.setNamespace(TEST_NAME_SPACE);
+
+ Interface i1=new Interface();
+ i1.setName("I1");
+ i1.setNamespace(TEST_NAME_SPACE);
+
+ // Need to associate a message, to ensure port type
+ // is generated
+ OneWayRequestMEP m1=new OneWayRequestMEP();
+
+ m1.setOperation(TEST_NAME);
+
+ Type tref1=new Type();
+ tref1.setName(TEST_TYPE_LP);
+ m1.getTypes().add(tref1);
+
+ TypeDefinition ref1=new TypeDefinition();
+ ref1.setName(TEST_TYPE_LP);
+ ref1.setDataType(new QName(TEST_NAME_SPACE,TEST_TYPE_LP).toString());
+ ref1.setTypeSystem(TypeSystem.XSD);
+ ref1.getProperties().put(PropertyName.XSD_TYPE, "true");
+ c.getTypeDefinitions().add(ref1);
+
+ i1.getMessageExchangePatterns().add(m1);
+
+ Interface i2=new Interface();
+ i2.setName("I2");
+ i2.setNamespace(TEST_NAME_SPACE);
+
+ OneWayRequestMEP m2=new OneWayRequestMEP();
+
+ m2.setOperation(TEST_NAME);
+
+ Type tref2=new Type();
+
+ /*
+ TypeDefinition ref2=new TypeDefinition();
+ tref2.getTypeDefinitions().add(ref1);
+ ref2.setName(TEST_TYPE_LP);
+ ref2.setNamespace(TEST_NAME_SPACE);
+ ref2.setTypeSystem(TypeDefinition.XSD_TYPE);
+ */
+
+ tref2.setName(TEST_TYPE_LP);
+ m2.getTypes().add(tref2);
+
+ i2.getMessageExchangePatterns().add(m2);
+
+ Interface i3=new Interface();
+ i3.setName("I3");
+ i3.setNamespace(TEST_NAME_SPACE);
+
+ OneWayRequestMEP m3=new OneWayRequestMEP();
+
+ m3.setOperation(TEST_NAME);
+
+ Type tref3=new Type();
+
+ /*
+ TypeDefinition ref3=new TypeDefinition();
+ tref3.getTypeDefinitions().add(ref1);
+ ref3.setName(TEST_TYPE_LP);
+ ref3.setNamespace(TEST_NAME_SPACE);
+ ref3.setTypeSystem(TypeDefinition.XSD_TYPE);
+ */
+
+ tref3.setName(TEST_TYPE_LP);
+ m3.getTypes().add(tref3);
+
+ i3.getMessageExchangePatterns().add(m3);
+
+ c.getInterfaces().add(i1);
+ c.getInterfaces().add(i2);
+ c.getInterfaces().add(i3);
+
+ WSDLGeneratorImpl gen=new WSDLGeneratorImpl();
+
+ java.util.List<javax.wsdl.Definition> defns=gen.generate(c, null);
+
+ if (defns.size() != 1) {
+ fail("Only one Definition found: "+defns.size());
+ }
+
+ javax.wsdl.Definition defn=defns.get(0);
+
+ if (defn.getPortTypes().size() != c.getInterfaces().size()) {
+ fail("Number of port types ("+defn.getPortTypes().size()+
+ ") does not match number of interfaces ("+
+ c.getInterfaces().size()+")");
+ }
+
+ if (defn.getBindings().size() != c.getInterfaces().size()) {
+ fail("Number of port type bindings ("+defn.getBindings().size()+
+ ") does not match number of interfaces ("+
+ c.getInterfaces().size()+")");
+ }
+ }
+
+ public void testOperationOneWay() {
+ javax.wsdl.Definition defn=null;
+ try {
+ javax.wsdl.factory.WSDLFactory fact=
+ javax.wsdl.factory.WSDLFactory.newInstance();
+
+ defn = fact.newDefinition();
+
+ } catch(Exception e) {
+ fail("Failed to get definition");
+ }
+
+ Contract c=new Contract();
+
+ OneWayRequestMEP src=new OneWayRequestMEP();
+
+ src.setOperation(TEST_NAME);
+
+ Type tref=new Type();
+
+ TypeDefinition ref=new TypeDefinition();
+ ref.setName(TEST_TYPE_LP);
+ ref.setDataType(new QName(TEST_TYPE_NS,TEST_TYPE_LP).toString());
+ ref.setTypeSystem(TypeSystem.XSD);
+ ref.getProperties().put(PropertyName.XSD_TYPE, "true");
+ c.getTypeDefinitions().add(ref);
+
+ /*
+ TypeDefinition ref=new TypeDefinition();
+ tref.getTypeDefinitions().add(ref);
+ ref.setName(TEST_TYPE_LP);
+ ref.setNamespace(TEST_TYPE_NS);
+ ref.setTypeSystem(TypeDefinition.XSD_TYPE);
+ */
+ tref.setName(ref.getName());
+ src.getTypes().add(tref);
+
+ WSDLGeneratorImpl gen=new WSDLGeneratorImpl();
+
+ java.util.List<javax.wsdl.Definition> defns=new java.util.Vector<javax.wsdl.Definition>();
+ defns.add(defn);
+
+ defn.setTargetNamespace(TEST_NAME_SPACE);
+
+ javax.wsdl.PortType ptype=defn.createPortType();
+ ptype.setQName(new javax.xml.namespace.QName(TEST_NAME_SPACE, TEST_NAME));
+
+ javax.wsdl.Operation result=gen.createOperation(defns, c, ptype, src, null);
+
+ if (result == null) {
+ fail("Operation is null");
+ }
+
+ if (TEST_NAME.equals(result.getName()) == false) {
+ fail("Operation name mismatch: "+result.getName());
+ }
+
+ if (result.getInput() == null) {
+ fail("Input not set");
+ }
+
+ if (result.getOutput() != null) {
+ fail("Output should NOT be set");
+ }
+
+ if (result.getFaults().size() != 0) {
+ fail("Faults should NOT be defined");
+ }
+ }
+
+ public void testOperationReqRespFaults() {
+ javax.wsdl.Definition defn=null;
+ try {
+ javax.wsdl.factory.WSDLFactory fact=
+ javax.wsdl.factory.WSDLFactory.newInstance();
+
+ defn = fact.newDefinition();
+
+ } catch(Exception e) {
+ fail("Failed to get definition");
+ }
+
+ Contract c=new Contract();
+
+ RequestResponseMEP src=new RequestResponseMEP();
+
+ src.setOperation(TEST_NAME);
+
+ Type tref1=new Type();
+
+ TypeDefinition ref1=new TypeDefinition();
+ ref1.setName(TEST_TYPE_LP);
+ ref1.setDataType(new QName(TEST_TYPE_NS,TEST_TYPE_LP).toString());
+ ref1.setTypeSystem(TypeSystem.XSD);
+ ref1.getProperties().put(PropertyName.XSD_TYPE, "true");
+ c.getTypeDefinitions().add(ref1);
+
+ /*
+ TypeDefinition ref1=new TypeDefinition();
+ tref1.getTypeDefinitions().add(ref1);
+ ref1.setName(TEST_TYPE_LP);
+ ref1.setNamespace(TEST_TYPE_NS);
+ ref1.setTypeSystem(TypeDefinition.XSD_TYPE);
+ */
+ tref1.setName(TEST_TYPE_LP);
+ src.getTypes().add(tref1);
+
+ Type tref2=new Type();
+ /*
+ TypeDefinition ref2=new TypeDefinition();
+ tref2.getTypeDefinitions().add(ref2);
+ ref2.setName(TEST_TYPE_LP);
+ ref2.setNamespace(TEST_TYPE_NS);
+ ref2.setTypeSystem(TypeDefinition.XSD_TYPE);
+ */
+
+ tref2.setName(TEST_TYPE_LP);
+ src.getResponseTypes().add(tref2);
+
+ FaultDetails fd1=new FaultDetails();
+ fd1.setName("faultName1");
+
+ Type tref3=new Type();
+
+ /*
+ TypeDefinition ref3=new TypeDefinition();
+ tref3.getTypeDefinitions().add(ref3);
+ ref3.setName(TEST_TYPE_LP);
+ ref3.setNamespace(TEST_TYPE_NS);
+ ref3.setTypeSystem(TypeDefinition.XSD_TYPE);
+ */
+ tref3.setName(TEST_TYPE_LP);
+ fd1.getTypes().add(tref3);
+
+ src.getFaultDetails().add(fd1);
+
+ FaultDetails fd2=new FaultDetails();
+ fd2.setName("faultName2");
+
+ Type tref4=new Type();
+ tref4.setName(TEST_TYPE_LP);
+ /*
+ TypeDefinition ref4=new TypeDefinition();
+ tref4.getTypeDefinitions().add(ref4);
+ ref4.setName(TEST_TYPE_LP);
+ ref4.setNamespace(TEST_TYPE_NS);
+ ref4.setTypeSystem(TypeDefinition.XSD_TYPE);
+ */
+ fd2.getTypes().add(tref4);
+
+ src.getFaultDetails().add(fd2);
+
+ WSDLGeneratorImpl gen=new WSDLGeneratorImpl();
+
+ java.util.List<javax.wsdl.Definition> defns=new java.util.Vector<javax.wsdl.Definition>();
+ defns.add(defn);
+
+ defn.setTargetNamespace(TEST_NAME_SPACE);
+
+ javax.wsdl.PortType ptype=defn.createPortType();
+ ptype.setQName(new javax.xml.namespace.QName(TEST_NAME_SPACE, TEST_NAME));
+
+ javax.wsdl.Operation result=gen.createOperation(defns, c, ptype, src, null);
+
+ if (result == null) {
+ fail("Operation is null");
+ }
+
+ if (TEST_NAME.equals(result.getName()) == false) {
+ fail("Operation name mismatch: "+result.getName());
+ }
+
+ if (result.getInput() == null) {
+ fail("Input not set");
+ }
+
+ if (result.getOutput() == null) {
+ fail("Output not set");
+ }
+
+ if (result.getFaults().size() != src.getFaultDetails().size()) {
+ fail("Faults number ("+result.getFaults().size()+
+ ") does not match contract ("+src.getFaultDetails().size()+")");
+ }
+ }
+
+ public void testMessage() {
+ javax.wsdl.Definition defn=null;
+ try {
+ javax.wsdl.factory.WSDLFactory fact=
+ javax.wsdl.factory.WSDLFactory.newInstance();
+
+ defn = fact.newDefinition();
+
+ } catch(Exception e) {
+ fail("Failed to get definition");
+ }
+
+ Contract c=new Contract();
+
+ TypeDefinition src=new TypeDefinition();
+
+ /*
+ src.setName(TEST_TYPE_LP);
+ src.setNamespace(TEST_TYPE_NS);
+ src.setTypeSystem(TypeDefinition.XSD_TYPE);
+ */
+ src.setName(TEST_TYPE_LP);
+ src.setDataType(new QName(TEST_TYPE_NS,TEST_TYPE_LP).toString());
+ src.setTypeSystem(TypeSystem.XSD);
+ src.getProperties().put(PropertyName.XSD_TYPE, "true");
+ c.getTypeDefinitions().add(src);
+
+ Type t=new Type();
+ //t.getTypeDefinitions().add(src);
+ t.setName(TEST_TYPE_LP);
+
+ java.util.List<Type> refs=new java.util.Vector<Type>();
+ refs.add(t);
+
+ WSDLGeneratorImpl gen=new WSDLGeneratorImpl();
+
+ java.util.List<javax.wsdl.Definition> defns=new java.util.Vector<javax.wsdl.Definition>();
+
+ QName msgname=new QName(HTTP_TEST_NAMESPACE,TEST_LOCALPART);
+
+ javax.wsdl.Message result=gen.getMessage(defns, c, msgname, refs, null);
+
+ if (result == null) {
+ fail("Message is null");
+ }
+
+ if (result.getQName() == null) {
+ fail("QName not set");
+ }
+
+ if (result.getQName().getLocalPart() == null) {
+ fail("QName localpart not set");
+ }
+
+ if (TEST_LOCALPART.equals(result.getQName().getLocalPart()) == false) {
+ fail("QName localpart not correct: "+result.getQName().getLocalPart());
+ }
+
+ if (result.getQName().getNamespaceURI() == null) {
+ fail("QName namespace not set");
+ }
+
+ if (HTTP_TEST_NAMESPACE.equals(result.getQName().getNamespaceURI()) == false) {
+ fail("QName namespace not correct: "+result.getQName().getNamespaceURI());
+ }
+
+ if (result.getParts().size() != 1) {
+ fail("Should be one part: "+result.getParts().size());
+ }
+
+ Part part=(Part)result.getParts().values().toArray()[0];
+
+ if (part.getElementName() != null) {
+ fail("Element name should not be set");
+ }
+
+ if (part.getTypeName() == null) {
+ fail("Type name not set");
+ }
+
+ if (TEST_TYPE_NS.equals(part.getTypeName().getNamespaceURI()) == false) {
+ fail("Type namespace incorrect: "+part.getTypeName().getNamespaceURI());
+ }
+
+ if (TEST_TYPE_LP.equals(part.getTypeName().getLocalPart()) == false) {
+ fail("Type localpart incorrect: "+part.getTypeName().getLocalPart());
+ }
+ }
+
+ public void testDefnWithPortTypesAndMesgsInDiffNamespaces() {
+
+ Contract c=new Contract();
+ c.setNamespace(TEST_NAME_SPACE);
+
+ Interface i1=new Interface();
+ i1.setName("I1");
+ i1.setNamespace(TEST_NAME_SPACE);
+
+ // Need to associate a message, to ensure port type
+ // is generated
+ OneWayRequestMEP m1=new OneWayRequestMEP();
+
+ m1.setOperation(TEST_NAME);
+
+ Type tref1=new Type();
+ TypeDefinition ref1=new TypeDefinition();
+
+ ref1.setName(TEST_TYPE_LP);
+ ref1.setDataType(new QName(TEST_NAME_SPACE,TEST_TYPE_LP).toString());
+ ref1.setTypeSystem(TypeSystem.XSD);
+ ref1.getProperties().put(PropertyName.XSD_TYPE, "true");
+ c.getTypeDefinitions().add(ref1);
+
+ /*
+ tref1.getTypeDefinitions().add(ref1);
+ ref1.setName(TEST_TYPE_LP);
+ ref1.setNamespace(TEST_NAME_SPACE);
+ ref1.setTypeSystem(TypeDefinition.XSD_TYPE);
+ */
+
+ tref1.setName(TEST_TYPE_LP);
+ m1.getTypes().add(tref1);
+
+ i1.getMessageExchangePatterns().add(m1);
+
+ Interface i2=new Interface();
+ i2.setName("I2");
+ i2.setNamespace(TEST_NAME_SPACE2);
+
+ OneWayRequestMEP m2=new OneWayRequestMEP();
+
+ m2.setOperation(TEST_NAME);
+
+ Type tref2=new Type();
+ TypeDefinition ref2=new TypeDefinition();
+
+ ref2.setName(TEST_TYPE_LP2);
+ ref2.setDataType(new QName(TEST_NAME_SPACE2,TEST_TYPE_LP).toString());
+ ref2.setTypeSystem(TypeSystem.XSD);
+ ref2.getProperties().put(PropertyName.XSD_TYPE, "true");
+ c.getTypeDefinitions().add(ref2);
+
+ /*
+ tref2.getTypeDefinitions().add(ref2);
+ ref2.setName(TEST_TYPE_LP);
+ ref2.setNamespace(TEST_NAME_SPACE2);
+ ref2.setTypeSystem(TypeDefinition.XSD_TYPE);
+ */
+ tref2.setName(TEST_TYPE_LP2);
+ m2.getTypes().add(tref2);
+
+ i2.getMessageExchangePatterns().add(m2);
+
+ Interface i3=new Interface();
+ i3.setName("I3");
+ i3.setNamespace(TEST_NAME_SPACE2);
+
+ OneWayRequestMEP m3=new OneWayRequestMEP();
+
+ m3.setOperation(TEST_NAME);
+
+ Type tref3=new Type();
+ TypeDefinition ref3=new TypeDefinition();
+
+ ref3.setName(TEST_TYPE_LP3);
+ ref3.setDataType(new QName(TEST_NAME_SPACE3,TEST_TYPE_LP).toString());
+ ref3.setTypeSystem(TypeSystem.XSD);
+ ref3.getProperties().put(PropertyName.XSD_TYPE, "true");
+ c.getTypeDefinitions().add(ref3);
+
+ /*
+ tref3.getTypeDefinitions().add(ref3);
+ ref3.setName(TEST_TYPE_LP);
+ ref3.setNamespace(TEST_NAME_SPACE3);
+ ref3.setTypeSystem(TypeDefinition.XSD_TYPE);
+ */
+ tref3.setName(TEST_TYPE_LP3);
+ m3.getTypes().add(tref3);
+
+ i3.getMessageExchangePatterns().add(m3);
+
+ c.getInterfaces().add(i1);
+ c.getInterfaces().add(i2);
+ c.getInterfaces().add(i3);
+
+ WSDLGeneratorImpl gen=new WSDLGeneratorImpl();
+
+ java.util.List<javax.wsdl.Definition> defns=gen.generate(c, null);
+
+ if (defns.size() != 2) {
+ fail("Two Definitions expected, but got: "+defns.size());
+ }
+
+ javax.wsdl.Definition defn1=defns.get(0);
+
+ if (defn1.getPortTypes().size() != 1) {
+ fail("1: Number of port types ("+defn1.getPortTypes().size()+
+ ") does not match number expected (1)");
+ }
+
+ if (defn1.getBindings().size() != 1) {
+ fail("1: Number of port type bindings ("+defn1.getBindings().size()+
+ ") does not match number expected (1)");
+ }
+
+ if (defn1.getMessages().size() != 1) {
+ fail("1: Number of message ("+defn1.getMessages().size()+
+ ") does not match number expected (1)");
+ }
+
+ javax.wsdl.Definition defn2=defns.get(1);
+
+ if (defn2.getPortTypes().size() != 2) {
+ fail("2: Number of port types ("+defn2.getPortTypes().size()+
+ ") does not match number expected (2)");
+ }
+
+ if (defn2.getBindings().size() != 2) {
+ fail("2: Number of port type bindings ("+defn2.getBindings().size()+
+ ") does not match number expected (2)");
+ }
+
+ if (defn2.getMessages().size() != 1) {
+ fail("2: Number of message ("+defn2.getMessages().size()+
+ ") does not match number expected (1)");
+ }
+
+ // Check service only associated with the first defn
+ if (defn1.getServices().size() != 1) {
+ fail("First definition should only have 1 service: "+defn1.getServices().size());
+ }
+
+ javax.wsdl.Service s=(javax.wsdl.Service)
+ defn1.getServices().values().iterator().next();
+ if (s.getPorts().size() != 3) {
+ fail("Should be 3 ports: "+s.getPorts().size());
+ }
+
+ if (defn2.getServices().size() != 0) {
+ fail("Second definition should not have any services: "+defn2.getServices().size());
+ }
+ }
+}
Modified: branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature/pom.xml 2011-01-07 23:15:35 UTC (rev 560)
+++ branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature/pom.xml 2011-01-08 20:51:39 UTC (rev 561)
@@ -16,7 +16,7 @@
<dependencies>
<dependency>
<groupId>org.savara.bundles</groupId>
- <artifactId>org.savara.core</artifactId>
+ <artifactId>org.savara.common</artifactId>
<version>${savara.version}</version>
</dependency>
<dependency>
Modified: branches/experimental/2.0.x/tools/features/org.savara.tools.feature/feature.xml
===================================================================
--- branches/experimental/2.0.x/tools/features/org.savara.tools.feature/feature.xml 2011-01-07 23:15:35 UTC (rev 560)
+++ branches/experimental/2.0.x/tools/features/org.savara.tools.feature/feature.xml 2011-01-08 20:51:39 UTC (rev 561)
@@ -194,7 +194,7 @@
unpack="false"/>
<plugin
- id="org.savara.core"
+ id="org.savara.common"
download-size="0"
install-size="0"
version="0.0.0"
Modified: branches/experimental/2.0.x/tools/features/org.savara.tools.feature/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/features/org.savara.tools.feature/pom.xml 2011-01-07 23:15:35 UTC (rev 560)
+++ branches/experimental/2.0.x/tools/features/org.savara.tools.feature/pom.xml 2011-01-08 20:51:39 UTC (rev 561)
@@ -16,7 +16,7 @@
<dependencies>
<dependency>
<groupId>org.savara.bundles</groupId>
- <artifactId>org.savara.core</artifactId>
+ <artifactId>org.savara.common</artifactId>
<version>${savara.version}</version>
</dependency>
<dependency>
Modified: branches/experimental/2.0.x/tools/site/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/site/pom.xml 2011-01-07 23:15:35 UTC (rev 560)
+++ branches/experimental/2.0.x/tools/site/pom.xml 2011-01-08 20:51:39 UTC (rev 561)
@@ -16,7 +16,7 @@
<dependencies>
<dependency>
<groupId>org.savara.bundles</groupId>
- <artifactId>org.savara.core</artifactId>
+ <artifactId>org.savara.common</artifactId>
<version>${savara.version}</version>
</dependency>
<dependency>
13 years, 5 months
- 1
- 0
savara SVN: r560 - in branches/experimental/2.0.x: bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator and 10 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-01-07 18:15:35 -0500 (Fri, 07 Jan 2011)
New Revision: 560
Added:
branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/PropertyName.java
branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/TypeSystem.java
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/ContractObject.java
Removed:
branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/PropertyNames.java
Modified:
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)Broker.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)CreditAgency.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)Store.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ReqRespFault(a)Seller.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionPatterns.java
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractIntrospector.java
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Contract.java
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/FaultDetails.java
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Interface.java
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/MessageExchangePattern.java
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Namespace.java
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/OneWayRequestMEP.java
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/RequestResponseMEP.java
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Type.java
branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/TypeDefinition.java
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/InteractionConverterRuleImpl.java
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolConverterRuleImpl.java
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolModelConverterRuleImpl.java
branches/experimental/2.0.x/bundles/org.savara.wsdl/.classpath
branches/experimental/2.0.x/bundles/org.savara.wsdl/META-INF/MANIFEST.MF
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/main/java/org/savara/wsdl/generator/impl/WSDLGeneratorImpl.java
branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/tools/wsdl/tests/WSDLGeneratorTest.java
branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java
Log:
More refactoring, to separate out the type definitions used in the contracts rather than duplicating the information, and to centralise the property names (definitions) used in the protocol model. Issue remains about the best way to store type information across contract and protocol models.
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionPatterns.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionPatterns.java 2011-01-07 20:30:44 UTC (rev 559)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionPatterns.java 2011-01-07 23:15:35 UTC (rev 560)
@@ -17,8 +17,8 @@
*/
package org.savara.bpel.model.change;
-import org.savara.bpel.util.BPELInteractionUtil;
import org.savara.common.model.util.InteractionUtil;
+import org.savara.common.model.util.PropertyName;
import org.scribble.protocol.model.*;
/**
@@ -27,10 +27,6 @@
*/
public class InteractionPatterns {
- private static final String FAULT_NAME = "faultName";
- private static final String MESSAGE_TYPE_LOCALPART = "messageTypeLocalPart";
- private static final String MESSAGE_TYPE_NAMESPACE = "messageTypeNameSpace";
-
/**
* This method checks whether the supplied interaction
* is a request that requires a scope with associated
@@ -337,7 +333,7 @@
if (InteractionUtil.isRequest(interaction) == false &&
interaction.getMessageSignature().getProperties().
- keySet().contains(FAULT_NAME)) {
+ keySet().contains(PropertyName.FAULT_NAME)) {
ret = true;
}
@@ -349,7 +345,7 @@
if (InteractionUtil.isRequest(interaction) == false &&
interaction.getMessageSignature().getProperties().
- keySet().contains(FAULT_NAME)) {
+ keySet().contains(PropertyName.FAULT_NAME)) {
ret = true;
}
@@ -358,14 +354,15 @@
public static String getFaultName(Interaction interaction) {
return((String)interaction.
- getMessageSignature().getProperties().get(FAULT_NAME));
+ getMessageSignature().getProperties().get(PropertyName.FAULT_NAME));
}
public static String getFaultName(When interaction) {
return((String)interaction.
- getMessageSignature().getProperties().get(FAULT_NAME));
+ getMessageSignature().getProperties().get(PropertyName.FAULT_NAME));
}
+ /*
public static String getMessageTypeLocalPart(Interaction interaction) {
return((String)interaction.
getMessageSignature().getProperties().get(MESSAGE_TYPE_LOCALPART));
@@ -375,6 +372,7 @@
return((String)interaction.
getMessageSignature().getProperties().get(MESSAGE_TYPE_NAMESPACE));
}
+ */
/*
public static String getVariableName(Interaction interaction) {
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java 2011-01-07 20:30:44 UTC (rev 559)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java 2011-01-07 23:15:35 UTC (rev 560)
@@ -25,7 +25,7 @@
import org.savara.bpel.model.TProcess;
import org.savara.bpel.util.BPELModelUtil;
import org.savara.common.model.generator.ModelGenerator;
-import org.savara.common.model.util.PropertyNames;
+import org.savara.common.model.util.PropertyName;
import org.scribble.common.logging.CachedJournal;
import org.savara.pi4soa.cdm.parser.CDMProtocolParser;
@@ -184,7 +184,7 @@
// Obtain any namespace prefix map
java.util.Map<String, String> prefixes=
(java.util.Map<String, String>)
- projected.getProperties().get(PropertyNames.NAMESPACE_PREFIXES);
+ projected.getProperties().get(PropertyName.NAMESPACE_PREFIXES);
try {
java.io.ByteArrayOutputStream baos=new java.io.ByteArrayOutputStream();
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)Broker.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)Broker.bpel 2011-01-07 20:30:44 UTC (rev 559)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)Broker.bpel 2011-01-07 23:15:35 UTC (rev 560)
@@ -5,7 +5,7 @@
<import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Supplier.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="BrokerBehavior" partnerLinkType="brk:BuyerToBrokerServiceLT" name="BuyerToBroker"/>
+ <partnerLink myRole="Broker" partnerLinkType="brk:BuyerToBrokerServiceLT" name="BuyerToBroker"/>
<partnerLink partnerRole="SupplierQuoteEngineRequester" partnerLinkType="brk:BrokerToSupplierQuoteEngineLT" name="BrokerToSupplierQuoteEngine"/>
<partnerLink partnerRole="CreditAgencyRequester" partnerLinkType="brk:BrokerToCreditAgencyLT" name="BrokerToCreditAgency"/>
<partnerLink partnerRole="SupplierTxnProcessorRequester" partnerLinkType="brk:BrokerToSupplierTxnProcessorLT" name="BrokerToSupplierTxnProcessor"/>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel 2011-01-07 20:30:44 UTC (rev 559)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel 2011-01-07 23:15:35 UTC (rev 560)
@@ -3,7 +3,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="SupplierBehavior" partnerLinkType="spr:BrokerToSupplierQuoteEngineServiceLT" name="BrokerToSupplierQuoteEngine"/>
+ <partnerLink myRole="SupplierQuoteEngine" partnerLinkType="spr:BrokerToSupplierQuoteEngineServiceLT" name="BrokerToSupplierQuoteEngine"/>
</partnerLinks>
<variables>
<variable messageType="spr:getQuoteRequest" name="getQuoteRequestVar"/>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)CreditAgency.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)CreditAgency.bpel 2011-01-07 20:30:44 UTC (rev 559)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)CreditAgency.bpel 2011-01-07 23:15:35 UTC (rev 560)
@@ -4,7 +4,7 @@
<import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_Store.wsdl" namespace="http://www.jboss.org/examples/store"/>
<import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_CreditAgencyArtifacts.wsdl" namespace="java:org.jboss.savara.examples.purchasing"/>
<partnerLinks>
- <partnerLink myRole="CreditAgencyInterface" partnerLinkType="pur:StoreToCreditAgencyServiceLT" name="StoreToCreditAgency"/>
+ <partnerLink myRole="CreditAgency" partnerLinkType="pur:StoreToCreditAgencyServiceLT" name="StoreToCreditAgency"/>
</partnerLinks>
<variables>
<variable messageType="pur:checkCreditRequest" name="checkCreditRequestVar"/>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)Store.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)Store.bpel 2011-01-07 20:30:44 UTC (rev 559)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)Store.bpel 2011-01-07 23:15:35 UTC (rev 560)
@@ -4,7 +4,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="StoreInterface" partnerLinkType="sto:BuyerToStoreServiceLT" name="BuyerToStore"/>
+ <partnerLink myRole="Store" partnerLinkType="sto:BuyerToStoreServiceLT" name="BuyerToStore"/>
<partnerLink partnerRole="CreditAgencyRequester" partnerLinkType="sto:StoreToCreditAgencyLT" name="StoreToCreditAgency"/>
</partnerLinks>
<variables>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ReqRespFault(a)Seller.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ReqRespFault(a)Seller.bpel 2011-01-07 20:30:44 UTC (rev 559)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ReqRespFault(a)Seller.bpel 2011-01-07 23:15:35 UTC (rev 560)
@@ -3,7 +3,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="SellerBehavior" partnerLinkType="slr:BuyerToSellerServiceLT" name="BuyerToSeller"/>
+ <partnerLink myRole="Seller" partnerLinkType="slr:BuyerToSellerServiceLT" name="BuyerToSeller"/>
</partnerLinks>
<variables>
<variable messageType="slr:checkCreditRequest" name="checkCreditRequestVar"/>
Copied: branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/PropertyName.java (from rev 558, branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/PropertyNames.java)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/PropertyName.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/PropertyName.java 2011-01-07 23:15:35 UTC (rev 560)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.savara.common.model.util;
+
+public class PropertyName {
+
+ public static final String NAMESPACE_PREFIXES="NamespacePrefixes";
+
+ public static final String SCHEMA_LOCATIONS="SchemaLocations";
+
+ public static final String MESSAGE_TYPE = "MessageType";
+
+ public static final String INTERFACE_NAME = "InterfaceName";
+
+ public static final String FAULT_NAME = "FaultName";
+
+ // TODO: Determine if required (SAVARA-158)
+ public static final String TYPE_SYSTEM = "TypeSystem";
+
+ // XSD sub types
+ public static final String XSD_ELEMENT = "XSDElement";
+ public static final String XSD_TYPE = "XSDType";
+
+}
Deleted: branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/PropertyNames.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/PropertyNames.java 2011-01-07 20:30:44 UTC (rev 559)
+++ branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/PropertyNames.java 2011-01-07 23:15:35 UTC (rev 560)
@@ -1,26 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.savara.common.model.util;
-
-public class PropertyNames {
-
- public static final String NAMESPACE_PREFIXES="NamespacePrefixes";
-
- public static final String SCHEMA_LOCATIONS="SchemaLocations";
-
-}
Added: branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/TypeSystem.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/TypeSystem.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/TypeSystem.java 2011-01-07 23:15:35 UTC (rev 560)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.savara.common.model.util;
+
+public class TypeSystem {
+
+ public static final String XSD = "xsd";
+
+ public static final String JAVA = "java";
+
+}
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractIntrospector.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractIntrospector.java 2011-01-07 20:30:44 UTC (rev 559)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractIntrospector.java 2011-01-07 23:15:35 UTC (rev 560)
@@ -25,6 +25,7 @@
import java.util.logging.Logger;
import org.savara.common.model.util.InteractionUtil;
+import org.savara.common.model.util.PropertyName;
import org.savara.contract.model.Contract;
import org.savara.contract.model.Interface;
import org.savara.contract.model.MessageExchangePattern;
@@ -237,13 +238,22 @@
public Type convertType(TypeReference tref) {
Type ret=new Type();
- TypeDefinition td=new TypeDefinition();
- td.setName(tref.getLocalpart());
- td.setNamespace(tref.getNamespace());
- //td.setTypeSystem(typeSystem);
+ if (getContract().getTypeDefinition(tref.getName()) == null) {
+ TypeDefinition td=new TypeDefinition();
+ td.setName(tref.getName());
+
+ td.setDataType((String)tref.getProperties().get(PropertyName.MESSAGE_TYPE));
+
+ // Copy properties that may provide additional information about the type
+ td.getProperties().putAll(tref.getProperties());
+
+ //td.setNamespace(tref.getNamespace());
+ td.setTypeSystem((String)tref.getProperties().get(PropertyName.TYPE_SYSTEM));
+
+ getContract().getTypeDefinitions().add(td);
+ }
- ret.getTypeDefinitions().add(td);
- ret.setName(td.getName());
+ ret.setName(tref.getName());
return(ret);
}
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Contract.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Contract.java 2011-01-07 20:30:44 UTC (rev 559)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Contract.java 2011-01-07 23:15:35 UTC (rev 560)
@@ -20,16 +20,16 @@
/**
* This class represents the contract.
*/
-public class Contract implements java.io.Serializable {
+public class Contract extends ContractObject {
- private static final long serialVersionUID = -2069422236288472372L;
-
private String m_name=null;
private String m_namespace=null;
private java.util.Set<Interface> m_interfaces=
new java.util.HashSet<Interface>();
private java.util.Set<Namespace> m_namespaces=
new java.util.HashSet<Namespace>();
+ private java.util.Set<TypeDefinition> m_typeDefinitions=
+ new java.util.HashSet<TypeDefinition>();
/**
* The default constructor.
@@ -85,6 +85,37 @@
}
/**
+ * This method returns the list of type definitions.
+ *
+ * @return The list of type definitions
+ */
+ public java.util.Set<TypeDefinition> getTypeDefinitions() {
+ return(m_typeDefinitions);
+ }
+
+ /**
+ * This method returns the type definition associated
+ * with the supplied name.
+ *
+ * @param name The type definition name
+ * @return The type definition, or null if not found.
+ */
+ public TypeDefinition getTypeDefinition(String name) {
+ TypeDefinition ret=null;
+
+ java.util.Iterator<TypeDefinition> iter=getTypeDefinitions().iterator();
+ while (ret == null && iter.hasNext()) {
+ ret = iter.next();
+
+ if (ret.getName().equals(name) == false) {
+ ret = null;
+ }
+ }
+
+ return(ret);
+ }
+
+ /**
* This method returns the interface associated
* with the supplied name.
*
Added: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/ContractObject.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/ContractObject.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/ContractObject.java 2011-01-07 23:15:35 UTC (rev 560)
@@ -0,0 +1,39 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.savara.contract.model;
+
+/**
+ * Generic top level object inherited by all contract objects.
+ *
+ */
+public class ContractObject {
+
+ private java.util.Map<String,Object> m_properties=
+ new java.util.HashMap<String, Object>();
+
+ /**
+ * This method returns the properties associated
+ * with this contract object.
+ *
+ * @return The properties
+ */
+ public java.util.Map<String,Object> getProperties() {
+ return(m_properties);
+ }
+
+}
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/FaultDetails.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/FaultDetails.java 2011-01-07 20:30:44 UTC (rev 559)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/FaultDetails.java 2011-01-07 23:15:35 UTC (rev 560)
@@ -20,9 +20,7 @@
/**
* This class represents the fault details.
*/
-public class FaultDetails implements java.io.Serializable {
-
- private static final long serialVersionUID = -3998017364115322343L;
+public class FaultDetails extends ContractObject {
private String m_name=null;
private String m_namespace=null;
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Interface.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Interface.java 2011-01-07 20:30:44 UTC (rev 559)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Interface.java 2011-01-07 23:15:35 UTC (rev 560)
@@ -21,9 +21,7 @@
* This class represents an interface, as part of a contract.
*
*/
-public class Interface implements java.io.Serializable {
-
- private static final long serialVersionUID = -5028398472232579842L;
+public class Interface extends ContractObject {
private String m_name=null;
private String m_namespace=null;
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/MessageExchangePattern.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/MessageExchangePattern.java 2011-01-07 20:30:44 UTC (rev 559)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/MessageExchangePattern.java 2011-01-07 23:15:35 UTC (rev 560)
@@ -20,9 +20,7 @@
/**
* This class represents the message exchange pattern.
*/
-public abstract class MessageExchangePattern implements java.io.Serializable {
-
- private static final long serialVersionUID = -5570256623664777195L;
+public abstract class MessageExchangePattern extends ContractObject {
private String m_operation=null;
private java.util.List<Type> m_types=
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Namespace.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Namespace.java 2011-01-07 20:30:44 UTC (rev 559)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Namespace.java 2011-01-07 23:15:35 UTC (rev 560)
@@ -20,9 +20,7 @@
/**
* This class represents the namespace.
*/
-public class Namespace implements java.io.Serializable {
-
- private static final long serialVersionUID = 705922078450920771L;
+public class Namespace extends ContractObject {
private String m_prefix=null;
private String m_uri=null;
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/OneWayRequestMEP.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/OneWayRequestMEP.java 2011-01-07 20:30:44 UTC (rev 559)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/OneWayRequestMEP.java 2011-01-07 23:15:35 UTC (rev 560)
@@ -20,9 +20,7 @@
/**
* This class represents the one-way message exchange pattern.
*/
-public class OneWayRequestMEP extends MessageExchangePattern implements java.io.Serializable {
-
- private static final long serialVersionUID = 8118537376650464370L;
+public class OneWayRequestMEP extends MessageExchangePattern {
/**
* The default constructor.
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/RequestResponseMEP.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/RequestResponseMEP.java 2011-01-07 20:30:44 UTC (rev 559)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/RequestResponseMEP.java 2011-01-07 23:15:35 UTC (rev 560)
@@ -20,10 +20,8 @@
/**
* This class represents the request response message exchange pattern.
*/
-public class RequestResponseMEP extends MessageExchangePattern implements java.io.Serializable {
+public class RequestResponseMEP extends MessageExchangePattern {
- private static final long serialVersionUID = 723851982846902543L;
-
private java.util.List<Type> m_responseTypes=
new java.util.Vector<Type>();
private java.util.List<FaultDetails> m_faultDetails=
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Type.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Type.java 2011-01-07 20:30:44 UTC (rev 559)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/Type.java 2011-01-07 23:15:35 UTC (rev 560)
@@ -25,8 +25,6 @@
private static final long serialVersionUID = 3623232001916287234L;
private String m_name=null;
- private java.util.Set<TypeDefinition> m_typeDefinitions=
- new java.util.HashSet<TypeDefinition>();
/**
* The default constructor.
@@ -53,12 +51,4 @@
m_name = name;
}
- /**
- * This method returns the list of type definitions.
- *
- * @return The list of type definitions
- */
- public java.util.Set<TypeDefinition> getTypeDefinitions() {
- return(m_typeDefinitions);
- }
}
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/TypeDefinition.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/TypeDefinition.java 2011-01-07 20:30:44 UTC (rev 559)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/model/TypeDefinition.java 2011-01-07 23:15:35 UTC (rev 560)
@@ -20,15 +20,11 @@
/**
* This class represents a type definition within
*/
-public class TypeDefinition implements java.io.Serializable {
+public class TypeDefinition extends ContractObject {
- private static final long serialVersionUID = -3673043079078102077L;
-
- public static final String XSD_ELEMENT="##XSDElement";
- public static final String XSD_TYPE="##XSDType";
-
private String m_name=null;
- private String m_namespace=null;
+ private String m_dataType=null;
+ private String m_location=null;
private String m_typeSystem=null;
/**
@@ -48,34 +44,53 @@
}
/**
- * This method returns the namespace associated with the
+ * This method sets the name of the type.
+ *
+ * @param name The name
+ */
+ public void setName(String name) {
+ m_name = name;
+ }
+
+ /**
+ * This method returns the data type associated with the
* type definition.
*
- * @return The namespace
+ * @return The data type
*/
- public String getNamespace() {
- return(m_namespace);
+ public String getDataType() {
+ return(m_dataType);
}
/**
- * This method sets the namespace of the type definition.
+ * This method sets the data type of the type definition.
*
- * @param namespace The namespace
+ * @param dataType The data type
*/
- public void setNamespace(String namespace) {
- m_namespace = namespace;
+ public void setDataType(String dataType) {
+ m_dataType = dataType;
}
/**
- * This method sets the name of the type.
+ * This method returns the location associated with the
+ * type definition.
*
- * @param name The name
+ * @return The location
*/
- public void setName(String name) {
- m_name = name;
+ public String getLocation() {
+ return(m_location);
}
/**
+ * This method sets the location of the type definition.
+ *
+ * @param location The location
+ */
+ public void setLocation(String location) {
+ m_location = location;
+ }
+
+ /**
* This method returns the type system associated with the
* type definition.
*
Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/InteractionConverterRuleImpl.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/InteractionConverterRuleImpl.java 2011-01-07 20:30:44 UTC (rev 559)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/InteractionConverterRuleImpl.java 2011-01-07 23:15:35 UTC (rev 560)
@@ -21,8 +21,12 @@
import java.util.logging.Logger;
+import javax.xml.namespace.QName;
+
import org.pi4soa.cdl.*;
import org.pi4soa.cdl.Interaction;
+import org.savara.common.model.util.PropertyName;
+import org.savara.common.model.util.TypeSystem;
import org.scribble.protocol.model.*;
import org.scribble.protocol.model.Choice;
import org.scribble.protocol.model.When;
@@ -33,10 +37,8 @@
public class InteractionConverterRuleImpl implements ConverterRule {
- private static final String INTERFACE_NAME = "interfaceName";
- private static final String FAULT_NAME = "faultName";
- private static final String MESSAGE_TYPE_LOCALPART = "messageTypeLocalPart";
- private static final String MESSAGE_TYPE_NAMESPACE = "messageTypeNameSpace";
+ //private static final String MESSAGE_TYPE_LOCALPART = "messageTypeLocalPart";
+ //private static final String MESSAGE_TYPE_NAMESPACE = "messageTypeNameSpace";
/**
* This method determines whether the rule can be applied
@@ -347,7 +349,7 @@
// Set interface name
if (cdl.getToRoleType() != null) {
// TODO: Deal with interfaces that have multiple behaviours
- interaction.getProperties().put(INTERFACE_NAME,
+ interaction.getProperties().put(PropertyName.INTERFACE_NAME,
getInterfaceName(cdl));
}
@@ -728,7 +730,7 @@
ms.setOperation(cdl.getOperation());
if (NamesUtil.isSet(details.getFaultName())) {
- ms.getProperties().put(FAULT_NAME,
+ ms.getProperties().put(PropertyName.FAULT_NAME,
details.getFaultName());
}
@@ -740,11 +742,20 @@
ms.getTypeReferences().add(ref);
+ // TODO: Determine if required (SAVARA-158)
+ ms.getProperties().put(PropertyName.TYPE_SYSTEM, TypeSystem.XSD);
+
if (NamesUtil.isSet(itype.getTypeName())) {
String ns=CDLTypeUtil.getNamespace(itype.getTypeName(),
cdl);
String lp=XMLUtils.getLocalname(itype.getTypeName());
+ QName qname=new QName(ns, lp);
+ ms.getProperties().put(PropertyName.MESSAGE_TYPE, qname.toString());
+
+ ms.getProperties().put(PropertyName.XSD_TYPE, "true");
+
+ /*
if (lp != null) {
ms.getProperties().put(MESSAGE_TYPE_LOCALPART,
lp);
@@ -753,11 +764,18 @@
ms.getProperties().put(MESSAGE_TYPE_NAMESPACE,
ns);
}
+ */
} else if (NamesUtil.isSet(itype.getElementName())) {
String ns=CDLTypeUtil.getNamespace(itype.getElementName(),
cdl);
String lp=XMLUtils.getLocalname(itype.getElementName());
+ QName qname=new QName(ns, lp);
+ ms.getProperties().put(PropertyName.MESSAGE_TYPE, qname.toString());
+
+ ms.getProperties().put(PropertyName.XSD_ELEMENT, "true");
+
+ /*
if (lp != null) {
ms.getProperties().put(MESSAGE_TYPE_LOCALPART,
lp);
@@ -766,6 +784,7 @@
ms.getProperties().put(MESSAGE_TYPE_NAMESPACE,
ns);
}
+ */
}
}
Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolConverterRuleImpl.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolConverterRuleImpl.java 2011-01-07 20:30:44 UTC (rev 559)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolConverterRuleImpl.java 2011-01-07 23:15:35 UTC (rev 560)
@@ -21,6 +21,8 @@
import java.util.logging.Logger;
+import javax.xml.namespace.QName;
+
import org.pi4soa.cdl.*;
import org.pi4soa.cdl.Interaction;
import org.pi4soa.cdl.interfaces.InterfaceDefinition;
@@ -32,6 +34,8 @@
import org.pi4soa.cdl.util.PackageUtil;
import org.pi4soa.common.util.NamesUtil;
import org.pi4soa.common.xml.XMLUtils;
+import org.savara.common.model.util.PropertyName;
+import org.savara.common.model.util.TypeSystem;
import org.savara.contract.model.*;
import org.scribble.protocol.model.*;
@@ -744,30 +748,46 @@
protected Type createType(MessageDefinition defn) {
Type ret=new Type();
+
TypeDefinition td=new TypeDefinition();
- ret.getTypeDefinitions().add(td);
+ td.setTypeSystem(TypeSystem.XSD);
+
if (defn.getElement() != null && defn.getElement().trim().length() > 0) {
td.setName(defn.getElement());
+ /*
if (defn.getElementNamespace() != null) {
td.setNamespace(defn.getElementNamespace());
}
+ */
- td.setTypeSystem(TypeDefinition.XSD_ELEMENT);
+ QName qname=new QName(defn.getElementNamespace(), defn.getElement());
+ td.setDataType(qname.toString());
+
+ td.getProperties().put(PropertyName.XSD_ELEMENT, "true");
} else if (defn.getType() != null && defn.getType().trim().length() > 0) {
td.setName(defn.getType());
+ /*
if (defn.getTypeNamespace() != null) {
td.setNamespace(defn.getTypeNamespace());
}
+ */
- td.setTypeSystem(TypeDefinition.XSD_TYPE);
+ QName qname=new QName(defn.getTypeNamespace(), defn.getType());
+ td.setDataType(qname.toString());
+
+ td.getProperties().put(PropertyName.XSD_TYPE, "true");
}
ret.setName(td.getName());
-
+
+ if (getContract().getTypeDefinition(td.getName()) == null) {
+ getContract().getTypeDefinitions().add(td);
+ }
+
return(ret);
}
Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolModelConverterRuleImpl.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolModelConverterRuleImpl.java 2011-01-07 20:30:44 UTC (rev 559)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolModelConverterRuleImpl.java 2011-01-07 23:15:35 UTC (rev 560)
@@ -23,7 +23,7 @@
import org.pi4soa.cdl.*;
import org.pi4soa.cdl.util.CDLTypeUtil;
-import org.savara.common.model.util.PropertyNames;
+import org.savara.common.model.util.PropertyName;
import org.scribble.protocol.model.*;
public class ProtocolModelConverterRuleImpl implements ConverterRule {
@@ -77,8 +77,8 @@
}
}
- ret.getProperties().put(PropertyNames.NAMESPACE_PREFIXES, prefixes);
- ret.getProperties().put(PropertyNames.SCHEMA_LOCATIONS, locations);
+ ret.getProperties().put(PropertyName.NAMESPACE_PREFIXES, prefixes);
+ ret.getProperties().put(PropertyName.SCHEMA_LOCATIONS, locations);
// TODO: Consider how to use the namespace information
//ret.setNamespace(getNamespace(cdlpack));
Modified: branches/experimental/2.0.x/bundles/org.savara.wsdl/.classpath
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/.classpath 2011-01-07 20:30:44 UTC (rev 559)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/.classpath 2011-01-07 23:15:35 UTC (rev 560)
@@ -1,14 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/test/java" output="target/test-classes" including="**/*.java"/>
- <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.apache.felix.framework/3.0.1/org.apache.felix.framework-3.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.core/1.4.0/org.osgi.core-1.4.0.jar"/>
- <classpathentry kind="src" path="/org.savara.contract"/>
- <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.6.2/wsdl4j-1.6.2.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-</classpath>
\ No newline at end of file
+ <classpathentry including="**/*.java" kind="src" output="target/test-classes" path="src/test/java"/>
+ <classpathentry including="**/*.java" kind="src" path="src/main/java"/>
+ <classpathentry kind="var" path="M2_REPO/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.apache.felix.framework/3.0.1/org.apache.felix.framework-3.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.core/1.4.0/org.osgi.core-1.4.0.jar"/>
+ <classpathentry kind="src" path="/org.savara.contract"/>
+ <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.6.2/wsdl4j-1.6.2.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/org.savara.common"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: branches/experimental/2.0.x/bundles/org.savara.wsdl/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/META-INF/MANIFEST.MF 2011-01-07 20:30:44 UTC (rev 559)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/META-INF/MANIFEST.MF 2011-01-07 23:15:35 UTC (rev 560)
@@ -8,6 +8,7 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.framework;version="1.3.0"
Require-Bundle: javax.wsdl;visibility:=reexport,
+ org.savara.common,
org.savara.contract,
org.apache.commons.logging,
org.scribble.common,
Modified: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/main/java/org/savara/wsdl/generator/impl/WSDLGeneratorImpl.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/main/java/org/savara/wsdl/generator/impl/WSDLGeneratorImpl.java 2011-01-07 20:30:44 UTC (rev 559)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/main/java/org/savara/wsdl/generator/impl/WSDLGeneratorImpl.java 2011-01-07 23:15:35 UTC (rev 560)
@@ -22,6 +22,8 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.savara.common.model.util.PropertyName;
+import org.savara.common.model.util.TypeSystem;
import org.savara.contract.model.FaultDetails;
import org.savara.contract.model.Interface;
import org.savara.contract.model.Namespace;
@@ -492,42 +494,34 @@
} else {
Type ref=types.get(0);
- java.util.Iterator<TypeDefinition> iter=ref.getTypeDefinitions().iterator();
- boolean f_done=false;
-
- while (f_done == false && iter.hasNext()) {
- TypeDefinition td=iter.next();
+ TypeDefinition td=contract.getTypeDefinition(ref.getName());
- if (TypeDefinition.XSD_ELEMENT.equals(td.getTypeSystem()) ||
- TypeDefinition.XSD_TYPE.equals(td.getTypeSystem())) {
- javax.xml.namespace.QName qname=
- new javax.xml.namespace.QName(td.getNamespace(),td.getName());
- javax.wsdl.Definition defn=
- getDefinition(wsdls, contract, msgname.getNamespaceURI(), wsdlBinding);
-
- if (defn != null && qname != null &&
- (ret = defn.getMessage(msgname)) == null) {
- ret = defn.createMessage();
- ret.setUndefined(false);
+ if (td != null && TypeSystem.XSD.equals(td.getTypeSystem())) {
+ javax.xml.namespace.QName qname=
+ new javax.xml.namespace.QName(td.getDataType());
+ javax.wsdl.Definition defn=
+ getDefinition(wsdls, contract, msgname.getNamespaceURI(), wsdlBinding);
- ret.setQName(msgname);
-
- // Create single part for type or element
- Part part=defn.createPart();
- part.setName("content");
-
- if (TypeDefinition.XSD_ELEMENT.equals(td.getTypeSystem())) {
- part.setElementName(qname);
- } else {
- part.setTypeName(qname);
- }
-
- ret.addPart(part);
-
- defn.addMessage(ret);
-
- f_done = true;
+ if (defn != null && qname != null &&
+ (ret = defn.getMessage(msgname)) == null) {
+ ret = defn.createMessage();
+ ret.setUndefined(false);
+
+ ret.setQName(msgname);
+
+ // Create single part for type or element
+ Part part=defn.createPart();
+ part.setName("content");
+
+ if (td.getProperties().containsKey(PropertyName.XSD_ELEMENT)) {
+ part.setElementName(qname);
+ } else {
+ part.setTypeName(qname);
}
+
+ ret.addPart(part);
+
+ defn.addMessage(ret);
}
}
}
Modified: branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/tools/wsdl/tests/WSDLGeneratorTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/tools/wsdl/tests/WSDLGeneratorTest.java 2011-01-07 20:30:44 UTC (rev 559)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/src/test/java/org/savara/tools/wsdl/tests/WSDLGeneratorTest.java 2011-01-07 23:15:35 UTC (rev 560)
@@ -20,6 +20,8 @@
import javax.wsdl.Part;
import javax.xml.namespace.QName;
+import org.savara.common.model.util.PropertyName;
+import org.savara.common.model.util.TypeSystem;
import org.savara.contract.model.*;
import org.savara.wsdl.generator.WSDLGenerator;
import org.savara.wsdl.generator.WSDLGeneratorFactory;
@@ -33,6 +35,8 @@
private static final String HTTP_TEST_NAMESPACE = "http://test.namespace";
private static final String TEST_TYPE_NS = "testTypeNS";
private static final String TEST_TYPE_LP = "testTypeLP";
+ private static final String TEST_TYPE_LP2 = "testTypeLP2";
+ private static final String TEST_TYPE_LP3 = "testTypeLP3";
private static final String TEST_NAME_SPACE = "testNameSpace";
private static final String TEST_NAME_SPACE2 = "testNameSpace2";
private static final String TEST_NAME_SPACE3 = "testNameSpace3";
@@ -166,12 +170,15 @@
m1.setOperation(TEST_NAME);
Type tref1=new Type();
+ tref1.setName(TEST_TYPE_LP);
+ m1.getTypes().add(tref1);
+
TypeDefinition ref1=new TypeDefinition();
- tref1.getTypeDefinitions().add(ref1);
ref1.setName(TEST_TYPE_LP);
- ref1.setNamespace(TEST_NAME_SPACE);
- ref1.setTypeSystem(TypeDefinition.XSD_TYPE);
- m1.getTypes().add(tref1);
+ ref1.setDataType(new QName(TEST_NAME_SPACE,TEST_TYPE_LP).toString());
+ ref1.setTypeSystem(TypeSystem.XSD);
+ ref1.getProperties().put(PropertyName.XSD_TYPE, "true");
+ c.getTypeDefinitions().add(ref1);
i1.getMessageExchangePatterns().add(m1);
@@ -184,11 +191,16 @@
m2.setOperation(TEST_NAME);
Type tref2=new Type();
+
+ /*
TypeDefinition ref2=new TypeDefinition();
tref2.getTypeDefinitions().add(ref1);
ref2.setName(TEST_TYPE_LP);
ref2.setNamespace(TEST_NAME_SPACE);
ref2.setTypeSystem(TypeDefinition.XSD_TYPE);
+ */
+
+ tref2.setName(TEST_TYPE_LP);
m2.getTypes().add(tref2);
i2.getMessageExchangePatterns().add(m2);
@@ -202,11 +214,16 @@
m3.setOperation(TEST_NAME);
Type tref3=new Type();
+
+ /*
TypeDefinition ref3=new TypeDefinition();
tref3.getTypeDefinitions().add(ref1);
ref3.setName(TEST_TYPE_LP);
ref3.setNamespace(TEST_NAME_SPACE);
ref3.setTypeSystem(TypeDefinition.XSD_TYPE);
+ */
+
+ tref3.setName(TEST_TYPE_LP);
m3.getTypes().add(tref3);
i3.getMessageExchangePatterns().add(m3);
@@ -250,16 +267,28 @@
fail("Failed to get definition");
}
+ Contract c=new Contract();
+
OneWayRequestMEP src=new OneWayRequestMEP();
src.setOperation(TEST_NAME);
Type tref=new Type();
+
TypeDefinition ref=new TypeDefinition();
+ ref.setName(TEST_TYPE_LP);
+ ref.setDataType(new QName(TEST_TYPE_NS,TEST_TYPE_LP).toString());
+ ref.setTypeSystem(TypeSystem.XSD);
+ ref.getProperties().put(PropertyName.XSD_TYPE, "true");
+ c.getTypeDefinitions().add(ref);
+
+ /*
+ TypeDefinition ref=new TypeDefinition();
tref.getTypeDefinitions().add(ref);
ref.setName(TEST_TYPE_LP);
ref.setNamespace(TEST_TYPE_NS);
ref.setTypeSystem(TypeDefinition.XSD_TYPE);
+ */
tref.setName(ref.getName());
src.getTypes().add(tref);
@@ -308,35 +337,56 @@
fail("Failed to get definition");
}
+ Contract c=new Contract();
+
RequestResponseMEP src=new RequestResponseMEP();
src.setOperation(TEST_NAME);
Type tref1=new Type();
+
TypeDefinition ref1=new TypeDefinition();
+ ref1.setName(TEST_TYPE_LP);
+ ref1.setDataType(new QName(TEST_TYPE_NS,TEST_TYPE_LP).toString());
+ ref1.setTypeSystem(TypeSystem.XSD);
+ ref1.getProperties().put(PropertyName.XSD_TYPE, "true");
+ c.getTypeDefinitions().add(ref1);
+
+ /*
+ TypeDefinition ref1=new TypeDefinition();
tref1.getTypeDefinitions().add(ref1);
ref1.setName(TEST_TYPE_LP);
ref1.setNamespace(TEST_TYPE_NS);
ref1.setTypeSystem(TypeDefinition.XSD_TYPE);
+ */
+ tref1.setName(TEST_TYPE_LP);
src.getTypes().add(tref1);
Type tref2=new Type();
+ /*
TypeDefinition ref2=new TypeDefinition();
tref2.getTypeDefinitions().add(ref2);
ref2.setName(TEST_TYPE_LP);
ref2.setNamespace(TEST_TYPE_NS);
ref2.setTypeSystem(TypeDefinition.XSD_TYPE);
+ */
+
+ tref2.setName(TEST_TYPE_LP);
src.getResponseTypes().add(tref2);
FaultDetails fd1=new FaultDetails();
fd1.setName("faultName1");
Type tref3=new Type();
+
+ /*
TypeDefinition ref3=new TypeDefinition();
tref3.getTypeDefinitions().add(ref3);
ref3.setName(TEST_TYPE_LP);
ref3.setNamespace(TEST_TYPE_NS);
ref3.setTypeSystem(TypeDefinition.XSD_TYPE);
+ */
+ tref3.setName(TEST_TYPE_LP);
fd1.getTypes().add(tref3);
src.getFaultDetails().add(fd1);
@@ -345,11 +395,14 @@
fd2.setName("faultName2");
Type tref4=new Type();
+ /*
TypeDefinition ref4=new TypeDefinition();
tref4.getTypeDefinitions().add(ref4);
ref4.setName(TEST_TYPE_LP);
ref4.setNamespace(TEST_TYPE_NS);
ref4.setTypeSystem(TypeDefinition.XSD_TYPE);
+ */
+ fd2.setName(TEST_TYPE_LP);
fd2.getTypes().add(tref4);
src.getFaultDetails().add(fd2);
@@ -400,13 +453,24 @@
fail("Failed to get definition");
}
+ Contract c=new Contract();
+
TypeDefinition src=new TypeDefinition();
+
+ /*
src.setName(TEST_TYPE_LP);
src.setNamespace(TEST_TYPE_NS);
src.setTypeSystem(TypeDefinition.XSD_TYPE);
-
+ */
+ src.setName(TEST_TYPE_LP);
+ src.setDataType(new QName(TEST_TYPE_NS,TEST_TYPE_LP).toString());
+ src.setTypeSystem(TypeSystem.XSD);
+ src.getProperties().put(PropertyName.XSD_TYPE, "true");
+ c.getTypeDefinitions().add(src);
+
Type t=new Type();
- t.getTypeDefinitions().add(src);
+ //t.getTypeDefinitions().add(src);
+ t.setName(TEST_TYPE_LP);
java.util.List<Type> refs=new java.util.Vector<Type>();
refs.add(t);
@@ -483,10 +547,21 @@
Type tref1=new Type();
TypeDefinition ref1=new TypeDefinition();
+
+ ref1.setName(TEST_TYPE_LP);
+ ref1.setDataType(new QName(TEST_NAME_SPACE,TEST_TYPE_LP).toString());
+ ref1.setTypeSystem(TypeSystem.XSD);
+ ref1.getProperties().put(PropertyName.XSD_TYPE, "true");
+ c.getTypeDefinitions().add(ref1);
+
+ /*
tref1.getTypeDefinitions().add(ref1);
ref1.setName(TEST_TYPE_LP);
ref1.setNamespace(TEST_NAME_SPACE);
ref1.setTypeSystem(TypeDefinition.XSD_TYPE);
+ */
+
+ tref1.setName(TEST_TYPE_LP);
m1.getTypes().add(tref1);
i1.getMessageExchangePatterns().add(m1);
@@ -501,10 +576,20 @@
Type tref2=new Type();
TypeDefinition ref2=new TypeDefinition();
+
+ ref2.setName(TEST_TYPE_LP2);
+ ref2.setDataType(new QName(TEST_NAME_SPACE2,TEST_TYPE_LP).toString());
+ ref2.setTypeSystem(TypeSystem.XSD);
+ ref2.getProperties().put(PropertyName.XSD_TYPE, "true");
+ c.getTypeDefinitions().add(ref2);
+
+ /*
tref2.getTypeDefinitions().add(ref2);
ref2.setName(TEST_TYPE_LP);
ref2.setNamespace(TEST_NAME_SPACE2);
ref2.setTypeSystem(TypeDefinition.XSD_TYPE);
+ */
+ tref2.setName(TEST_TYPE_LP2);
m2.getTypes().add(tref2);
i2.getMessageExchangePatterns().add(m2);
@@ -519,10 +604,20 @@
Type tref3=new Type();
TypeDefinition ref3=new TypeDefinition();
+
+ ref3.setName(TEST_TYPE_LP3);
+ ref3.setDataType(new QName(TEST_NAME_SPACE3,TEST_TYPE_LP).toString());
+ ref3.setTypeSystem(TypeSystem.XSD);
+ ref3.getProperties().put(PropertyName.XSD_TYPE, "true");
+ c.getTypeDefinitions().add(ref3);
+
+ /*
tref3.getTypeDefinitions().add(ref3);
ref3.setName(TEST_TYPE_LP);
ref3.setNamespace(TEST_NAME_SPACE3);
ref3.setTypeSystem(TypeDefinition.XSD_TYPE);
+ */
+ tref3.setName(TEST_TYPE_LP3);
m3.getTypes().add(tref3);
i3.getMessageExchangePatterns().add(m3);
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java 2011-01-07 20:30:44 UTC (rev 559)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java 2011-01-07 23:15:35 UTC (rev 560)
@@ -35,7 +35,7 @@
import org.savara.bpel.generator.ProtocolToBPELModelGenerator;
import org.savara.bpel.model.*;
import org.savara.bpel.util.BPELModelUtil;
-import org.savara.common.model.util.PropertyNames;
+import org.savara.common.model.util.PropertyName;
import org.savara.common.util.XMLUtils;
import org.savara.contract.model.Contract;
import org.savara.contract.model.Interface;
@@ -255,7 +255,7 @@
java.util.Map<String, String> prefixes=
(java.util.Map<String, String>)
- localcm.getProperties().get(PropertyNames.NAMESPACE_PREFIXES);
+ localcm.getProperties().get(PropertyName.NAMESPACE_PREFIXES);
//String bpelText=XMLUtils.toText(bpelProcess.getDOMElement());
ByteArrayOutputStream os=new ByteArrayOutputStream();
13 years, 5 months
- 1
- 0
savara SVN: r559 - in branches/experimental/2.0.x: bundles/org.savara.bpel and 8 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-01-07 15:30:44 -0500 (Fri, 07 Jan 2011)
New Revision: 559
Modified:
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/META-INF/MANIFEST.MF
branches/experimental/2.0.x/bundles/org.savara.bpel/.classpath
branches/experimental/2.0.x/bundles/org.savara.bpel/META-INF/MANIFEST.MF
branches/experimental/2.0.x/bundles/org.savara.common/.project
branches/experimental/2.0.x/bundles/org.savara.common/META-INF/MANIFEST.MF
branches/experimental/2.0.x/bundles/org.savara.common/pom.xml
branches/experimental/2.0.x/bundles/org.savara.contract/.classpath
branches/experimental/2.0.x/bundles/org.savara.contract/META-INF/MANIFEST.MF
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/META-INF/MANIFEST.MF
branches/experimental/2.0.x/bundles/pom.xml
branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/META-INF/MANIFEST.MF
Log:
Changed org.savara.core to org.savara.common
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/.classpath
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/.classpath 2011-01-07 20:02:45 UTC (rev 558)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/.classpath 2011-01-07 20:30:44 UTC (rev 559)
@@ -10,7 +10,6 @@
<classpathentry kind="var" path="M2_REPO/org/apache/felix/org.apache.felix.framework/3.0.1/org.apache.felix.framework-3.0.1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.core/1.4.0/org.osgi.core-1.4.0.jar"/>
<classpathentry kind="src" path="/org.savara.contract"/>
- <classpathentry kind="src" path="/org.savara.core"/>
<classpathentry kind="src" path="/org.savara.wsdl"/>
<classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT-sources.jar"/>
@@ -20,5 +19,6 @@
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
<classpathentry kind="lib" path="lib/jaxb-api-2.1.jar"/>
<classpathentry kind="lib" path="lib/jaxb-impl-2.1.jar"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/org.savara.common"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/META-INF/MANIFEST.MF 2011-01-07 20:02:45 UTC (rev 558)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/META-INF/MANIFEST.MF 2011-01-07 20:30:44 UTC (rev 559)
@@ -10,7 +10,7 @@
Require-Bundle: org.apache.commons.logging,
org.savara.contract,
org.savara.wsdl,
- org.savara.core,
+ org.savara.common,
org.junit,
org.scribble.common,
org.scribble.protocol,
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/META-INF/MANIFEST.MF 2011-01-07 20:02:45 UTC (rev 558)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/META-INF/MANIFEST.MF 2011-01-07 20:30:44 UTC (rev 559)
@@ -11,5 +11,5 @@
org.junit,
org.scribble.common,
org.scribble.protocol,
- org.savara.core,
+ org.savara.common,
org.scribble.protocol.projection
Modified: branches/experimental/2.0.x/bundles/org.savara.common/.project
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.common/.project 2011-01-07 20:02:45 UTC (rev 558)
+++ branches/experimental/2.0.x/bundles/org.savara.common/.project 2011-01-07 20:30:44 UTC (rev 559)
@@ -1,5 +1,5 @@
<projectDescription>
- <name>org.savara.core</name>
+ <name>org.savara.common</name>
<comment>The SAVARA project. NO_M2ECLIPSE_SUPPORT: Project files created with the maven-eclipse-plugin are not supported in M2Eclipse.</comment>
<projects/>
<buildSpec>
Modified: branches/experimental/2.0.x/bundles/org.savara.common/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.common/META-INF/MANIFEST.MF 2011-01-07 20:02:45 UTC (rev 558)
+++ branches/experimental/2.0.x/bundles/org.savara.common/META-INF/MANIFEST.MF 2011-01-07 20:30:44 UTC (rev 559)
@@ -1,7 +1,7 @@
Manifest-Version: 1.0
Bundle-ManifestVersion: 2
-Bundle-Name: SAVARA Core
-Bundle-SymbolicName: org.savara.core;singleton:=true
+Bundle-Name: SAVARA Common
+Bundle-SymbolicName: org.savara.common;singleton:=true
Bundle-Version: 2.0.0.SNAPSHOT
Bundle-Activator: org.savara.common.osgi.Activator
Bundle-Vendor: www.savara.org
Modified: branches/experimental/2.0.x/bundles/org.savara.common/pom.xml
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.common/pom.xml 2011-01-07 20:02:45 UTC (rev 558)
+++ branches/experimental/2.0.x/bundles/org.savara.common/pom.xml 2011-01-07 20:30:44 UTC (rev 559)
@@ -2,10 +2,10 @@
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>org.savara.bundles</groupId>
- <artifactId>org.savara.core</artifactId>
+ <artifactId>org.savara.common</artifactId>
<version>2.0.0-SNAPSHOT</version>
<packaging>jar</packaging>
- <name>Savara::Bundles::Core</name>
+ <name>Savara::Bundles::Common</name>
<parent>
<groupId>org.savara</groupId>
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/.classpath
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/.classpath 2011-01-07 20:02:45 UTC (rev 558)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/.classpath 2011-01-07 20:30:44 UTC (rev 559)
@@ -1,10 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry kind="src" path="src/main/java" including="**/*.java"/>
- <classpathentry kind="output" path="target/classes"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.apache.felix.framework/3.0.1/org.apache.felix.framework-3.0.1.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.core/1.4.0/org.osgi.core-1.4.0.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT-sources.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="src" path="/org.savara.core"/>
-</classpath>
\ No newline at end of file
+ <classpathentry including="**/*.java" kind="src" path="src/main/java"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.apache.felix.framework/3.0.1/org.apache.felix.framework-3.0.1.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.core/1.4.0/org.osgi.core-1.4.0.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT-sources.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+ <classpathentry combineaccessrules="false" kind="src" path="/org.savara.common"/>
+ <classpathentry kind="output" path="target/classes"/>
+</classpath>
Modified: branches/experimental/2.0.x/bundles/org.savara.contract/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract/META-INF/MANIFEST.MF 2011-01-07 20:02:45 UTC (rev 558)
+++ branches/experimental/2.0.x/bundles/org.savara.contract/META-INF/MANIFEST.MF 2011-01-07 20:30:44 UTC (rev 559)
@@ -8,5 +8,5 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.framework
Require-Bundle: org.scribble.common,
- org.savara.core
+ org.savara.common
Export-Package: org.savara.contract.model
Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/META-INF/MANIFEST.MF 2011-01-07 20:02:45 UTC (rev 558)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/META-INF/MANIFEST.MF 2011-01-07 20:30:44 UTC (rev 559)
@@ -15,6 +15,6 @@
org.scribble.common,
org.scribble.protocol,
org.junit,
- org.savara.core
+ org.savara.common
Export-Package: org.savara.pi4soa.cdm,
org.savara.pi4soa.cdm.parser
Modified: branches/experimental/2.0.x/bundles/pom.xml
===================================================================
--- branches/experimental/2.0.x/bundles/pom.xml 2011-01-07 20:02:45 UTC (rev 558)
+++ branches/experimental/2.0.x/bundles/pom.xml 2011-01-07 20:30:44 UTC (rev 559)
@@ -23,7 +23,7 @@
<module>org.savara.bpel</module>
<module>org.savara.bpel.tests</module>
<module>org.savara.contract</module>
- <module>org.savara.core</module>
+ <module>org.savara.common</module>
<module>org.savara.pi4soa.cdm</module>
<module>org.savara.wsdl</module>
</modules>
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/META-INF/MANIFEST.MF 2011-01-07 20:02:45 UTC (rev 558)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/META-INF/MANIFEST.MF 2011-01-07 20:30:44 UTC (rev 559)
@@ -22,7 +22,7 @@
org.eclipse.wst.common.project.facet.core,
org.savara.wsdl,
org.savara.bpel,
- org.savara.core,
+ org.savara.common,
org.savara.tools.core
Bundle-ActivationPolicy: lazy
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
13 years, 5 months
- 1
- 0
savara SVN: r558 - branches/experimental/2.0.x/bundles.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-01-07 15:02:45 -0500 (Fri, 07 Jan 2011)
New Revision: 558
Added:
branches/experimental/2.0.x/bundles/org.savara.common/
Removed:
branches/experimental/2.0.x/bundles/org.savara.core/
Log:
Copied: branches/experimental/2.0.x/bundles/org.savara.common (from rev 557, branches/experimental/2.0.x/bundles/org.savara.core)
13 years, 5 months
- 1
- 0
savara SVN: r557 - branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-01-07 15:00:54 -0500 (Fri, 07 Jan 2011)
New Revision: 557
Removed:
branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/core/
branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/model/
branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/util/
Log:
13 years, 5 months
- 1
- 0
savara SVN: r556 - in branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common: util and 1 other directory.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-01-07 14:39:27 -0500 (Fri, 07 Jan 2011)
New Revision: 556
Added:
branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/util/
Modified:
branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/util/ScribbleServices.java
branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/util/XMLUtils.java
Log:
Copied: branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/util (from rev 554, branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/util)
Modified: branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/util/ScribbleServices.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/util/ScribbleServices.java 2011-01-07 19:18:56 UTC (rev 554)
+++ branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/util/ScribbleServices.java 2011-01-07 19:39:27 UTC (rev 556)
@@ -13,7 +13,7 @@
* limitations under the License.
*
*/
-package org.savara.util;
+package org.savara.common.util;
import org.scribble.protocol.export.ProtocolExportManager;
import org.scribble.protocol.parser.ProtocolParserManager;
Modified: branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/util/XMLUtils.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/util/XMLUtils.java 2011-01-07 19:18:56 UTC (rev 554)
+++ branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/common/util/XMLUtils.java 2011-01-07 19:39:27 UTC (rev 556)
@@ -15,7 +15,7 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
* MA 02110-1301, USA.
*/
-package org.savara.util;
+package org.savara.common.util;
import java.io.ByteArrayOutputStream;
13 years, 5 months
- 1
- 0
savara SVN: r555 - in branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara: model and 1 other directory.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-01-07 14:36:03 -0500 (Fri, 07 Jan 2011)
New Revision: 555
Removed:
branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/core/osgi/
branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/model/change/
branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/model/generator/
branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/model/util/
Log:
13 years, 5 months
- 1
- 0