Author: objectiser
Date: 2011-01-05 17:13:01 -0500 (Wed, 05 Jan 2011)
New Revision: 537
Added:
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/pom.xml
branches/experimental/2.0.x/bundles/org.savara.bpel/lib/jaxb-api-2.1.jar
branches/experimental/2.0.x/bundles/org.savara.bpel/lib/jaxb-impl-2.1.jar
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/TestJournal.java
Removed:
branches/experimental/2.0.x/bundles/org.savara.bpel/lib/jaxb-api.jar
branches/experimental/2.0.x/bundles/org.savara.bpel/lib/jaxb-impl.jar
Modified:
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/parser/ParserTest.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/.classpath
branches/experimental/2.0.x/bundles/org.savara.core/META-INF/MANIFEST.MF
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/pom.xml
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/CDMProtocolParserTest.java
branches/experimental/2.0.x/bundles/pom.xml
branches/experimental/2.0.x/pom.xml
branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/pom.xml
branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/pom.xml
branches/experimental/2.0.x/tools/plugins/pom.xml
branches/experimental/2.0.x/tools/pom.xml
branches/experimental/2.0.x/tools/tests/org.savara.protocol.contract.tests/pom.xml
Log:
Update to get the maven build working.
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/.classpath
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/.classpath 2011-01-05 17:36:26 UTC
(rev 536)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/.classpath 2011-01-05 22:13:01 UTC
(rev 537)
@@ -18,7 +18,7 @@
<classpathentry kind="var"
path="M2_REPO/org/antlr/stringtemplate/3.2/stringtemplate-3.2.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 kind="lib" path="lib/jaxb-api.jar"/>
- <classpathentry kind="lib" path="lib/jaxb-impl.jar"/>
+ <classpathentry kind="lib" path="lib/jaxb-api-2.1.jar"/>
+ <classpathentry kind="lib" path="lib/jaxb-impl-2.1.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Added: branches/experimental/2.0.x/bundles/org.savara.bpel/lib/jaxb-api-2.1.jar
===================================================================
(Binary files differ)
Property changes on:
branches/experimental/2.0.x/bundles/org.savara.bpel/lib/jaxb-api-2.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel/lib/jaxb-api.jar
===================================================================
(Binary files differ)
Added: branches/experimental/2.0.x/bundles/org.savara.bpel/lib/jaxb-impl-2.1.jar
===================================================================
(Binary files differ)
Property changes on:
branches/experimental/2.0.x/bundles/org.savara.bpel/lib/jaxb-impl-2.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel/lib/jaxb-impl.jar
===================================================================
(Binary files differ)
Property changes on: branches/experimental/2.0.x/bundles/org.savara.bpel.tests
___________________________________________________________________
Name: svn:ignore
- .settings
.classpath
.project
bin
+ .settings
.classpath
.project
bin
target
Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/pom.xml
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/pom.xml
(rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/pom.xml 2011-01-05 22:13:01
UTC (rev 537)
@@ -0,0 +1,109 @@
+<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+
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.bpel.tests</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Savara::Bundles::BPELTests</name>
+
+ <parent>
+ <groupId>org.savara</groupId>
+ <artifactId>bundles</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.scribble.bundles</groupId>
+ <artifactId>org.scribble.common</artifactId>
+ <version>${scribble.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.scribble.bundles</groupId>
+ <artifactId>org.scribble.protocol</artifactId>
+ <version>${scribble.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.scribble.bundles</groupId>
+ <artifactId>org.scribble.protocol.projection</artifactId>
+ <version>${scribble.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.scribble.bundles</groupId>
+ <artifactId>org.scribble.protocol.parser</artifactId>
+ <version>${scribble.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.savara.bundles</groupId>
+ <artifactId>org.savara.core</artifactId>
+ <version>${savara.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.savara.bundles</groupId>
+ <artifactId>org.savara.bpel</artifactId>
+ <version>${savara.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.savara.bundles</groupId>
+ <artifactId>org.savara.wsdl</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.savara.bundles</groupId>
+ <artifactId>org.savara.contract.model</artifactId>
+ <version>${savara.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${osgi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.pi4soa</groupId>
+ <artifactId>org.pi4soa.common</artifactId>
+ <version>${pi4soa.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.pi4soa</groupId>
+ <artifactId>org.pi4soa.cdl</artifactId>
+ <version>${pi4soa.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.savara.dependencies.eclipse</groupId>
+ <artifactId>emf-common</artifactId>
+ <version>${emfcommon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.savara.dependencies.eclipse</groupId>
+ <artifactId>emf-ecore</artifactId>
+ <version>${emfecore.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.savara.dependencies.eclipse</groupId>
+ <artifactId>emf-ecore-xmi</artifactId>
+ <version>${emfecore.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.bpel.tests/src/test/java/org/savara/bpel/parser/ParserTest.java
===================================================================
---
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/parser/ParserTest.java 2011-01-05
17:36:26 UTC (rev 536)
+++
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/parser/ParserTest.java 2011-01-05
22:13:01 UTC (rev 537)
@@ -19,7 +19,6 @@
import java.net.URI;
-import org.savara.util.ScribbleServices;
import org.scribble.common.logging.CachedJournal;
import org.scribble.common.resource.ResourceLocator;
import org.scribble.protocol.model.ProtocolModel;
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-05
17:36:26 UTC (rev 536)
+++
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)Broker.bpel 2011-01-05
22:13:01 UTC (rev 537)
@@ -1,61 +1,61 @@
<?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"
name="ESBBrokerProcess_Broker"
targetNamespace="http://www.pi4soa.org/ESBBroker/Broker">
- <import
namespace="http://www.pi4soa.org/ESBBroker/Broker"
location="ESBBrokerProcess_Broker.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import
namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"
location="ESBBrokerProcess_CreditAgency.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import
namespace="http://www.pi4soa.org/ESBBroker/Supplier"
location="ESBBrokerProcess_Supplier.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import
namespace="http://www.pi4soa.org/ESBBroker/Broker"
location="ESBBrokerProcess_BrokerArtifacts.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/"/>
+<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_BrokerArtifacts.wsdl"
namespace="http://www.pi4soa.org/ESBBroker/Broker"/>
<partnerLinks>
- <partnerLink name="BuyerToBroker"
partnerLinkType="brk:BuyerToBrokerServiceLT"
myRole="BrokerBehavior"/>
- <partnerLink name="BrokerToSupplierQuoteEngine"
partnerLinkType="brk:BrokerToSupplierQuoteEngineLT"
partnerRole="SupplierQuoteEngineRequester"/>
- <partnerLink name="BrokerToCreditAgency"
partnerLinkType="brk:BrokerToCreditAgencyLT"
partnerRole="CreditAgencyRequester"/>
- <partnerLink name="BrokerToSupplierTxnProcessor"
partnerLinkType="brk:BrokerToSupplierTxnProcessorLT"
partnerRole="SupplierTxnProcessorRequester"/>
+ <partnerLink myRole="BrokerBehavior"
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"/>
</partnerLinks>
<variables>
- <variable name="makeEnquiryRequestVar"
messageType="brk:makeEnquiryRequest"/>
- <variable name="getQuoteRequestVar"
messageType="spr:getQuoteRequest"/>
- <variable name="getQuoteResponseVar"
messageType="spr:getQuoteResponse"/>
- <variable name="makeEnquiryResponseVar"
messageType="brk:makeEnquiryResponse"/>
- <variable name="checkCreditRequestVar"
messageType="cay:checkCreditRequest"/>
- <variable name="checkCreditResponseVar"
messageType="cay:checkCreditResponse"/>
- <variable name="confirmRequestVar"
messageType="spr:confirmRequest"/>
- <variable name="confirmResponseVar"
messageType="spr:confirmResponse"/>
- <variable name="buyResponseVar"
messageType="brk:buyResponse"/>
- <variable name="rejectedFaultVar"
messageType="brk:rejectedFault"/>
- <variable name="buyRequestVar"
messageType="brk:buyRequest"/>
- <variable name="cancelRequestVar"
messageType="brk:cancelRequest"/>
+ <variable messageType="brk:makeEnquiryRequest"
name="makeEnquiryRequestVar"/>
+ <variable messageType="spr:getQuoteRequest"
name="getQuoteRequestVar"/>
+ <variable messageType="spr:getQuoteResponse"
name="getQuoteResponseVar"/>
+ <variable messageType="brk:makeEnquiryResponse"
name="makeEnquiryResponseVar"/>
+ <variable messageType="cay:checkCreditRequest"
name="checkCreditRequestVar"/>
+ <variable messageType="cay:checkCreditResponse"
name="checkCreditResponseVar"/>
+ <variable messageType="spr:confirmRequest"
name="confirmRequestVar"/>
+ <variable messageType="spr:confirmResponse"
name="confirmResponseVar"/>
+ <variable messageType="brk:buyResponse"
name="buyResponseVar"/>
+ <variable messageType="brk:rejectedFault"
name="rejectedFaultVar"/>
+ <variable messageType="brk:buyRequest"
name="buyRequestVar"/>
+ <variable messageType="brk:cancelRequest"
name="cancelRequestVar"/>
</variables>
<sequence>
- <receive partnerLink="BuyerToBroker"
portType="brk:BrokerBehavior" operation="makeEnquiry"
variable="makeEnquiryRequestVar" createInstance="yes"
name="Receive_enquiry"/>
+ <receive createInstance="yes"
variable="makeEnquiryRequestVar" operation="makeEnquiry"
portType="brk:BrokerBehavior" partnerLink="BuyerToBroker"
name="Receive_enquiry"/>
<while>
<sequence>
<scope>
<sequence>
- <invoke partnerLink="BrokerToSupplierQuoteEngine"
portType="spr:SupplierBehavior" operation="getQuote"
inputVariable="getQuoteRequestVar"
outputVariable="getQuoteResponseVar" name="Send_requestForQuote"/>
+ <invoke outputVariable="getQuoteResponseVar"
inputVariable="getQuoteRequestVar" operation="getQuote"
portType="spr:SupplierBehavior"
partnerLink="BrokerToSupplierQuoteEngine"
name="Send_requestForQuote"/>
</sequence>
</scope>
</sequence>
</while>
- <reply partnerLink="BuyerToBroker"
portType="brk:BrokerBehavior" operation="makeEnquiry"
variable="makeEnquiryResponseVar" name="Send_quoteList"/>
+ <reply variable="makeEnquiryResponseVar"
operation="makeEnquiry" portType="brk:BrokerBehavior"
partnerLink="BuyerToBroker" name="Send_quoteList"/>
<pick>
- <onMessage partnerLink="BuyerToBroker"
portType="brk:BrokerBehavior" operation="buy"
variable="buyRequestVar">
+ <onMessage variable="buyRequestVar" operation="buy"
portType="brk:BrokerBehavior" partnerLink="BuyerToBroker">
<sequence>
<scope>
<faultHandlers>
- <catch faultName="cay:invalidCredit"
faultVariable="invalidCreditFaultVar"
faultMessageType="cay:invalidCreditFault">
+ <catch faultMessageType="cay:invalidCreditFault"
faultVariable="invalidCreditFaultVar"
faultName="cay:invalidCredit">
<sequence>
- <reply partnerLink="BuyerToBroker"
portType="brk:BrokerBehavior" operation="buy"
variable="rejectedFaultVar" faultName="brk:rejected"
name="Send_orderRejected"/>
+ <reply faultName="brk:rejected" variable="rejectedFaultVar"
operation="buy" portType="brk:BrokerBehavior"
partnerLink="BuyerToBroker" name="Send_orderRejected"/>
</sequence>
</catch>
</faultHandlers>
<sequence>
- <invoke partnerLink="BrokerToCreditAgency"
portType="cay:CreditAgencyBehavior" operation="checkCredit"
inputVariable="checkCreditRequestVar"
outputVariable="checkCreditResponseVar"
name="Send_CreditCheckRequest"/>
- <invoke
partnerLink="BrokerToSupplierTxnProcessor"
portType="spr:SupplierBehavior" operation="confirm"
inputVariable="confirmRequestVar" outputVariable="confirmResponseVar"
name="Send_orderConfirmed"/>
- <reply partnerLink="BuyerToBroker"
portType="brk:BrokerBehavior" operation="buy"
variable="buyResponseVar" name="Send_bookingReference"/>
+ <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"/>
</sequence>
</scope>
</sequence>
</onMessage>
- <onMessage partnerLink="BuyerToBroker"
portType="brk:BrokerBehavior" operation="cancel"
variable="cancelRequestVar">
+ <onMessage variable="cancelRequestVar"
operation="cancel" portType="brk:BrokerBehavior"
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-05
17:36:26 UTC (rev 536)
+++
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)Buyer.bpel 2011-01-05
22:13:01 UTC (rev 537)
@@ -1,37 +1,37 @@
<?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"
name="ESBBrokerProcess_Buyer"
targetNamespace="http://www.pi4soa.org/ESBBroker/Buyer">
- <import
namespace="http://www.pi4soa.org/ESBBroker/Broker"
location="ESBBrokerProcess_Broker.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import
namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"
location="ESBBrokerProcess_CreditAgency.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import
namespace="http://www.pi4soa.org/ESBBroker/Supplier"
location="ESBBrokerProcess_Supplier.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import
namespace="http://www.pi4soa.org/ESBBroker/Buyer"
location="ESBBrokerProcess_BuyerArtifacts.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/"/>
+<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_BuyerArtifacts.wsdl"
namespace="http://www.pi4soa.org/ESBBroker/Buyer"/>
<partnerLinks>
- <partnerLink name="BuyerToBroker"
partnerLinkType="byr:BuyerToBrokerLT"
partnerRole="BrokerRequester"/>
+ <partnerLink partnerRole="BrokerRequester"
partnerLinkType="byr:BuyerToBrokerLT" name="BuyerToBroker"/>
</partnerLinks>
<variables>
- <variable name="makeEnquiryRequestVar"
messageType="brk:makeEnquiryRequest"/>
- <variable name="makeEnquiryResponseVar"
messageType="brk:makeEnquiryResponse"/>
- <variable name="buyRequestVar"
messageType="byr:buyRequest"/>
- <variable name="buyResponseVar"
messageType="brk:buyResponse"/>
- <variable name="cancelRequestVar"
messageType="byr:cancelRequest"/>
+ <variable messageType="brk:makeEnquiryRequest"
name="makeEnquiryRequestVar"/>
+ <variable messageType="brk:makeEnquiryResponse"
name="makeEnquiryResponseVar"/>
+ <variable messageType="byr:buyRequest"
name="buyRequestVar"/>
+ <variable messageType="brk:buyResponse"
name="buyResponseVar"/>
+ <variable messageType="byr:cancelRequest"
name="cancelRequestVar"/>
</variables>
<sequence>
- <invoke partnerLink="BuyerToBroker"
portType="brk:BrokerBehavior" operation="makeEnquiry"
inputVariable="makeEnquiryRequestVar"
outputVariable="makeEnquiryResponseVar" name="Send_enquiry"/>
+ <invoke outputVariable="makeEnquiryResponseVar"
inputVariable="makeEnquiryRequestVar" operation="makeEnquiry"
portType="brk:BrokerBehavior" partnerLink="BuyerToBroker"
name="Send_enquiry"/>
<if>
<sequence>
<scope>
<faultHandlers>
- <catch faultName="brk:rejected"
faultVariable="rejectedFaultVar"
faultMessageType="brk:rejectedFault">
+ <catch faultMessageType="brk:rejectedFault"
faultVariable="rejectedFaultVar" faultName="brk:rejected">
<sequence/>
</catch>
</faultHandlers>
<sequence>
- <invoke partnerLink="BuyerToBroker"
portType="byr:BuyerBehavior" operation="buy"
inputVariable="buyRequestVar" outputVariable="buyResponseVar"
name="Send_buy"/>
+ <invoke outputVariable="buyResponseVar"
inputVariable="buyRequestVar" operation="buy"
portType="byr:BuyerBehavior" partnerLink="BuyerToBroker"
name="Send_buy"/>
</sequence>
</scope>
</sequence>
<else>
<sequence>
- <invoke partnerLink="BuyerToBroker"
portType="byr:BuyerBehavior" operation="cancel"
inputVariable="cancelRequestVar" name="Send_cancel"/>
+ <invoke inputVariable="cancelRequestVar"
operation="cancel" portType="byr:BuyerBehavior"
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-05
17:36:26 UTC (rev 536)
+++
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)CreditAgency.bpel 2011-01-05
22:13:01 UTC (rev 537)
@@ -1,27 +1,27 @@
<?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"
name="ESBBrokerProcess_CreditAgency"
targetNamespace="http://www.pi4soa.org/ESBBroker/CreditAgency">
- <import
namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"
location="ESBBrokerProcess_CreditAgency.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import
namespace="http://www.pi4soa.org/ESBBroker/Broker"
location="ESBBrokerProcess_Broker.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import
namespace="http://www.pi4soa.org/ESBBroker/Supplier"
location="ESBBrokerProcess_Supplier.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import
namespace="http://www.pi4soa.org/ESBBroker/Supplier"
location="ESBBrokerProcess_SupplierTxnProcessor.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import
namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"
location="ESBBrokerProcess_CreditAgencyArtifacts.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/"/>
+<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>
- <partnerLink name="BrokerToCreditAgency"
partnerLinkType="cay:BrokerToCreditAgencyServiceLT"
myRole="CreditAgency"/>
+ <partnerLink myRole="CreditAgency"
partnerLinkType="cay:BrokerToCreditAgencyServiceLT"
name="BrokerToCreditAgency"/>
</partnerLinks>
<variables>
- <variable name="checkCreditRequestVar"
messageType="cay:checkCreditRequest"/>
- <variable name="checkCreditResponseVar"
messageType="cay:checkCreditResponse"/>
- <variable name="invalidCreditFaultVar"
messageType="cay:invalidCreditFault"/>
+ <variable messageType="cay:checkCreditRequest"
name="checkCreditRequestVar"/>
+ <variable messageType="cay:checkCreditResponse"
name="checkCreditResponseVar"/>
+ <variable messageType="cay:invalidCreditFault"
name="invalidCreditFaultVar"/>
</variables>
<sequence>
- <receive partnerLink="BrokerToCreditAgency"
portType="cay:CreditAgencyBehavior" operation="checkCredit"
variable="checkCreditRequestVar" createInstance="yes"
name="Receive_CreditCheckRequest"/>
+ <receive createInstance="yes"
variable="checkCreditRequestVar" operation="checkCredit"
portType="cay:CreditAgencyBehavior" partnerLink="BrokerToCreditAgency"
name="Receive_CreditCheckRequest"/>
<if>
<sequence>
- <reply partnerLink="BrokerToCreditAgency"
portType="cay:CreditAgencyBehavior" operation="checkCredit"
variable="checkCreditResponseVar" name="Send_CreditCheckOk"/>
+ <reply variable="checkCreditResponseVar"
operation="checkCredit" portType="cay:CreditAgencyBehavior"
partnerLink="BrokerToCreditAgency" name="Send_CreditCheckOk"/>
</sequence>
<else>
<sequence>
- <reply partnerLink="BrokerToCreditAgency"
portType="cay:CreditAgencyBehavior" operation="checkCredit"
variable="invalidCreditFaultVar" faultName="cay:invalidCredit"
name="Send_CreditCheckInvalid"/>
+ <reply faultName="cay:invalidCredit"
variable="invalidCreditFaultVar" operation="checkCredit"
portType="cay:CreditAgencyBehavior" 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-05
17:36:26 UTC (rev 536)
+++
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel 2011-01-05
22:13:01 UTC (rev 537)
@@ -1,16 +1,16 @@
<?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"
name="RequestForQuote_SupplierQuoteEngine"
targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier">
- <import
namespace="http://www.pi4soa.org/ESBBroker/Supplier"
location="RequestForQuote_SupplierQuoteEngine.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import
namespace="http://www.pi4soa.org/ESBBroker/Supplier"
location="RequestForQuote_SupplierQuoteEngineArtifacts.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/"/>
+<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="RequestForQuote_SupplierQuoteEngine">
+ <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 name="BrokerToSupplierQuoteEngine"
partnerLinkType="spr:BrokerToSupplierQuoteEngineServiceLT"
myRole="SupplierBehavior"/>
+ <partnerLink myRole="SupplierBehavior"
partnerLinkType="spr:BrokerToSupplierQuoteEngineServiceLT"
name="BrokerToSupplierQuoteEngine"/>
</partnerLinks>
<variables>
- <variable name="getQuoteRequestVar"
messageType="spr:getQuoteRequest"/>
- <variable name="getQuoteResponseVar"
messageType="spr:getQuoteResponse"/>
+ <variable messageType="spr:getQuoteRequest"
name="getQuoteRequestVar"/>
+ <variable messageType="spr:getQuoteResponse"
name="getQuoteResponseVar"/>
</variables>
<sequence>
- <receive partnerLink="BrokerToSupplierQuoteEngine"
portType="spr:SupplierBehavior" operation="getQuote"
variable="getQuoteRequestVar" createInstance="yes"
name="Receive_requestForQuote"/>
- <reply partnerLink="BrokerToSupplierQuoteEngine"
portType="spr:SupplierBehavior" operation="getQuote"
variable="getQuoteResponseVar" name="Send_quote"/>
+ <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"/>
</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-05
17:36:26 UTC (rev 536)
+++
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel 2011-01-05
22:13:01 UTC (rev 537)
@@ -1,16 +1,16 @@
<?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"
name="CompleteTransaction_SupplierTxnProcessor"
targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier">
- <import
namespace="http://www.pi4soa.org/ESBBroker/Supplier"
location="CompleteTransaction_SupplierTxnProcessor.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import
namespace="http://www.pi4soa.org/ESBBroker/Supplier"
location="CompleteTransaction_SupplierTxnProcessorArtifacts.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/"/>
+<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"/>
<partnerLinks>
- <partnerLink name="BrokerToSupplierTxnProcessor"
partnerLinkType="spr:BrokerToSupplierTxnProcessorServiceLT"
myRole="SupplierTxnProcessor"/>
+ <partnerLink myRole="SupplierTxnProcessor"
partnerLinkType="spr:BrokerToSupplierTxnProcessorServiceLT"
name="BrokerToSupplierTxnProcessor"/>
</partnerLinks>
<variables>
- <variable name="confirmRequestVar"
messageType="spr:confirmRequest"/>
- <variable name="confirmResponseVar"
messageType="spr:confirmResponse"/>
+ <variable messageType="spr:confirmRequest"
name="confirmRequestVar"/>
+ <variable messageType="spr:confirmResponse"
name="confirmResponseVar"/>
</variables>
<sequence>
- <receive partnerLink="BrokerToSupplierTxnProcessor"
portType="spr:SupplierBehavior" operation="confirm"
variable="confirmRequestVar" createInstance="yes"
name="Receive_orderConfirmed"/>
- <reply partnerLink="BrokerToSupplierTxnProcessor"
portType="spr:SupplierBehavior" operation="confirm"
variable="confirmResponseVar" name="Send_bookingReference"/>
+ <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"/>
</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-05
17:36:26 UTC (rev 536)
+++
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)Buyer.bpel 2011-01-05
22:13:01 UTC (rev 537)
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="UTF-8"
standalone="yes"?>
-<process
xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
xmlns:tns="http://www.jboss.org/savara/examples"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:sto="http://www.jboss.org/examples/store"
xmlns:pur="java:org.jboss.savara.examples.purchasing"
name="PurchaseGoodsProcess_Buyer"
targetNamespace="http://www.jboss.org/savara/examples">
- <import namespace="java:org.jboss.savara.examples.purchasing"
location="PurchaseGoodsProcess_CreditAgency.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import
namespace="http://www.jboss.org/examples/store"
location="PurchaseGoodsProcess_Store.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import
namespace="http://www.jboss.org/savara/examples"
location="PurchaseGoodsProcess_BuyerArtifacts.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/"/>
+<process
xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
xmlns:tns="http://www.jboss.org/savara/examples"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:sto="http://www.jboss.org/examples/store"
xmlns:pur="java:org.jboss.savara.examples.purchasing"
targetNamespace="http://www.jboss.org/savara/examples"
name="PurchaseGoodsProcess_Buyer">
+ <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_Store.wsdl"
namespace="http://www.jboss.org/examples/store"/>
+ <import
importType="http://schemas.xmlsoap.org/wsdl/"
location="PurchaseGoodsProcess_BuyerArtifacts.wsdl"
namespace="http://www.jboss.org/savara/examples"/>
<partnerLinks>
- <partnerLink name="BuyerToStore"
partnerLinkType="tns:BuyerToStoreLT"
partnerRole="StoreRequester"/>
+ <partnerLink partnerRole="StoreRequester"
partnerLinkType="tns:BuyerToStoreLT" name="BuyerToStore"/>
</partnerLinks>
<variables>
- <variable name="buyRequestVar"
messageType="sto:buyRequest"/>
- <variable name="buyResponseVar"
messageType="sto:buyResponse"/>
+ <variable messageType="sto:buyRequest"
name="buyRequestVar"/>
+ <variable messageType="sto:buyResponse"
name="buyResponseVar"/>
</variables>
<sequence>
<scope>
<faultHandlers>
- <catch faultName="sto:BuyFailed"
faultVariable="BuyFailedFaultVar"
faultMessageType="sto:BuyFailedFault">
+ <catch faultMessageType="sto:BuyFailedFault"
faultVariable="BuyFailedFaultVar" faultName="sto:BuyFailed">
<sequence/>
</catch>
</faultHandlers>
<sequence>
- <invoke partnerLink="BuyerToStore"
portType="sto:StoreInterface" operation="buy"
inputVariable="buyRequestVar" outputVariable="buyResponseVar"
name="Send_BuyRequest"/>
+ <invoke outputVariable="buyResponseVar"
inputVariable="buyRequestVar" operation="buy"
portType="sto:StoreInterface" 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-05
17:36:26 UTC (rev 536)
+++
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)CreditAgency.bpel 2011-01-05
22:13:01 UTC (rev 537)
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="UTF-8"
standalone="yes"?>
-<process
xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
xmlns:tns="http://www.jboss.org/savara/examples"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:sto="http://www.jboss.org/examples/store"
xmlns:pur="java:org.jboss.savara.examples.purchasing"
name="PurchaseGoodsProcess_CreditAgency"
targetNamespace="java:org.jboss.savara.examples.purchasing">
- <import namespace="java:org.jboss.savara.examples.purchasing"
location="PurchaseGoodsProcess_CreditAgency.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import
namespace="http://www.jboss.org/examples/store"
location="PurchaseGoodsProcess_Store.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import namespace="java:org.jboss.savara.examples.purchasing"
location="PurchaseGoodsProcess_CreditAgencyArtifacts.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/"/>
+<process
xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
xmlns:tns="http://www.jboss.org/savara/examples"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:sto="http://www.jboss.org/examples/store"
xmlns:pur="java:org.jboss.savara.examples.purchasing"
targetNamespace="java:org.jboss.savara.examples.purchasing"
name="PurchaseGoodsProcess_CreditAgency">
+ <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_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 name="StoreToCreditAgency"
partnerLinkType="pur:StoreToCreditAgencyServiceLT"
myRole="CreditAgencyInterface"/>
+ <partnerLink myRole="CreditAgencyInterface"
partnerLinkType="pur:StoreToCreditAgencyServiceLT"
name="StoreToCreditAgency"/>
</partnerLinks>
<variables>
- <variable name="checkCreditRequestVar"
messageType="pur:checkCreditRequest"/>
- <variable name="checkCreditResponseVar"
messageType="pur:checkCreditResponse"/>
- <variable name="CreditCheckFailedFaultVar"
messageType="pur:CreditCheckFailedFault"/>
+ <variable messageType="pur:checkCreditRequest"
name="checkCreditRequestVar"/>
+ <variable messageType="pur:checkCreditResponse"
name="checkCreditResponseVar"/>
+ <variable messageType="pur:CreditCheckFailedFault"
name="CreditCheckFailedFaultVar"/>
</variables>
<sequence>
- <receive partnerLink="StoreToCreditAgency"
portType="pur:CreditAgencyInterface" operation="checkCredit"
variable="checkCreditRequestVar" createInstance="yes"
name="Receive_CreditCheckRequest"/>
+ <receive createInstance="yes"
variable="checkCreditRequestVar" operation="checkCredit"
portType="pur:CreditAgencyInterface" partnerLink="StoreToCreditAgency"
name="Receive_CreditCheckRequest"/>
<if>
<sequence>
- <reply partnerLink="StoreToCreditAgency"
portType="pur:CreditAgencyInterface" operation="checkCredit"
variable="checkCreditResponseVar" name="Send_CreditCheckOk"/>
+ <reply variable="checkCreditResponseVar"
operation="checkCredit" portType="pur:CreditAgencyInterface"
partnerLink="StoreToCreditAgency" name="Send_CreditCheckOk"/>
</sequence>
<else>
<sequence>
- <reply partnerLink="StoreToCreditAgency"
portType="pur:CreditAgencyInterface" operation="checkCredit"
variable="CreditCheckFailedFaultVar" faultName="pur:CreditCheckFailed"
name="Send_CreditCheckInvalid"/>
+ <reply faultName="pur:CreditCheckFailed"
variable="CreditCheckFailedFaultVar" operation="checkCredit"
portType="pur:CreditAgencyInterface" 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-05
17:36:26 UTC (rev 536)
+++
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)Store.bpel 2011-01-05
22:13:01 UTC (rev 537)
@@ -1,32 +1,32 @@
<?xml version="1.0" encoding="UTF-8"
standalone="yes"?>
-<process
xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
xmlns:tns="http://www.jboss.org/savara/examples"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:sto="http://www.jboss.org/examples/store"
xmlns:pur="java:org.jboss.savara.examples.purchasing"
name="PurchaseGoodsProcess_Store"
targetNamespace="http://www.jboss.org/examples/store">
- <import
namespace="http://www.jboss.org/examples/store"
location="PurchaseGoodsProcess_Store.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import namespace="java:org.jboss.savara.examples.purchasing"
location="PurchaseGoodsProcess_CreditAgency.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import
namespace="http://www.jboss.org/examples/store"
location="PurchaseGoodsProcess_StoreArtifacts.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/"/>
+<process
xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
xmlns:tns="http://www.jboss.org/savara/examples"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:sto="http://www.jboss.org/examples/store"
xmlns:pur="java:org.jboss.savara.examples.purchasing"
targetNamespace="http://www.jboss.org/examples/store"
name="PurchaseGoodsProcess_Store">
+ <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_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 name="BuyerToStore"
partnerLinkType="sto:BuyerToStoreServiceLT"
myRole="StoreInterface"/>
- <partnerLink name="StoreToCreditAgency"
partnerLinkType="sto:StoreToCreditAgencyLT"
partnerRole="CreditAgencyRequester"/>
+ <partnerLink myRole="StoreInterface"
partnerLinkType="sto:BuyerToStoreServiceLT" name="BuyerToStore"/>
+ <partnerLink partnerRole="CreditAgencyRequester"
partnerLinkType="sto:StoreToCreditAgencyLT"
name="StoreToCreditAgency"/>
</partnerLinks>
<variables>
- <variable name="buyRequestVar"
messageType="sto:buyRequest"/>
- <variable name="checkCreditRequestVar"
messageType="pur:checkCreditRequest"/>
- <variable name="checkCreditResponseVar"
messageType="pur:checkCreditResponse"/>
- <variable name="buyResponseVar"
messageType="sto:buyResponse"/>
- <variable name="BuyFailedFaultVar"
messageType="sto:BuyFailedFault"/>
+ <variable messageType="sto:buyRequest"
name="buyRequestVar"/>
+ <variable messageType="pur:checkCreditRequest"
name="checkCreditRequestVar"/>
+ <variable messageType="pur:checkCreditResponse"
name="checkCreditResponseVar"/>
+ <variable messageType="sto:buyResponse"
name="buyResponseVar"/>
+ <variable messageType="sto:BuyFailedFault"
name="BuyFailedFaultVar"/>
</variables>
<sequence>
- <receive partnerLink="BuyerToStore"
portType="sto:StoreInterface" operation="buy"
variable="buyRequestVar" createInstance="yes"
name="Receive_BuyRequest"/>
+ <receive createInstance="yes" variable="buyRequestVar"
operation="buy" portType="sto:StoreInterface"
partnerLink="BuyerToStore" name="Receive_BuyRequest"/>
<scope>
<faultHandlers>
- <catch faultName="pur:CreditCheckFailed"
faultVariable="CreditCheckFailedFaultVar"
faultMessageType="pur:CreditCheckFailedFault">
+ <catch faultMessageType="pur:CreditCheckFailedFault"
faultVariable="CreditCheckFailedFaultVar"
faultName="pur:CreditCheckFailed">
<sequence>
- <reply partnerLink="BuyerToStore"
portType="sto:StoreInterface" operation="buy"
variable="BuyFailedFaultVar" faultName="sto:BuyFailed"
name="Send_BuyFailed"/>
+ <reply faultName="sto:BuyFailed"
variable="BuyFailedFaultVar" operation="buy"
portType="sto:StoreInterface" partnerLink="BuyerToStore"
name="Send_BuyFailed"/>
</sequence>
</catch>
</faultHandlers>
<sequence>
- <invoke partnerLink="StoreToCreditAgency"
portType="pur:CreditAgencyInterface" operation="checkCredit"
inputVariable="checkCreditRequestVar"
outputVariable="checkCreditResponseVar"
name="Send_CreditCheckRequest"/>
- <reply partnerLink="BuyerToStore"
portType="sto:StoreInterface" operation="buy"
variable="buyResponseVar" name="Send_BuyConfirmed"/>
+ <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"/>
</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-05
17:36:26 UTC (rev 536)
+++
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ReqRespFault(a)Buyer.bpel 2011-01-05
22:13:01 UTC (rev 537)
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8"
standalone="yes"?>
-<process
xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
xmlns:tns="http://www.pi4soa.org/ReqRespFault"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:byr="http://www.pi4soa.org/ReqRespFault/Buyer"
xmlns:slr="http://www.pi4soa.org/ReqRespFault/Seller"
name="ReqRespFaultProcess_Buyer"
targetNamespace="http://www.pi4soa.org/ReqRespFault/Buyer">
- <import
namespace="http://www.pi4soa.org/ReqRespFault/Seller"
location="ReqRespFaultProcess_Seller.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import
namespace="http://www.pi4soa.org/ReqRespFault/Buyer"
location="ReqRespFaultProcess_BuyerArtifacts.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/"/>
+<process
xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
xmlns:tns="http://www.pi4soa.org/ReqRespFault"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:byr="http://www.pi4soa.org/ReqRespFault/Buyer"
xmlns:slr="http://www.pi4soa.org/ReqRespFault/Seller"
targetNamespace="http://www.pi4soa.org/ReqRespFault/Buyer"
name="ReqRespFaultProcess_Buyer">
+ <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_BuyerArtifacts.wsdl"
namespace="http://www.pi4soa.org/ReqRespFault/Buyer"/>
<partnerLinks>
- <partnerLink name="BuyerToSeller"
partnerLinkType="byr:BuyerToSellerLT"
partnerRole="SellerRequester"/>
+ <partnerLink partnerRole="SellerRequester"
partnerLinkType="byr:BuyerToSellerLT" name="BuyerToSeller"/>
</partnerLinks>
<variables>
- <variable name="checkCreditRequestVar"
messageType="slr:checkCreditRequest"/>
- <variable name="checkCreditResponseVar"
messageType="slr:checkCreditResponse"/>
+ <variable messageType="slr:checkCreditRequest"
name="checkCreditRequestVar"/>
+ <variable messageType="slr:checkCreditResponse"
name="checkCreditResponseVar"/>
</variables>
<sequence>
<scope>
<faultHandlers>
- <catch faultName="slr:insufficientCredit"
faultVariable="insufficientCreditFaultVar"
faultMessageType="slr:insufficientCreditFault">
+ <catch faultMessageType="slr:insufficientCreditFault"
faultVariable="insufficientCreditFaultVar"
faultName="slr:insufficientCredit">
<sequence/>
</catch>
</faultHandlers>
<sequence>
- <invoke partnerLink="BuyerToSeller"
portType="slr:SellerBehavior" operation="checkCredit"
inputVariable="checkCreditRequestVar"
outputVariable="checkCreditResponseVar"
name="Send_CreditCheckRequest"/>
+ <invoke outputVariable="checkCreditResponseVar"
inputVariable="checkCreditRequestVar" operation="checkCredit"
portType="slr:SellerBehavior" 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-05
17:36:26 UTC (rev 536)
+++
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ReqRespFault(a)Seller.bpel 2011-01-05
22:13:01 UTC (rev 537)
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="UTF-8"
standalone="yes"?>
-<process
xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
xmlns:tns="http://www.pi4soa.org/ReqRespFault"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:byr="http://www.pi4soa.org/ReqRespFault/Buyer"
xmlns:slr="http://www.pi4soa.org/ReqRespFault/Seller"
name="ReqRespFaultProcess_Seller"
targetNamespace="http://www.pi4soa.org/ReqRespFault/Seller">
- <import
namespace="http://www.pi4soa.org/ReqRespFault/Seller"
location="ReqRespFaultProcess_Seller.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import
namespace="http://www.pi4soa.org/ReqRespFault/Seller"
location="ReqRespFaultProcess_SellerArtifacts.wsdl"
importType="http://schemas.xmlsoap.org/wsdl/"/>
+<process
xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable"
xmlns:tns="http://www.pi4soa.org/ReqRespFault"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:byr="http://www.pi4soa.org/ReqRespFault/Buyer"
xmlns:slr="http://www.pi4soa.org/ReqRespFault/Seller"
targetNamespace="http://www.pi4soa.org/ReqRespFault/Seller"
name="ReqRespFaultProcess_Seller">
+ <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 name="BuyerToSeller"
partnerLinkType="slr:BuyerToSellerServiceLT"
myRole="SellerBehavior"/>
+ <partnerLink myRole="SellerBehavior"
partnerLinkType="slr:BuyerToSellerServiceLT"
name="BuyerToSeller"/>
</partnerLinks>
<variables>
- <variable name="checkCreditRequestVar"
messageType="slr:checkCreditRequest"/>
- <variable name="checkCreditResponseVar"
messageType="slr:checkCreditResponse"/>
- <variable name="insufficientCreditFaultVar"
messageType="slr:insufficientCreditFault"/>
+ <variable messageType="slr:checkCreditRequest"
name="checkCreditRequestVar"/>
+ <variable messageType="slr:checkCreditResponse"
name="checkCreditResponseVar"/>
+ <variable messageType="slr:insufficientCreditFault"
name="insufficientCreditFaultVar"/>
</variables>
<sequence>
- <receive partnerLink="BuyerToSeller"
portType="slr:SellerBehavior" operation="checkCredit"
variable="checkCreditRequestVar" createInstance="yes"
name="Receive_CreditCheckRequest"/>
+ <receive createInstance="yes"
variable="checkCreditRequestVar" operation="checkCredit"
portType="slr:SellerBehavior" partnerLink="BuyerToSeller"
name="Receive_CreditCheckRequest"/>
<if>
<sequence>
- <reply partnerLink="BuyerToSeller"
portType="slr:SellerBehavior" operation="checkCredit"
variable="checkCreditResponseVar" name="Send_CreditCheckOk"/>
+ <reply variable="checkCreditResponseVar"
operation="checkCredit" portType="slr:SellerBehavior"
partnerLink="BuyerToSeller" name="Send_CreditCheckOk"/>
</sequence>
<else>
<sequence>
- <reply partnerLink="BuyerToSeller"
portType="slr:SellerBehavior" operation="checkCredit"
variable="insufficientCreditFaultVar"
faultName="slr:insufficientCredit"
name="Send_CreditCheckInvalid"/>
+ <reply faultName="slr:insufficientCredit"
variable="insufficientCreditFaultVar" operation="checkCredit"
portType="slr:SellerBehavior" partnerLink="BuyerToSeller"
name="Send_CreditCheckInvalid"/>
</sequence>
</else>
</if>
Modified: branches/experimental/2.0.x/bundles/org.savara.core/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.core/META-INF/MANIFEST.MF 2011-01-05
17:36:26 UTC (rev 536)
+++ branches/experimental/2.0.x/bundles/org.savara.core/META-INF/MANIFEST.MF 2011-01-05
22:13:01 UTC (rev 537)
@@ -8,8 +8,7 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.framework;version="1.3.0"
Require-Bundle: org.scribble.common,
- org.scribble.protocol,
- org.scribble.protocol.monitor
+ org.scribble.protocol
Export-Package: org.savara.model.change,
org.savara.model.generator,
org.savara.util
Property changes on: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm
___________________________________________________________________
Name: svn:ignore
- bin
+ bin
target
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-05 17:36:26
UTC (rev 536)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/pom.xml 2011-01-05 22:13:01
UTC (rev 537)
@@ -1,15 +1,15 @@
<project
xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
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.tools</groupId>
+ <groupId>org.savara.bundles</groupId>
<artifactId>org.savara.pi4soa.cdm</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
- <name>Savara::Tools::Plugins::Pi4SOACDM</name>
+ <packaging>jar</packaging>
+ <name>Savara::Bundles::Pi4SOACDM</name>
<parent>
- <groupId>org.savara.tools</groupId>
- <artifactId>plugins</artifactId>
+ <groupId>org.savara</groupId>
+ <artifactId>bundles</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>
@@ -44,6 +44,37 @@
<artifactId>org.savara.contract.model</artifactId>
<version>${savara.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.pi4soa</groupId>
+ <artifactId>org.pi4soa.common</artifactId>
+ <version>${pi4soa.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.pi4soa</groupId>
+ <artifactId>org.pi4soa.cdl</artifactId>
+ <version>${pi4soa.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.savara.dependencies.eclipse</groupId>
+ <artifactId>emf-common</artifactId>
+ <version>${emfcommon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.savara.dependencies.eclipse</groupId>
+ <artifactId>emf-ecore</artifactId>
+ <version>${emfecore.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.savara.dependencies.eclipse</groupId>
+ <artifactId>emf-ecore-xmi</artifactId>
+ <version>${emfecore.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<!--
Modified:
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/CDMProtocolParserTest.java
===================================================================
---
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/CDMProtocolParserTest.java 2011-01-05
17:36:26 UTC (rev 536)
+++
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/CDMProtocolParserTest.java 2011-01-05
22:13:01 UTC (rev 537)
@@ -3,7 +3,6 @@
import static org.junit.Assert.*;
import org.scribble.common.logging.Journal;
-import org.scribble.common.logging.TestJournal;
import org.scribble.protocol.model.ProtocolModel;
public class CDMProtocolParserTest {
Added:
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/TestJournal.java
===================================================================
---
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/TestJournal.java
(rev 0)
+++
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/TestJournal.java 2011-01-05
22:13:01 UTC (rev 537)
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2009
www.scribble.org
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *
http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.savara.pi4soa.cdm.parser;
+
+import java.util.Map;
+
+import org.scribble.common.logging.Journal;
+
+//import static org.junit.Assert.*;
+
+(a)org.junit.Ignore
+public class TestJournal implements Journal {
+
+ public void debug(String issue, Map<String, Object> props) {
+ }
+
+ public void error(String issue, Map<String, Object> props) {
+ m_errors.add(issue);
+ }
+
+ public int getErrorCount() {
+ return(m_errors.size());
+ }
+
+ public void verifyErrors(String[] errors) {
+ java.util.List<String> logged=new java.util.Vector<String>(m_errors);
+
+ for (int i=0; i < errors.length; i++) {
+ int ind=logged.indexOf(errors[i]);
+
+ if (ind == -1) {
+ //fail("Expected message '"+errors[i]+"' did not
occur");
+ throw new RuntimeException("Expected message '"+errors[i]+"'
did not occur");
+ } else {
+ logged.remove(ind);
+ }
+ }
+
+ if (logged.size() > 0) {
+ //fail("Unexpected errors occurred: "+logged);
+ throw new RuntimeException("Unexpected errors occurred: "+logged);
+ }
+ }
+
+ public void info(String issue, Map<String, Object> props) {
+ }
+
+ public void trace(String issue, Map<String, Object> props) {
+ }
+
+ public void warning(String issue, Map<String, Object> props) {
+ }
+
+ private java.util.List<String> m_errors=new java.util.Vector<String>();
+}
Modified: branches/experimental/2.0.x/bundles/pom.xml
===================================================================
--- branches/experimental/2.0.x/bundles/pom.xml 2011-01-05 17:36:26 UTC (rev 536)
+++ branches/experimental/2.0.x/bundles/pom.xml 2011-01-05 22:13:01 UTC (rev 537)
@@ -20,10 +20,12 @@
</properties>
<modules>
+ <module>org.savara.bpel</module>
+ <module>org.savara.bpel.tests</module>
+ <module>org.savara.contract.model</module>
<module>org.savara.core</module>
- <module>org.savara.contract.model</module>
+ <module>org.savara.pi4soa.cdm</module>
<module>org.savara.wsdl</module>
- <module>org.savara.bpel</module>
</modules>
<build>
Modified: branches/experimental/2.0.x/pom.xml
===================================================================
--- branches/experimental/2.0.x/pom.xml 2011-01-05 17:36:26 UTC (rev 536)
+++ branches/experimental/2.0.x/pom.xml 2011-01-05 22:13:01 UTC (rev 537)
@@ -48,6 +48,8 @@
<jaxb.version>2.1</jaxb.version>
<jboss.version>5.1.0.GA</jboss.version>
<jbossws.version>3.2.2.GA</jbossws.version>
+ <emfcommon.version>2.3.0</emfcommon.version>
+ <emfecore.version>2.3.1</emfecore.version>
</properties>
<modules>
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/pom.xml 2011-01-05
17:36:26 UTC (rev 536)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/pom.xml 2011-01-05
22:13:01 UTC (rev 537)
@@ -16,11 +16,11 @@
<dependencies>
<dependency>
<groupId>org.scribble.bundles</groupId>
- <artifactId>org.scribble.parser</artifactId>
+ <artifactId>org.scribble.protocol</artifactId>
<version>${scribble.version}</version>
</dependency>
<dependency>
- <groupId>org.savara.bundles</groupId>
+ <groupId>org.scribble.bundles</groupId>
<artifactId>org.scribble.protocol.parser</artifactId>
<version>${scribble.version}</version>
</dependency>
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/pom.xml 2011-01-05
17:36:26 UTC (rev 536)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/pom.xml 2011-01-05
22:13:01 UTC (rev 537)
@@ -16,7 +16,7 @@
<dependencies>
<dependency>
<groupId>org.scribble.bundles</groupId>
- <artifactId>org.scribble.parser</artifactId>
+ <artifactId>org.scribble.protocol</artifactId>
<version>${scribble.version}</version>
</dependency>
<dependency>
Modified: branches/experimental/2.0.x/tools/plugins/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/plugins/pom.xml 2011-01-05 17:36:26 UTC (rev 536)
+++ branches/experimental/2.0.x/tools/plugins/pom.xml 2011-01-05 22:13:01 UTC (rev 537)
@@ -5,27 +5,26 @@
<groupId>org.savara.tools</groupId>
<artifactId>plugins</artifactId>
<packaging>pom</packaging>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<name>Savara::Tools::Plugins</name>
<parent>
<groupId>org.savara</groupId>
<artifactId>tools</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<modules>
- <module>org.savara.pi4soa.cdm</module>
<module>org.savara.protocol.contract</module>
+ <module>org.savara.tap.eclipse</module>
<module>org.savara.tap.model</module>
<module>org.savara.tap.validation</module>
- <module>org.savara.tap.eclipse</module>
- <module>org.savara.tools.wsdl</module>
<module>org.savara.tools.bpel</module>
- <module>org.savara.tools.validator</module>
<module>org.savara.tools.bpmn</module>
+ <module>org.savara.tools.core</module>
<module>org.savara.tools.monitor</module>
- <module>org.scribble.eclipse</module>
+ <module>org.savara.tools.validator</module>
+ <module>org.savara.tools.wsdl</module>
</modules>
</project>
Modified: branches/experimental/2.0.x/tools/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/pom.xml 2011-01-05 17:36:26 UTC (rev 536)
+++ branches/experimental/2.0.x/tools/pom.xml 2011-01-05 22:13:01 UTC (rev 537)
@@ -27,6 +27,8 @@
</parent> -->
<properties>
+ <savara.version>2.0.0-SNAPSHOT</savara.version>
+ <scribble.version>2.0.0-SNAPSHOT</scribble.version>
<jaxb.version>2.1</jaxb.version>
<tycho-version>0.10.0</tycho-version>
</properties>
Modified:
branches/experimental/2.0.x/tools/tests/org.savara.protocol.contract.tests/pom.xml
===================================================================
---
branches/experimental/2.0.x/tools/tests/org.savara.protocol.contract.tests/pom.xml 2011-01-05
17:36:26 UTC (rev 536)
+++
branches/experimental/2.0.x/tools/tests/org.savara.protocol.contract.tests/pom.xml 2011-01-05
22:13:01 UTC (rev 537)
@@ -21,7 +21,7 @@
</dependency>
<dependency>
<groupId>org.scribble.bundles</groupId>
- <artifactId>org.scribble.parser</artifactId>
+ <artifactId>org.scribble.protocol</artifactId>
<version>${scribble.version}</version>
</dependency>
<dependency>