January 2011 - savara-commits - Jboss List Archives

savara SVN: r573 - in branches/experimental/2.0.x/bundles: org.savara.bundles.tests/src/main/java/org/savara/bpel and 1 other directories.

by do-not-reply＠jboss.org

Author: objectiser Date: 2011-01-13 06:51:24 -0500 (Thu, 13 Jan 2011) New Revision: 573 Removed: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/main/java/org/savara/bpel/tests/ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/java/org/savara/bpel/ Log: Remove old bpel tests bundle.

13 years, 5 months

1
0
0 / 0

savara SVN: r572 - branches/experimental/2.0.x/bundles.

by do-not-reply＠jboss.org

Author: objectiser Date: 2011-01-13 06:39:28 -0500 (Thu, 13 Jan 2011) New Revision: 572 Modified: branches/experimental/2.0.x/bundles/pom.xml Log: Rename org.savara.bpel.tests to org.savara.bundles.tests, to represent a general test plugin used to test across bundles. Modified: branches/experimental/2.0.x/bundles/pom.xml =================================================================== --- branches/experimental/2.0.x/bundles/pom.xml 2011-01-13 10:19:44 UTC (rev 571) +++ branches/experimental/2.0.x/bundles/pom.xml 2011-01-13 11:39:28 UTC (rev 572) @@ -21,12 +21,12 @@ <modules> <module>org.savara.bpel</module> - <module>org.savara.bpel.tests</module> <module>org.savara.contract</module> <module>org.savara.scenario</module> <module>org.savara.common</module> <module>org.savara.pi4soa.cdm</module> <module>org.savara.wsdl</module> + <module>org.savara.bundles.tests</module> </modules> <build>

13 years, 5 months

1
0
0 / 0

savara SVN: r571 - in branches/experimental/2.0.x/bundles: org.savara.bundles.tests and 25 other directories.

by do-not-reply＠jboss.org

Author: objectiser Date: 2011-01-13 05:19:44 -0500 (Thu, 13 Jan 2011) New Revision: 571 Added: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/META-INF/MANIFEST.MF branches/experimental/2.0.x/bundles/org.savara.bundles.tests/pom.xml branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/main/java/org/savara/bundles/ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/main/java/org/savara/bundles/tests/ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/main/java/org/savara/bundles/tests/osgi/ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/java/org/savara/bundles/ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/java/org/savara/bundles/tests/ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/java/org/savara/bundles/tests/bpel/ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/java/org/savara/bundles/tests/bpel/generator/ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/java/org/savara/bundles/tests/bpel/generator/GeneratorTest.java branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/java/org/savara/bundles/tests/bpel/parser/ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/java/org/savara/bundles/tests/bpel/parser/ParserTest.java branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker(a)Broker.bpel branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker(a)Buyer.bpel branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker(a)CreditAgency.bpel branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/PurchaseGoods(a)Buyer.bpel branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/PurchaseGoods(a)CreditAgency.bpel branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/PurchaseGoods(a)Store.bpel branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ReqRespFault(a)Buyer.bpel branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ReqRespFault(a)Seller.bpel branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/parser/ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/parser/results/ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/cdm/ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/cdm/ESBBroker.cdm branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/CompleteTransaction_SupplierTxnProcessor.wsdl branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/CompleteTransaction_SupplierTxnProcessorArtifacts.wsdl branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/ESBBrokerProcess_Broker.wsdl branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/ESBBrokerProcess_BrokerArtifacts.wsdl branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/ESBBrokerProcess_BuyerArtifacts.wsdl branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/ESBBrokerProcess_CreditAgency.wsdl branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/ESBBrokerProcess_CreditAgencyArtifacts.wsdl branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/ESBBrokerProcess_Supplier.wsdl branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/PurchaseGoodsProcess_BuyerArtifacts.wsdl branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/PurchaseGoodsProcess_CreditAgency.wsdl branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/PurchaseGoodsProcess_CreditAgencyArtifacts.wsdl branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/PurchaseGoodsProcess_Store.wsdl branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/PurchaseGoodsProcess_StoreArtifacts.wsdl branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/ReqRespFaultProcess_BuyerArtifacts.wsdl branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/ReqRespFaultProcess_Seller.wsdl branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/ReqRespFaultProcess_SellerArtifacts.wsdl branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/RequestForQuote_SupplierQuoteEngine.wsdl branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/RequestForQuote_SupplierQuoteEngineArtifacts.wsdl Removed: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/META-INF/MANIFEST.MF branches/experimental/2.0.x/bundles/org.savara.bundles.tests/pom.xml branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/main/java/org/savara/bpel/tests/osgi/ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/java/org/savara/bpel/generator/ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/java/org/savara/bpel/parser/ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/java/org/savara/bundles/tests/bpel/generator/GeneratorTest.java branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/java/org/savara/bundles/tests/bpel/parser/ParserTest.java branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker(a)Broker.bpel branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker(a)Buyer.bpel branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker(a)CreditAgency.bpel branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/PurchaseGoods(a)Buyer.bpel branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/PurchaseGoods(a)CreditAgency.bpel branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/PurchaseGoods(a)Store.bpel branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ReqRespFault(a)Buyer.bpel branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ReqRespFault(a)Seller.bpel branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/generator/results/ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/generator/testmodels/ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/parser/results/ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/parser/testmodels/ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/CompleteTransaction_SupplierTxnProcessor.wsdl branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/CompleteTransaction_SupplierTxnProcessorArtifacts.wsdl branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/ESBBrokerProcess_Broker.wsdl branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/ESBBrokerProcess_BrokerArtifacts.wsdl branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/ESBBrokerProcess_Buyer.bpelex branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/ESBBrokerProcess_BuyerArtifacts.wsdl branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/ESBBrokerProcess_CreditAgency.wsdl branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/ESBBrokerProcess_CreditAgencyArtifacts.wsdl branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/ESBBrokerProcess_Supplier.wsdl branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/PurchaseGoodsProcess_BuyerArtifacts.wsdl branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/PurchaseGoodsProcess_CreditAgency.wsdl branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/PurchaseGoodsProcess_CreditAgencyArtifacts.wsdl branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/PurchaseGoodsProcess_Store.wsdl branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/PurchaseGoodsProcess_StoreArtifacts.wsdl branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/ReqRespFaultProcess_BuyerArtifacts.wsdl branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/ReqRespFaultProcess_Seller.wsdl branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/ReqRespFaultProcess_SellerArtifacts.wsdl branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/RequestForQuote_SupplierQuoteEngine.wsdl branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/RequestForQuote_SupplierQuoteEngineArtifacts.wsdl branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/cdm/ESBBroker.cdm Modified: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/main/java/org/savara/bundles/tests/osgi/Activator.java branches/experimental/2.0.x/bundles/org.savara.scenario/ Log: Rename org.savara.bpel.tests to org.savara.bundles.tests, to represent a general test plugin used to test across bundles. Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests (from rev 558, branches/experimental/2.0.x/bundles/org.savara.bpel.tests) Deleted: branches/experimental/2.0.x/bundles/org.savara.bundles.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.bundles.tests/META-INF/MANIFEST.MF 2011-01-13 10:19:44 UTC (rev 571) @@ -1,15 +0,0 @@ -Manifest-Version: 1.0 -Bundle-ManifestVersion: 2 -Bundle-Name: SAVARA BPEL Tests -Bundle-SymbolicName: org.savara.bpel.tests -Bundle-Version: 2.0.0.qualifier -Bundle-Activator: org.savara.bpel.tests.osgi.Activator -Import-Package: org.osgi.framework;version="1.3.0" -Bundle-RequiredExecutionEnvironment: JavaSE-1.6 -Require-Bundle: org.savara.pi4soa.cdm, - org.savara.bpel, - org.junit, - org.scribble.common, - org.scribble.protocol, - org.savara.core, - org.scribble.protocol.projection Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/META-INF/MANIFEST.MF (from rev 559, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/META-INF/MANIFEST.MF) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bundles.tests/META-INF/MANIFEST.MF (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/META-INF/MANIFEST.MF 2011-01-13 10:19:44 UTC (rev 571) @@ -0,0 +1,15 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: SAVARA Bundles Tests +Bundle-SymbolicName: org.savara.bundles.tests +Bundle-Version: 2.0.0.qualifier +Bundle-Activator: org.savara.bundles.tests.osgi.Activator +Import-Package: org.osgi.framework;version="1.3.0" +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Require-Bundle: org.savara.pi4soa.cdm, + org.savara.bpel, + org.junit, + org.scribble.common, + org.scribble.protocol, + org.savara.common, + org.scribble.protocol.projection Deleted: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/pom.xml =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/pom.xml 2011-01-07 20:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/pom.xml 2011-01-13 10:19:44 UTC (rev 571) @@ -1,109 +0,0 @@ -<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</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> Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/pom.xml (from rev 561, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/pom.xml) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bundles.tests/pom.xml (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/pom.xml 2011-01-13 10:19:44 UTC (rev 571) @@ -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.bundles.tests</artifactId> + <version>2.0.0-SNAPSHOT</version> + <packaging>jar</packaging> + <name>Savara::Bundles::Tests</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.common</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</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> Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/main/java/org/savara/bundles/tests/osgi (from rev 558, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/main/java/org/savara/bpel/tests/osgi) Modified: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/main/java/org/savara/bundles/tests/osgi/Activator.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/main/java/org/savara/bpel/tests/osgi/Activator.java 2011-01-07 20:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/main/java/org/savara/bundles/tests/osgi/Activator.java 2011-01-13 10:19:44 UTC (rev 571) @@ -1,4 +1,4 @@ -package org.savara.bpel.tests.osgi; +package org.savara.bundles.tests.osgi; import org.osgi.framework.BundleActivator; import org.osgi.framework.BundleContext; Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/java/org/savara/bundles/tests/bpel/generator (from rev 558, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator) Deleted: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/java/org/savara/bundles/tests/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:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/java/org/savara/bundles/tests/bpel/generator/GeneratorTest.java 2011-01-13 10:19:44 UTC (rev 571) @@ -1,326 +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.bpel.generator; - -import junit.framework.Test; -import junit.framework.TestCase; -import junit.framework.TestResult; -import junit.framework.TestSuite; - -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.scribble.common.logging.CachedJournal; -import org.savara.pi4soa.cdm.parser.CDMProtocolParser; - -public class GeneratorTest { - - public static Test suite() { - TestSuite suite = new TestSuite("Choreography->BPEL Generator Tests"); - - suite.addTest(new ChoreographyToBPELTester("ESBBroker", "Buyer")); - suite.addTest(new ChoreographyToBPELTester("ESBBroker", "SupplierTxnProcessor")); - suite.addTest(new ChoreographyToBPELTester("ESBBroker", "CreditAgency")); - suite.addTest(new ChoreographyToBPELTester("ESBBroker", "Broker")); - suite.addTest(new ChoreographyToBPELTester("ESBBroker", "SupplierQuoteEngine")); - - suite.addTest(new ChoreographyToBPELTester("PurchaseGoods", "Buyer")); - suite.addTest(new ChoreographyToBPELTester("PurchaseGoods", "CreditAgency")); - suite.addTest(new ChoreographyToBPELTester("PurchaseGoods", "Store")); - - suite.addTest(new ChoreographyToBPELTester("ReqRespFault", "Buyer")); - suite.addTest(new ChoreographyToBPELTester("ReqRespFault", "Seller")); - - return suite; - } - - protected static class ChoreographyToBPELTester extends TestCase { - - /** - * This constructor is initialized with the test - * name. - * - * @param name The test name - * @param role The role - */ - public ChoreographyToBPELTester(String name, - String role) { - super(name+"@"+role); - m_name = name; - m_role = role; - } - - /** - * This constructor is initialized with the test - * name. - * - * @param name The test name - * @param role The role - */ - /* - public ChoreographyToBPELTester(String name, - SubDefinitionPath sdp, String role) { - super(name+sdp.toString()+"@"+role); - m_name = name; - m_subDefinitionPath = sdp; - m_role = role; - } - */ - - /** - * This method runs the test. - * - * @param result The test result - */ - public void run(TestResult result) { - result.startTest(this); - - String filename="generator/testmodels/"+m_name+".cdm"; - - java.io.InputStream is= - //ChoreographyToBPELTester.class.getResourceAsStream(filename); - ClassLoader.getSystemResourceAsStream(filename); - - if (is == null) { - result.addError(this, - new Throwable("Unable to locate resource: "+filename)); - } else { - CachedJournal journal=new CachedJournal(); - - org.scribble.protocol.model.ProtocolModel model=null; - - try { - CDMProtocolParser parser=new CDMProtocolParser(); - - model = parser.parse(is, journal, null); - } catch(Exception e) { - result.addError(this, new Throwable("Parsing choreography failed")); - } - - if (model == null) { - result.addError(this, new Throwable("Model is null")); - } else { - //org.scribble.protocol.projection.ProtocolProjector projector= - // new org.scribble.projector.DefaultProjector(); - - org.scribble.protocol.model.Role role=null; - - // Obtain role from definition - //Protocol defn=model.getProtocol(); - - // Check if subpath definition defined - /* - if (m_subDefinitionPath != null) { - defn = defn.getSubDefinition(m_subDefinitionPath); - } - */ - - java.util.List<org.scribble.protocol.model.Role> roles=model.getRoles(); - //new org.scribble.model.Role(m_role); - - for (int i=0; role == null && i < roles.size(); i++) { - if (roles.get(i).getName().equals(m_role)) { - role = roles.get(i); - } - } - - if (role == null) { - result.addError(this, - new Throwable("Role '"+m_role+"' not found")); - } else { - org.scribble.protocol.projection.ProtocolProjector projector= - new org.scribble.protocol.projection.impl.ProtocolProjectorImpl(); - - org.scribble.protocol.model.ProtocolModel projected= - projector.project(model, role, journal); - - /* Currently if a 'fail' is performed in Tycho build, it - * hangs the build. - if (l.getErrors().size() > 0) { - fail("Projection has errors: "+l.getErrors()); - } else if (projected == null) { - fail("Projected model is null, for "+filename+" role "+role); - } - */ - - ModelGenerator generator=new ProtocolToBPELModelGenerator(); - - //defn = projected.getProtocol(); - - if (generator != null) { // && defn != null) { - - Object target=generator.generate(projected, journal, null); - - /* - ModelReference targetRef= - new ModelReference(BPELNotation.NOTATION_CODE); - targetRef.setAlias(m_name); - targetRef.setLocatedRole(m_role); - - DefaultBPELLanguageModel target= - new DefaultBPELLanguageModel(targetRef); - - generator.generate(targetRef, role, - target, projected); - */ - - if (target instanceof TProcess) { - // Obtain any namespace prefix map - java.util.Map<String, String> prefixes= - (java.util.Map<String, String>) - projected.getProperties().get(PropertyNames.NAMESPACE_PREFIXES); - - try { - java.io.ByteArrayOutputStream baos=new java.io.ByteArrayOutputStream(); - - BPELModelUtil.serialize((TProcess)target, baos, prefixes); - - baos.close(); - - String text=new String(baos.toByteArray()); - - checkResults(result, text); - } catch(Exception e) { - result.addError(this, e); - } - } else { - result.addError(this, - new Throwable("No BPEL generated")); - } - - } else { - result.addError(this, - new Throwable("Unable to find Model Generator")); - } - } - } - } - - result.endTest(this); - } - - /** - * This method checks the generated BPEL against a - * previously stored correct version. - * - * @param result The test result - * @param bpel The BPEL - */ - protected void checkResults(TestResult result, String bpel) { - boolean f_valid=false; - - String filename="generator/results/"+m_name+"@"+m_role+".bpel"; - - java.io.InputStream is= - //ChoreographyToBPELTester.class.getResourceAsStream(filename); - ClassLoader.getSystemResourceAsStream(filename); - - if (is != null) { - - try { - byte[] b=new byte[is.available()]; - - is.read(b); - - is.close(); - - String orig=new String(b); - - if (orig.equals(bpel) == false) { - result.addError(this, - new Throwable("Generated BPEL does not match stored version")); - } else { - f_valid = true; - } - } catch(Exception e) { - result.addError(this, e); - } - } else { - result.addError(this, - new Throwable("Resulting BPEL '"+filename+ - "' not found for comparison")); - } - - if (f_valid == false) { - String bpelfile="generator/testmodels/"+m_name+".cdm"; - - java.net.URL url=ClassLoader.getSystemResource(bpelfile); - - /* - try { - url = org.eclipse.core.runtime.FileLocator.toFileURL(url); - } catch(Exception e) { - e.printStackTrace(); - } - */ - - if (url != null) { - // URL will point to copy of test models in the classes folder, so need - // to obtain reference back to source version - java.io.File f=null; - - if (url.getFile().indexOf("classes") != -1) { - f = new java.io.File(url.getFile().replaceFirst("classes","src/test/resources")); - } else if (url.getFile().indexOf("bin") != -1) { - f = new java.io.File(url.getFile().replaceFirst("bin","src/test/resources")); - } else { - result.addError(this, new Exception("Could not locate results folder to record expected result")); - } - - if (f != null && f.exists()) { - f = f.getParentFile().getParentFile(); - - java.io.File resultsDir=new java.io.File(f, "results"); - - if (resultsDir.exists() == false) { - resultsDir.mkdirs(); - } - - java.io.File resultFile=new java.io.File(resultsDir, - m_name+"@"+m_role+".generated"); - - if (resultFile.exists() == false) { - try { - java.io.FileOutputStream fos=new java.io.FileOutputStream(resultFile); - - fos.write(bpel.getBytes()); - - fos.flush(); - fos.close(); - - } catch(Exception e){ - result.addError(this, e); - } - } else { - System.err.println("NOTE: Generated output '"+resultFile+ - "' already exists - not being overwritten"); - } - } else { - result.addError(this, new Throwable("Unable to obtain URL for CDM model source '"+ - m_name+"': "+url)); - } - } - } - } - - private String m_name=null; - //private SubDefinitionPath m_subDefinitionPath=null; - private String m_role=null; - } -} Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/java/org/savara/bundles/tests/bpel/generator/GeneratorTest.java (from rev 566, 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.bundles.tests/src/test/java/org/savara/bundles/tests/bpel/generator/GeneratorTest.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/java/org/savara/bundles/tests/bpel/generator/GeneratorTest.java 2011-01-13 10:19:44 UTC (rev 571) @@ -0,0 +1,317 @@ +/* + * 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.bundles.tests.bpel.generator; + +import junit.framework.Test; +import junit.framework.TestCase; +import junit.framework.TestResult; +import junit.framework.TestSuite; + +import org.savara.bpel.generator.ProtocolToBPELModelGenerator; +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.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 { + + public static Test suite() { + TestSuite suite = new TestSuite("Choreography->BPEL Generator Tests"); + + suite.addTest(new ChoreographyToBPELTester("ESBBroker", "Broker")); + suite.addTest(new ChoreographyToBPELTester("ESBBroker", "Buyer")); + suite.addTest(new ChoreographyToBPELTester("ESBBroker", "SupplierTxnProcessor")); + suite.addTest(new ChoreographyToBPELTester("ESBBroker", "CreditAgency")); + suite.addTest(new ChoreographyToBPELTester("ESBBroker", "SupplierQuoteEngine")); + + suite.addTest(new ChoreographyToBPELTester("PurchaseGoods", "Buyer")); + suite.addTest(new ChoreographyToBPELTester("PurchaseGoods", "CreditAgency")); + suite.addTest(new ChoreographyToBPELTester("PurchaseGoods", "Store")); + + suite.addTest(new ChoreographyToBPELTester("ReqRespFault", "Buyer")); + suite.addTest(new ChoreographyToBPELTester("ReqRespFault", "Seller")); + + return suite; + } + + protected static class ChoreographyToBPELTester extends TestCase { + + /** + * This constructor is initialized with the test + * name. + * + * @param name The test name + * @param role The role + */ + public ChoreographyToBPELTester(String name, + String role) { + super(name+"@"+role); + m_name = name; + m_role = role; + } + + /** + * This method runs the test. + * + * @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="testmodels/cdm/"+m_name+".cdm"; + + java.io.InputStream is= + ClassLoader.getSystemResourceAsStream(filename); + + if (is == null) { + result.addError(this, + new Throwable("Unable to locate resource: "+filename)); + } else { + CachedJournal journal=new CachedJournal(); + + org.scribble.protocol.model.ProtocolModel model=null; + + CDMProtocolParser parser=new CDMProtocolParser(); + + try { + model = parser.parse(is, journal, null); + } catch(Exception e) { + result.addError(this, new Throwable("Parsing choreography failed")); + } + + if (model == null) { + result.addError(this, new Throwable("Model is null")); + } else { + //org.scribble.protocol.projection.ProtocolProjector projector= + // new org.scribble.projector.DefaultProjector(); + + org.scribble.protocol.model.Role role=null; + + // Obtain role from definition + //Protocol defn=model.getProtocol(); + + // Check if subpath definition defined + /* + if (m_subDefinitionPath != null) { + defn = defn.getSubDefinition(m_subDefinitionPath); + } + */ + + java.util.List<org.scribble.protocol.model.Role> roles=model.getRoles(); + //new org.scribble.model.Role(m_role); + + for (int i=0; role == null && i < roles.size(); i++) { + if (roles.get(i).getName().equals(m_role)) { + role = roles.get(i); + } + } + + if (role == null) { + result.addError(this, + new Throwable("Role '"+m_role+"' not found")); + } else { + org.scribble.protocol.projection.ProtocolProjector projector= + new org.scribble.protocol.projection.impl.ProtocolProjectorImpl(); + + org.scribble.protocol.model.ProtocolModel projected= + projector.project(model, role, journal, null); + + /* Currently if a 'fail' is performed in Tycho build, it + * hangs the build. + if (l.getErrors().size() > 0) { + fail("Projection has errors: "+l.getErrors()); + } else if (projected == null) { + fail("Projected model is null, for "+filename+" role "+role); + } + */ + + java.util.List<Role> projectedRoles=projected.getRoles(); + + ModelGenerator generator=new ProtocolToBPELModelGenerator(); + + //defn = projected.getProtocol(); + + if (generator != null) { // && defn != null) { + + Object target=generator.generate(projected, journal, null); + + /* + ModelReference targetRef= + new ModelReference(BPELNotation.NOTATION_CODE); + targetRef.setAlias(m_name); + targetRef.setLocatedRole(m_role); + + DefaultBPELLanguageModel target= + new DefaultBPELLanguageModel(targetRef); + + generator.generate(targetRef, role, + target, projected); + */ + + if (target instanceof TProcess) { + // Obtain any namespace prefix map + java.util.Map<String, String> prefixes= + (java.util.Map<String, String>) + projected.getProperties().get(PropertyName.NAMESPACE_PREFIXES); + + try { + java.io.ByteArrayOutputStream baos=new java.io.ByteArrayOutputStream(); + + BPELModelUtil.serialize((TProcess)target, baos, prefixes); + + baos.close(); + + String text=new String(baos.toByteArray()); + + checkResults(result, text); + } catch(Exception e) { + result.addError(this, e); + } + } else { + result.addError(this, + new Throwable("No BPEL generated")); + } + + } else { + result.addError(this, + new Throwable("Unable to find Model Generator")); + } + } + } + } + + result.endTest(this); + } + + /** + * This method checks the generated BPEL against a + * previously stored correct version. + * + * @param result The test result + * @param bpel The BPEL + */ + protected void checkResults(TestResult result, String bpel) { + boolean f_valid=false; + + String filename="bpel/generator/results/"+m_name+"@"+m_role+".bpel"; + + java.io.InputStream is= + //ChoreographyToBPELTester.class.getResourceAsStream(filename); + ClassLoader.getSystemResourceAsStream(filename); + + if (is != null) { + + try { + byte[] b=new byte[is.available()]; + + is.read(b); + + is.close(); + + String orig=new String(b); + + if (orig.equals(bpel) == false) { + result.addError(this, + new Throwable("Generated BPEL does not match stored version")); + } else { + f_valid = true; + } + } catch(Exception e) { + result.addError(this, e); + } + } else { + result.addError(this, + new Throwable("Resulting BPEL '"+filename+ + "' not found for comparison")); + } + + if (f_valid == false) { + String bpelfile="testmodels/cdm/"+m_name+".cdm"; + + java.net.URL url=ClassLoader.getSystemResource(bpelfile); + + /* + try { + url = org.eclipse.core.runtime.FileLocator.toFileURL(url); + } catch(Exception e) { + e.printStackTrace(); + } + */ + + if (url != null) { + // URL will point to copy of test models in the classes folder, so need + // to obtain reference back to source version + java.io.File f=null; + + if (url.getFile().indexOf("classes") != -1) { + f = new java.io.File(url.getFile().replaceFirst("classes","src/test/resources")); + } else if (url.getFile().indexOf("bin") != -1) { + f = new java.io.File(url.getFile().replaceFirst("bin","src/test/resources")); + } else { + result.addError(this, new Exception("Could not locate results folder to record expected result")); + } + + if (f != null && f.exists()) { + f = f.getParentFile().getParentFile(); + + java.io.File resultsDir=new java.io.File(f, "results"); + + if (resultsDir.exists() == false) { + resultsDir.mkdirs(); + } + + java.io.File resultFile=new java.io.File(resultsDir, + m_name+"@"+m_role+".generated"); + + if (resultFile.exists() == false) { + try { + java.io.FileOutputStream fos=new java.io.FileOutputStream(resultFile); + + fos.write(bpel.getBytes()); + + fos.flush(); + fos.close(); + + } catch(Exception e){ + result.addError(this, e); + } + } else { + System.err.println("NOTE: Generated output '"+resultFile+ + "' already exists - not being overwritten"); + } + } else { + result.addError(this, new Throwable("Unable to obtain URL for CDM model source '"+ + m_name+"': "+url)); + } + } + } + } + + private String m_name=null; + private String m_role=null; + } +} Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/java/org/savara/bundles/tests/bpel/parser (from rev 558, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/parser) Deleted: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/java/org/savara/bundles/tests/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-07 20:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/java/org/savara/bundles/tests/bpel/parser/ParserTest.java 2011-01-13 10:19:44 UTC (rev 571) @@ -1,272 +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.bpel.parser; - -import java.net.URI; - -import org.scribble.common.logging.CachedJournal; -import org.scribble.common.resource.ResourceLocator; -import org.scribble.protocol.model.ProtocolModel; - -import junit.framework.TestCase; -import junit.framework.TestResult; -import junit.framework.TestSuite; - -public class ParserTest extends TestCase { - - public static TestSuite suite() { - TestSuite suite = new TestSuite("BPEL->Protocol Parser Tests"); - - suite.addTest(new BPELToProtocolTest("ESBBrokerProcess_Broker", "ESBBroker@Broker")); - suite.addTest(new BPELToProtocolTest("ESBBrokerProcess_Buyer", "ESBBroker@Buyer")); - suite.addTest(new BPELToProtocolTest("ESBBrokerProcess_CreditAgency", "ESBBroker@CreditAgency")); - - suite.addTest(new BPELToProtocolTest("RequestForQuote_SupplierQuoteEngine", "ESBBroker@SupplierQuoteEngine")); - suite.addTest(new BPELToProtocolTest("CompleteTransaction_SupplierTxnProcessor", "ESBBroker@SupplierTxnProcessor")); - - suite.addTest(new BPELToProtocolTest("PurchaseGoodsProcess_Buyer", "PurchaseGoods@Buyer")); - suite.addTest(new BPELToProtocolTest("PurchaseGoodsProcess_CreditAgency", "PurchaseGoods@CreditAgency")); - suite.addTest(new BPELToProtocolTest("PurchaseGoodsProcess_Store", "PurchaseGoods@Store")); - - suite.addTest(new BPELToProtocolTest("ReqRespFaultProcess_Buyer", "ReqRespFault@Buyer")); - suite.addTest(new BPELToProtocolTest("ReqRespFaultProcess_Seller", "ReqRespFault@Seller")); - - /** - * TODO: (SAVARA-150) Commenting out this test for now, as we now need the accompanying WSDL to be able to - * resolve the message type's underlying XSD element or type. - * - suite.addTest(new BPELToConversationTest("LoanApprovalService@Service", "LoanApprovalService@Service")); - */ - - return suite; - } - - /** - * The test case for running the BPEL to Protocol test. - */ - protected static class BPELToProtocolTest extends TestCase { - - /** - * This constructor is initialized with the test - * name. - * - * @param name The test name - */ - public BPELToProtocolTest(String bpelName, String scvName) { - super(bpelName+"->"+scvName); - m_bpelName = bpelName; - m_scvName = scvName; - } - - /** - * This method runs the test. - * - * @param result The test result - */ - public void run(TestResult result) { - result.startTest(this); - - String filename="parser/testmodels/"+m_bpelName+".bpel"; - - java.io.InputStream is= - //ParserTest.class.getResourceAsStream(filename); - ClassLoader.getSystemResourceAsStream(filename); - - if (is == null) { - result.addError(this, - new Throwable("Unable to locate resource: "+filename)); - } else { - CachedJournal journal=new CachedJournal(); - - org.scribble.protocol.model.ProtocolModel model=null; - - try { - BPELProtocolParser parser=new BPELProtocolParser(); - - model = parser.parse(is, journal, new ResourceLoaderImpl()); - } catch(Exception e) { - e.printStackTrace(); - result.addError(this, new Throwable("Parsing BPEL failed")); - } - - if (model == null) { - result.addError(this, new Throwable("Model is null")); - - } else if (journal.hasErrors()) { - result.addError(this, new Throwable("Failed to parse CDM Model")); - - for (int i=0; i < journal.getIssues().size(); i++) { - System.err.println("Issue: "+ - journal.getIssues().get(i).getMessage()); - } - } else { - ProtocolModel lm=(ProtocolModel)model; - - try { - org.scribble.protocol.export.text.TextProtocolExporter exporter= - new org.scribble.protocol.export.text.TextProtocolExporter(); - - java.io.ByteArrayOutputStream os= - new java.io.ByteArrayOutputStream(); - - exporter.export(lm, journal, os); - - os.close(); - - String str=new String(os.toByteArray()); - - checkResults(result, str); - - } catch(Exception e) { - e.printStackTrace(); - } - } - } - - result.endTest(this); - } - - /** - * This method checks the generated jboss-esb.xml against a - * previously stored correct version. - * - * @param result The test result - * @param conv The conversation - */ - protected void checkResults(TestResult result, String conv) { - boolean f_valid=false; - - String filename="parser/results/"+m_scvName+".spr"; - - java.io.InputStream is= - //ParserTest.class.getResourceAsStream(filename); - ClassLoader.getSystemResourceAsStream(filename); - - if (is != null) { - - try { - byte[] b=new byte[is.available()]; - - is.read(b); - - is.close(); - - String orig=new String(b); - - if (orig.equals(conv) == false) { - result.addError(this, - new Throwable("Generated protocol does not match stored version")); - } else { - f_valid = true; - } - } catch(Exception e) { - result.addError(this, e); - } - } else { - result.addError(this, - new Throwable("Resulting protocol '"+filename+ - "' not found for comparison")); - } - - if (f_valid == false) { - String bpelfile="parser/testmodels/"+m_bpelName+".bpel"; - - java.net.URL url=//ParserTest.class.getResource(bpelfile); - ClassLoader.getSystemResource(bpelfile); - - /* - try { - url = org.eclipse.core.runtime.FileLocator.toFileURL(url); - } catch(Exception e) { - e.printStackTrace(); - } - */ - - if (url != null) { - // URL will point to copy of test models in the classes folder, so need - // to obtain reference back to source version - java.io.File f=null; - - if (url.getFile().indexOf("classes") != -1) { - f = new java.io.File(url.getFile().replaceFirst("classes","src/test/resources")); - } else if (url.getFile().indexOf("bin") != -1) { - f = new java.io.File(url.getFile().replaceFirst("bin","src/test/resources")); - } else { - result.addError(this, new Exception("Could not locate results folder to record expected result")); - } - - if (f != null && f.exists()) { - f = f.getParentFile().getParentFile(); - - java.io.File resultsDir=new java.io.File(f, "results"); - - if (resultsDir.exists() == false) { - resultsDir.mkdirs(); - } - - java.io.File resultFile=new java.io.File(resultsDir, m_scvName+".generated"); - - if (resultFile.exists() == false) { - try { - java.io.FileOutputStream fos=new java.io.FileOutputStream(resultFile); - - fos.write(conv.getBytes()); - - fos.flush(); - fos.close(); - - } catch(Exception e){ - result.addError(this, e); - } - } else { - System.err.println("NOTE: Generated output '"+resultFile+ - "' already exists - not being overwritten"); - } - } else { - result.addError(this, new Throwable("Unable to obtain URL for BPEL model source '"+ - m_bpelName+"': "+url)); - } - } - } - } - - private String m_bpelName=null; - private String m_scvName=null; - } - - public static class ResourceLoaderImpl implements ResourceLocator { - - public ResourceLoaderImpl() { - } - - public URI getResourceURI(String uri) { - String filename="parser/testmodels/"+uri; - - java.net.URI ret=null; - - try { - ret = ClassLoader.getSystemResource(filename).toURI(); - } catch(Exception e) { - e.printStackTrace(); - } - - return(ret); - } - - } -} Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/java/org/savara/bundles/tests/bpel/parser/ParserTest.java (from rev 566, 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.bundles.tests/src/test/java/org/savara/bundles/tests/bpel/parser/ParserTest.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/java/org/savara/bundles/tests/bpel/parser/ParserTest.java 2011-01-13 10:19:44 UTC (rev 571) @@ -0,0 +1,276 @@ +/* + * 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.bundles.tests.bpel.parser; + +import java.net.URI; + +import org.savara.bpel.parser.BPELProtocolParser; +import org.scribble.common.logging.CachedJournal; +import org.scribble.common.resource.ResourceLocator; +import org.scribble.protocol.DefaultProtocolContext; +import org.scribble.protocol.model.ProtocolModel; + +import junit.framework.TestCase; +import junit.framework.TestResult; +import junit.framework.TestSuite; + +public class ParserTest extends TestCase { + + public static TestSuite suite() { + TestSuite suite = new TestSuite("BPEL->Protocol Parser Tests"); + + suite.addTest(new BPELToProtocolTest("ESBBrokerProcess_Broker", "ESBBroker@Broker")); + suite.addTest(new BPELToProtocolTest("ESBBrokerProcess_Buyer", "ESBBroker@Buyer")); + suite.addTest(new BPELToProtocolTest("ESBBrokerProcess_CreditAgency", "ESBBroker@CreditAgency")); + + suite.addTest(new BPELToProtocolTest("RequestForQuote_SupplierQuoteEngine", "ESBBroker@SupplierQuoteEngine")); + suite.addTest(new BPELToProtocolTest("CompleteTransaction_SupplierTxnProcessor", "ESBBroker@SupplierTxnProcessor")); + + suite.addTest(new BPELToProtocolTest("PurchaseGoodsProcess_Buyer", "PurchaseGoods@Buyer")); + suite.addTest(new BPELToProtocolTest("PurchaseGoodsProcess_CreditAgency", "PurchaseGoods@CreditAgency")); + suite.addTest(new BPELToProtocolTest("PurchaseGoodsProcess_Store", "PurchaseGoods@Store")); + + suite.addTest(new BPELToProtocolTest("ReqRespFaultProcess_Buyer", "ReqRespFault@Buyer")); + suite.addTest(new BPELToProtocolTest("ReqRespFaultProcess_Seller", "ReqRespFault@Seller")); + + /** + * TODO: (SAVARA-150) Commenting out this test for now, as we now need the accompanying WSDL to be able to + * resolve the message type's underlying XSD element or type. + * + suite.addTest(new BPELToConversationTest("LoanApprovalService@Service", "LoanApprovalService@Service")); + */ + + return suite; + } + + /** + * The test case for running the BPEL to Protocol test. + */ + protected static class BPELToProtocolTest extends TestCase { + + /** + * This constructor is initialized with the test + * name. + * + * @param name The test name + */ + public BPELToProtocolTest(String bpelName, String scvName) { + super(bpelName+"->"+scvName); + m_bpelName = bpelName; + m_scvName = scvName; + } + + /** + * This method runs the test. + * + * @param result The test result + */ + public void run(TestResult result) { + result.startTest(this); + + String filename="testmodels/bpel/"+m_bpelName+".bpel"; + + java.io.InputStream is= + //ParserTest.class.getResourceAsStream(filename); + ClassLoader.getSystemResourceAsStream(filename); + + if (is == null) { + result.addError(this, + new Throwable("Unable to locate resource: "+filename)); + } else { + CachedJournal journal=new CachedJournal(); + + org.scribble.protocol.model.ProtocolModel model=null; + + try { + BPELProtocolParser parser=new BPELProtocolParser(); + + model = parser.parse(is, journal, new DefaultProtocolContext(null, + new ResourceLoaderImpl())); + } catch(Exception e) { + e.printStackTrace(); + result.addError(this, new Throwable("Parsing BPEL failed")); + } + + if (model == null) { + result.addError(this, new Throwable("Model is null")); + + } else if (journal.hasErrors()) { + result.addError(this, new Throwable("Failed to parse CDM Model")); + + for (int i=0; i < journal.getIssues().size(); i++) { + System.err.println("Issue: "+ + journal.getIssues().get(i).getMessage()); + } + } else { + ProtocolModel lm=(ProtocolModel)model; + + try { + org.scribble.protocol.export.text.TextProtocolExporter exporter= + new org.scribble.protocol.export.text.TextProtocolExporter(); + + java.io.ByteArrayOutputStream os= + new java.io.ByteArrayOutputStream(); + + exporter.export(lm, journal, os); + + os.close(); + + String str=new String(os.toByteArray()); + + checkResults(result, str); + + } catch(Exception e) { + e.printStackTrace(); + } + } + } + + result.endTest(this); + } + + /** + * This method checks the generated jboss-esb.xml against a + * previously stored correct version. + * + * @param result The test result + * @param conv The conversation + */ + protected void checkResults(TestResult result, String conv) { + boolean f_valid=false; + + String filename="bpel/parser/results/"+m_scvName+".spr"; + + java.io.InputStream is= + //ParserTest.class.getResourceAsStream(filename); + ClassLoader.getSystemResourceAsStream(filename); + + if (is != null) { + + try { + byte[] b=new byte[is.available()]; + + is.read(b); + + is.close(); + + String orig=new String(b); + + if (orig.equals(conv) == false) { + result.addError(this, + new Throwable("Generated protocol does not match stored version")); + } else { + f_valid = true; + } + } catch(Exception e) { + result.addError(this, e); + } + } else { + result.addError(this, + new Throwable("Resulting protocol '"+filename+ + "' not found for comparison")); + } + + if (f_valid == false) { + String bpelfile="testmodels/bpel/"+m_bpelName+".bpel"; + + java.net.URL url=//ParserTest.class.getResource(bpelfile); + ClassLoader.getSystemResource(bpelfile); + + /* + try { + url = org.eclipse.core.runtime.FileLocator.toFileURL(url); + } catch(Exception e) { + e.printStackTrace(); + } + */ + + if (url != null) { + // URL will point to copy of test models in the classes folder, so need + // to obtain reference back to source version + java.io.File f=null; + + if (url.getFile().indexOf("classes") != -1) { + f = new java.io.File(url.getFile().replaceFirst("classes","src/test/resources")); + } else if (url.getFile().indexOf("bin") != -1) { + f = new java.io.File(url.getFile().replaceFirst("bin","src/test/resources")); + } else { + result.addError(this, new Exception("Could not locate results folder to record expected result")); + } + + if (f != null && f.exists()) { + f = f.getParentFile().getParentFile(); + + java.io.File resultsDir=new java.io.File(f, "results"); + + if (resultsDir.exists() == false) { + resultsDir.mkdirs(); + } + + java.io.File resultFile=new java.io.File(resultsDir, m_scvName+".generated"); + + if (resultFile.exists() == false) { + try { + java.io.FileOutputStream fos=new java.io.FileOutputStream(resultFile); + + fos.write(conv.getBytes()); + + fos.flush(); + fos.close(); + + } catch(Exception e){ + result.addError(this, e); + } + } else { + System.err.println("NOTE: Generated output '"+resultFile+ + "' already exists - not being overwritten"); + } + } else { + result.addError(this, new Throwable("Unable to obtain URL for BPEL model source '"+ + m_bpelName+"': "+url)); + } + } + } + } + + private String m_bpelName=null; + private String m_scvName=null; + } + + public static class ResourceLoaderImpl implements ResourceLocator { + + public ResourceLoaderImpl() { + } + + public URI getResourceURI(String uri) { + // TODO: Create file path based on extension in uri + String filename="testmodels/wsdl/"+uri; + + java.net.URI ret=null; + + try { + ret = ClassLoader.getSystemResource(filename).toURI(); + } catch(Exception e) { + e.printStackTrace(); + } + + return(ret); + } + + } +} Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results (from rev 558, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results) Deleted: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/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:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker(a)Broker.bpel 2011-01-13 10:19:44 UTC (rev 571) @@ -1,63 +0,0 @@ -<?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/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 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 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 createInstance="yes" variable="makeEnquiryRequestVar" operation="makeEnquiry" portType="brk:BrokerBehavior" partnerLink="BuyerToBroker" name="Receive_enquiry"/> - <while> - <sequence> - <scope> - <sequence> - <invoke outputVariable="getQuoteResponseVar" inputVariable="getQuoteRequestVar" operation="getQuote" portType="spr:SupplierBehavior" partnerLink="BrokerToSupplierQuoteEngine" name="Send_requestForQuote"/> - </sequence> - </scope> - </sequence> - </while> - <reply variable="makeEnquiryResponseVar" operation="makeEnquiry" portType="brk:BrokerBehavior" partnerLink="BuyerToBroker" name="Send_quoteList"/> - <pick> - <onMessage variable="buyRequestVar" operation="buy" portType="brk:BrokerBehavior" 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"/> -</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"/> - </sequence> - </scope> - </sequence> - </onMessage> - <onMessage variable="cancelRequestVar" operation="cancel" portType="brk:BrokerBehavior" partnerLink="BuyerToBroker"> - <sequence/> - </onMessage> - </pick> - </sequence> -</process> Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker(a)Broker.bpel (from rev 568, 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.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker(a)Broker.bpel (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker(a)Broker.bpel 2011-01-13 10:19:44 UTC (rev 571) @@ -0,0 +1,63 @@ +<?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/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_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"/> + <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 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 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:SupplierQuoteEngine" partnerLink="BrokerToSupplierQuoteEngine" name="Send_RequestForQuote"/> + </sequence> + </scope> + </sequence> + </while> + <reply variable="makeEnquiryResponseVar" operation="makeEnquiry" portType="brk:Broker" partnerLink="BuyerToBroker" name="Send_QuoteList"/> + <pick> + <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:Broker" partnerLink="BuyerToBroker" name="Send_OrderRejected"/> +</sequence> + </catch> + </faultHandlers> + <sequence> + <invoke outputVariable="checkCreditResponseVar" inputVariable="checkCreditRequestVar" operation="checkCredit" portType="cay:CreditAgency" partnerLink="BrokerToCreditAgency" name="Send_CreditInformation"/> + <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:Broker" partnerLink="BuyerToBroker"> + <sequence/> + </onMessage> + </pick> + </sequence> +</process> Deleted: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/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-07 20:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker(a)Buyer.bpel 2011-01-13 10:19:44 UTC (rev 571) @@ -1,39 +0,0 @@ -<?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/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 partnerRole="BrokerRequester" partnerLinkType="byr:BuyerToBrokerLT" name="BuyerToBroker"/> - </partnerLinks> - <variables> - <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 outputVariable="makeEnquiryResponseVar" inputVariable="makeEnquiryRequestVar" operation="makeEnquiry" portType="brk:BrokerBehavior" partnerLink="BuyerToBroker" name="Send_enquiry"/> - <if> - <sequence> - <scope> - <faultHandlers> - <catch faultMessageType="brk:rejectedFault" faultVariable="rejectedFaultVar" faultName="brk:rejected"> - <sequence/> - </catch> - </faultHandlers> - <sequence> - <invoke outputVariable="buyResponseVar" inputVariable="buyRequestVar" operation="buy" portType="byr:BuyerBehavior" partnerLink="BuyerToBroker" name="Send_buy"/> - </sequence> - </scope> - </sequence> - <else> - <sequence> - <invoke inputVariable="cancelRequestVar" operation="cancel" portType="byr:BuyerBehavior" partnerLink="BuyerToBroker" name="Send_cancel"/> - </sequence> - </else> - </if> - </sequence> -</process> Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker(a)Buyer.bpel (from rev 568, 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.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker(a)Buyer.bpel (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker(a)Buyer.bpel 2011-01-13 10:19:44 UTC (rev 571) @@ -0,0 +1,39 @@ +<?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/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_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"/> + </partnerLinks> + <variables> + <variable messageType="brk:makeEnquiryRequest" name="makeEnquiryRequestVar"/> + <variable messageType="brk:makeEnquiryResponse" name="makeEnquiryResponseVar"/> + <variable messageType="brk:buyRequest" name="buyRequestVar"/> + <variable messageType="brk:buyResponse" name="buyResponseVar"/> + <variable messageType="brk:cancelRequest" name="cancelRequestVar"/> + </variables> + <sequence> + <invoke outputVariable="makeEnquiryResponseVar" inputVariable="makeEnquiryRequestVar" operation="makeEnquiry" portType="brk:Broker" partnerLink="BuyerToBroker" name="Send_Enquiry"/> + <if> + <sequence> + <scope> + <faultHandlers> + <catch faultMessageType="brk:rejectedFault" faultVariable="rejectedFaultVar" faultName="brk:rejected"> + <sequence/> + </catch> + </faultHandlers> + <sequence> + <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="brk:Broker" partnerLink="BuyerToBroker" name="Send_Cancel"/> + </sequence> + </else> + </if> + </sequence> +</process> Deleted: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/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-07 20:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker(a)CreditAgency.bpel 2011-01-13 10:19:44 UTC (rev 571) @@ -1,29 +0,0 @@ -<?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/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 myRole="CreditAgency" partnerLinkType="cay:BrokerToCreditAgencyServiceLT" name="BrokerToCreditAgency"/> - </partnerLinks> - <variables> - <variable messageType="cay:checkCreditRequest" name="checkCreditRequestVar"/> - <variable messageType="cay:checkCreditResponse" name="checkCreditResponseVar"/> - <variable messageType="cay:invalidCreditFault" name="invalidCreditFaultVar"/> - </variables> - <sequence> - <receive createInstance="yes" variable="checkCreditRequestVar" operation="checkCredit" portType="cay:CreditAgencyBehavior" partnerLink="BrokerToCreditAgency" name="Receive_CreditCheckRequest"/> - <if> - <sequence> - <reply variable="checkCreditResponseVar" operation="checkCredit" portType="cay:CreditAgencyBehavior" partnerLink="BrokerToCreditAgency" name="Send_CreditCheckOk"/> - </sequence> - <else> - <sequence> - <reply faultName="cay:invalidCredit" variable="invalidCreditFaultVar" operation="checkCredit" portType="cay:CreditAgencyBehavior" partnerLink="BrokerToCreditAgency" name="Send_CreditCheckInvalid"/> - </sequence> - </else> - </if> - </sequence> -</process> Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker(a)CreditAgency.bpel (from rev 568, 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.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker(a)CreditAgency.bpel (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker(a)CreditAgency.bpel 2011-01-13 10:19:44 UTC (rev 571) @@ -0,0 +1,28 @@ +<?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/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_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 myRole="CreditAgency" partnerLinkType="cay:BrokerToCreditAgencyServiceLT" name="BrokerToCreditAgency"/> + </partnerLinks> + <variables> + <variable messageType="cay:checkCreditRequest" name="checkCreditRequestVar"/> + <variable messageType="cay:checkCreditResponse" name="checkCreditResponseVar"/> + <variable messageType="cay:invalidCreditFault" name="invalidCreditFaultVar"/> + </variables> + <sequence> + <receive createInstance="yes" variable="checkCreditRequestVar" operation="checkCredit" portType="cay:CreditAgency" partnerLink="BrokerToCreditAgency" name="Receive_CreditInformation"/> + <if> + <sequence> + <reply variable="checkCreditResponseVar" operation="checkCredit" portType="cay:CreditAgency" partnerLink="BrokerToCreditAgency" name="Send_CreditValid"/> + </sequence> + <else> + <sequence> + <reply faultName="cay:invalidCredit" variable="invalidCreditFaultVar" operation="checkCredit" portType="cay:CreditAgency" partnerLink="BrokerToCreditAgency" name="Send_CreditInvalid"/> + </sequence> + </else> + </if> + </sequence> +</process> Deleted: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/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:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel 2011-01-13 10:19:44 UTC (rev 571) @@ -1,16 +0,0 @@ -<?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="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 myRole="SupplierBehavior" partnerLinkType="spr:BrokerToSupplierQuoteEngineServiceLT" name="BrokerToSupplierQuoteEngine"/> - </partnerLinks> - <variables> - <variable messageType="spr:getQuoteRequest" name="getQuoteRequestVar"/> - <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"/> - </sequence> -</process> Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel (from rev 568, 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.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel 2011-01-13 10:19:44 UTC (rev 571) @@ -0,0 +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" 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 myRole="SupplierQuoteEngine" partnerLinkType="spr:BrokerToSupplierQuoteEngineServiceLT" name="BrokerToSupplierQuoteEngine"/> + </partnerLinks> + <variables> + <variable messageType="spr:getQuoteRequest" name="getQuoteRequestVar"/> + <variable messageType="spr:getQuoteResponse" name="getQuoteResponseVar"/> + </variables> + <sequence> + <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> Deleted: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/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-07 20:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel 2011-01-13 10:19:44 UTC (rev 571) @@ -1,16 +0,0 @@ -<?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"/> - <partnerLinks> - <partnerLink myRole="SupplierTxnProcessor" partnerLinkType="spr:BrokerToSupplierTxnProcessorServiceLT" name="BrokerToSupplierTxnProcessor"/> - </partnerLinks> - <variables> - <variable messageType="spr:confirmRequest" name="confirmRequestVar"/> - <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"/> - </sequence> -</process> Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel (from rev 568, 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.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel 2011-01-13 10:19:44 UTC (rev 571) @@ -0,0 +1,18 @@ +<?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="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> + <variables> + <variable messageType="spr:confirmRequest" name="confirmRequestVar"/> + <variable messageType="spr:confirmResponse" name="confirmResponseVar"/> + </variables> + <sequence> + <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> Deleted: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/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-07 20:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/PurchaseGoods(a)Buyer.bpel 2011-01-13 10:19:44 UTC (rev 571) @@ -1,25 +0,0 @@ -<?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" 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 partnerRole="StoreRequester" partnerLinkType="tns:BuyerToStoreLT" name="BuyerToStore"/> - </partnerLinks> - <variables> - <variable messageType="sto:buyRequest" name="buyRequestVar"/> - <variable messageType="sto:buyResponse" name="buyResponseVar"/> - </variables> - <sequence> - <scope> - <faultHandlers> - <catch faultMessageType="sto:BuyFailedFault" faultVariable="BuyFailedFaultVar" faultName="sto:BuyFailed"> - <sequence/> - </catch> - </faultHandlers> - <sequence> - <invoke outputVariable="buyResponseVar" inputVariable="buyRequestVar" operation="buy" portType="sto:StoreInterface" partnerLink="BuyerToStore" name="Send_BuyRequest"/> - </sequence> - </scope> - </sequence> -</process> Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/PurchaseGoods(a)Buyer.bpel (from rev 564, 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.bundles.tests/src/test/resources/bpel/generator/results/PurchaseGoods(a)Buyer.bpel (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/PurchaseGoods(a)Buyer.bpel 2011-01-13 10:19:44 UTC (rev 571) @@ -0,0 +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" 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 partnerRole="StoreRequester" partnerLinkType="tns:BuyerToStoreLT" name="BuyerToStore"/> + </partnerLinks> + <variables> + <variable messageType="sto:buyRequest" name="buyRequestVar"/> + <variable messageType="sto:buyResponse" name="buyResponseVar"/> + </variables> + <sequence> + <scope> + <faultHandlers> + <catch faultMessageType="sto:BuyFailedFault" faultVariable="BuyFailedFaultVar" faultName="sto:BuyFailed"> + <sequence/> + </catch> + </faultHandlers> + <sequence> + <invoke outputVariable="buyResponseVar" inputVariable="buyRequestVar" operation="buy" portType="sto:Store" partnerLink="BuyerToStore" name="Send_BuyRequest"/> + </sequence> + </scope> + </sequence> +</process> Deleted: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/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:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/PurchaseGoods(a)CreditAgency.bpel 2011-01-13 10:19:44 UTC (rev 571) @@ -1,27 +0,0 @@ -<?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" 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 myRole="CreditAgencyInterface" partnerLinkType="pur:StoreToCreditAgencyServiceLT" name="StoreToCreditAgency"/> - </partnerLinks> - <variables> - <variable messageType="pur:checkCreditRequest" name="checkCreditRequestVar"/> - <variable messageType="pur:checkCreditResponse" name="checkCreditResponseVar"/> - <variable messageType="pur:CreditCheckFailedFault" name="CreditCheckFailedFaultVar"/> - </variables> - <sequence> - <receive createInstance="yes" variable="checkCreditRequestVar" operation="checkCredit" portType="pur:CreditAgencyInterface" partnerLink="StoreToCreditAgency" name="Receive_CreditCheckRequest"/> - <if> - <sequence> - <reply variable="checkCreditResponseVar" operation="checkCredit" portType="pur:CreditAgencyInterface" partnerLink="StoreToCreditAgency" name="Send_CreditCheckOk"/> - </sequence> - <else> - <sequence> - <reply faultName="pur:CreditCheckFailed" variable="CreditCheckFailedFaultVar" operation="checkCredit" portType="pur:CreditAgencyInterface" partnerLink="StoreToCreditAgency" name="Send_CreditCheckInvalid"/> - </sequence> - </else> - </if> - </sequence> -</process> Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/PurchaseGoods(a)CreditAgency.bpel (from rev 564, 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.bundles.tests/src/test/resources/bpel/generator/results/PurchaseGoods(a)CreditAgency.bpel (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/PurchaseGoods(a)CreditAgency.bpel 2011-01-13 10:19:44 UTC (rev 571) @@ -0,0 +1,27 @@ +<?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" 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 myRole="CreditAgency" partnerLinkType="pur:StoreToCreditAgencyServiceLT" name="StoreToCreditAgency"/> + </partnerLinks> + <variables> + <variable messageType="pur:checkCreditRequest" name="checkCreditRequestVar"/> + <variable messageType="pur:checkCreditResponse" name="checkCreditResponseVar"/> + <variable messageType="pur:CreditCheckFailedFault" name="CreditCheckFailedFaultVar"/> + </variables> + <sequence> + <receive createInstance="yes" variable="checkCreditRequestVar" operation="checkCredit" portType="pur:CreditAgency" partnerLink="StoreToCreditAgency" name="Receive_CreditCheckRequest"/> + <if> + <sequence> + <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:CreditAgency" partnerLink="StoreToCreditAgency" name="Send_CreditCheckInvalid"/> + </sequence> + </else> + </if> + </sequence> +</process> Deleted: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/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:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/PurchaseGoods(a)Store.bpel 2011-01-13 10:19:44 UTC (rev 571) @@ -1,33 +0,0 @@ -<?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" 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 myRole="StoreInterface" partnerLinkType="sto:BuyerToStoreServiceLT" name="BuyerToStore"/> - <partnerLink partnerRole="CreditAgencyRequester" partnerLinkType="sto:StoreToCreditAgencyLT" name="StoreToCreditAgency"/> - </partnerLinks> - <variables> - <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 createInstance="yes" variable="buyRequestVar" operation="buy" portType="sto:StoreInterface" 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"/> - </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"/> - </sequence> - </scope> - </sequence> -</process> Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/PurchaseGoods(a)Store.bpel (from rev 564, 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.bundles.tests/src/test/resources/bpel/generator/results/PurchaseGoods(a)Store.bpel (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/PurchaseGoods(a)Store.bpel 2011-01-13 10:19:44 UTC (rev 571) @@ -0,0 +1,33 @@ +<?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" 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 myRole="Store" partnerLinkType="sto:BuyerToStoreServiceLT" name="BuyerToStore"/> + <partnerLink partnerRole="CreditAgencyRequester" partnerLinkType="sto:StoreToCreditAgencyLT" name="StoreToCreditAgency"/> + </partnerLinks> + <variables> + <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 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:Store" partnerLink="BuyerToStore" name="Send_BuyFailed"/> + </sequence> + </catch> + </faultHandlers> + <sequence> + <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> +</process> Deleted: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/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-07 20:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ReqRespFault(a)Buyer.bpel 2011-01-13 10:19:44 UTC (rev 571) @@ -1,24 +0,0 @@ -<?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" 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 partnerRole="SellerRequester" partnerLinkType="byr:BuyerToSellerLT" name="BuyerToSeller"/> - </partnerLinks> - <variables> - <variable messageType="slr:checkCreditRequest" name="checkCreditRequestVar"/> - <variable messageType="slr:checkCreditResponse" name="checkCreditResponseVar"/> - </variables> - <sequence> - <scope> - <faultHandlers> - <catch faultMessageType="slr:insufficientCreditFault" faultVariable="insufficientCreditFaultVar" faultName="slr:insufficientCredit"> - <sequence/> - </catch> - </faultHandlers> - <sequence> - <invoke outputVariable="checkCreditResponseVar" inputVariable="checkCreditRequestVar" operation="checkCredit" portType="slr:SellerBehavior" partnerLink="BuyerToSeller" name="Send_CreditCheckRequest"/> - </sequence> - </scope> - </sequence> -</process> Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ReqRespFault(a)Buyer.bpel (from rev 568, 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.bundles.tests/src/test/resources/bpel/generator/results/ReqRespFault(a)Buyer.bpel (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ReqRespFault(a)Buyer.bpel 2011-01-13 10:19:44 UTC (rev 571) @@ -0,0 +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" 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 partnerRole="SellerRequester" partnerLinkType="byr:BuyerToSellerLT" name="BuyerToSeller"/> + </partnerLinks> + <variables> + <variable messageType="slr:checkCreditRequest" name="checkCreditRequestVar"/> + <variable messageType="slr:checkCreditResponse" name="checkCreditResponseVar"/> + </variables> + <sequence> + <scope> + <faultHandlers> + <catch faultMessageType="slr:insufficientCreditFault" faultVariable="insufficientCreditFaultVar" faultName="slr:insufficientCredit"> + <sequence/> + </catch> + </faultHandlers> + <sequence> + <invoke outputVariable="checkCreditResponseVar" inputVariable="checkCreditRequestVar" operation="checkCredit" portType="slr:Seller" partnerLink="BuyerToSeller" name="Send_CreditInformation"/> + </sequence> + </scope> + </sequence> +</process> Deleted: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/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:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ReqRespFault(a)Seller.bpel 2011-01-13 10:19:44 UTC (rev 571) @@ -1,26 +0,0 @@ -<?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" 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 myRole="SellerBehavior" partnerLinkType="slr:BuyerToSellerServiceLT" name="BuyerToSeller"/> - </partnerLinks> - <variables> - <variable messageType="slr:checkCreditRequest" name="checkCreditRequestVar"/> - <variable messageType="slr:checkCreditResponse" name="checkCreditResponseVar"/> - <variable messageType="slr:insufficientCreditFault" name="insufficientCreditFaultVar"/> - </variables> - <sequence> - <receive createInstance="yes" variable="checkCreditRequestVar" operation="checkCredit" portType="slr:SellerBehavior" partnerLink="BuyerToSeller" name="Receive_CreditCheckRequest"/> - <if> - <sequence> - <reply variable="checkCreditResponseVar" operation="checkCredit" portType="slr:SellerBehavior" partnerLink="BuyerToSeller" name="Send_CreditCheckOk"/> - </sequence> - <else> - <sequence> - <reply faultName="slr:insufficientCredit" variable="insufficientCreditFaultVar" operation="checkCredit" portType="slr:SellerBehavior" partnerLink="BuyerToSeller" name="Send_CreditCheckInvalid"/> - </sequence> - </else> - </if> - </sequence> -</process> Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ReqRespFault(a)Seller.bpel (from rev 568, 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.bundles.tests/src/test/resources/bpel/generator/results/ReqRespFault(a)Seller.bpel (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ReqRespFault(a)Seller.bpel 2011-01-13 10:19:44 UTC (rev 571) @@ -0,0 +1,26 @@ +<?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" 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 myRole="Seller" partnerLinkType="slr:BuyerToSellerServiceLT" name="BuyerToSeller"/> + </partnerLinks> + <variables> + <variable messageType="slr:checkCreditRequest" name="checkCreditRequestVar"/> + <variable messageType="slr:checkCreditResponse" name="checkCreditResponseVar"/> + <variable messageType="slr:insufficientCreditFault" name="insufficientCreditFaultVar"/> + </variables> + <sequence> + <receive createInstance="yes" variable="checkCreditRequestVar" operation="checkCredit" portType="slr:Seller" partnerLink="BuyerToSeller" name="Receive_CreditInformation"/> + <if> + <sequence> + <reply variable="checkCreditResponseVar" operation="checkCredit" portType="slr:Seller" partnerLink="BuyerToSeller" name="Send_CreditValid"/> + </sequence> + <else> + <sequence> + <reply faultName="slr:insufficientCredit" variable="insufficientCreditFaultVar" operation="checkCredit" portType="slr:Seller" partnerLink="BuyerToSeller" name="Send_CreditInvalid"/> + </sequence> + </else> + </if> + </sequence> +</process> Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/parser/results (from rev 558, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results) Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel (from rev 558, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels) Deleted: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/CompleteTransaction_SupplierTxnProcessor.wsdl =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/CompleteTransaction_SupplierTxnProcessor.wsdl 2011-01-07 20:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/CompleteTransaction_SupplierTxnProcessor.wsdl 2011-01-13 10:19:44 UTC (rev 571) @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="Supplier" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier"> - <types xmlns="http://schemas.xmlsoap.org/wsdl/"> - <schema xmlns="http://www.w3.org/2001/XMLSchema"/> - </types> - <wsdl:message name="confirmRequest"> - <wsdl:part element="orderConfirmed" name="content"> - </wsdl:part> - </wsdl:message> - <wsdl:message name="confirmResponse"> - <wsdl:part element="bookingReference" name="content"> - </wsdl:part> - </wsdl:message> - <wsdl:message name="getQuoteResponse"> - <wsdl:part element="quote" name="content"> - </wsdl:part> - </wsdl:message> - <wsdl:message name="getQuoteRequest"> - <wsdl:part element="requestForQuote" name="content"> - </wsdl:part> - </wsdl:message> - <wsdl:portType name="SupplierBehavior"> - <wsdl:operation name="confirm"> - <wsdl:input message="spr:confirmRequest"> - </wsdl:input> - <wsdl:output message="spr:confirmResponse"> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="getQuote"> - <wsdl:input message="spr:getQuoteRequest"> - </wsdl:input> - <wsdl:output message="spr:getQuoteResponse"> - </wsdl:output> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="SupplierBehaviorBinding" type="spr:SupplierBehavior"> - <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="confirm"> - <soap:operation soapAction="http://www.pi4soa.org/ESBBroker/Supplier/confirm"/> - <wsdl:input> - <soap:body use="literal"/> - </wsdl:input> - <wsdl:output> - <soap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="getQuote"> - <soap:operation soapAction="http://www.pi4soa.org/ESBBroker/Supplier/getQuote"/> - <wsdl:input> - <soap:body use="literal"/> - </wsdl:input> - <wsdl:output> - <soap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="SupplierService"> - <wsdl:port binding="spr:SupplierBehaviorBinding" name="SupplierBehaviorPort"> - <soap:address location="http://localhost:8080/SupplierService/SupplierBehaviorPort"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> Deleted: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/CompleteTransaction_SupplierTxnProcessorArtifacts.wsdl =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/CompleteTransaction_SupplierTxnProcessorArtifacts.wsdl 2011-01-07 20:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/CompleteTransaction_SupplierTxnProcessorArtifacts.wsdl 2011-01-13 10:19:44 UTC (rev 571) @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier"> - <wsdl:import location="CompleteTransaction_SupplierTxnProcessor.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> - <plnk:partnerLinkType name="BrokerToSupplierTxnProcessorServiceLT"> - <plnk:role name="SupplierTxnProcessorService" portType="ns1:SupplierBehavior"/> - </plnk:partnerLinkType> -</wsdl:definitions> Deleted: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/ESBBrokerProcess_Broker.wsdl =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Broker.wsdl 2011-01-07 20:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/ESBBrokerProcess_Broker.wsdl 2011-01-13 10:19:44 UTC (rev 571) @@ -1,85 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="Broker" targetNamespace="http://www.pi4soa.org/ESBBroker/Broker"> - <types xmlns="http://schemas.xmlsoap.org/wsdl/"> - <schema xmlns="http://www.w3.org/2001/XMLSchema"/> - </types> - <wsdl:message name="rejectedFault"> - <wsdl:part element="orderRejected" name="content"> - </wsdl:part> - </wsdl:message> - <wsdl:message name="makeEnquiryRequest"> - <wsdl:part element="enquiry" name="content"> - </wsdl:part> - </wsdl:message> - <wsdl:message name="buyResponse"> - <wsdl:part element="bookingReference" name="content"> - </wsdl:part> - </wsdl:message> - <wsdl:message name="makeEnquiryResponse"> - <wsdl:part element="quoteList" name="content"> - </wsdl:part> - </wsdl:message> - <wsdl:message name="buyRequest"> - <wsdl:part element="buy" name="content"> - </wsdl:part> - </wsdl:message> - <wsdl:message name="cancelRequest"> - <wsdl:part element="cancel" name="content"> - </wsdl:part> - </wsdl:message> - <wsdl:portType name="BrokerBehavior"> - <wsdl:operation name="buy"> - <wsdl:input message="brk:buyRequest"> - </wsdl:input> - <wsdl:output message="brk:buyResponse"> - </wsdl:output> - <wsdl:fault message="brk:rejectedFault" name="rejected"> - </wsdl:fault> - </wsdl:operation> - <wsdl:operation name="makeEnquiry"> - <wsdl:input message="brk:makeEnquiryRequest"> - </wsdl:input> - <wsdl:output message="brk:makeEnquiryResponse"> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="cancel"> - <wsdl:input message="brk:cancelRequest"> - </wsdl:input> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="BrokerBehaviorBinding" type="brk:BrokerBehavior"> - <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="buy"> - <soap:operation soapAction="http://www.pi4soa.org/ESBBroker/Broker/buy"/> - <wsdl:input> - <soap:body use="literal"/> - </wsdl:input> - <wsdl:output> - <soap:body use="literal"/> - </wsdl:output> - <wsdl:fault name="rejected"> - <soap:fault name="rejected" use="literal"/> - </wsdl:fault> - </wsdl:operation> - <wsdl:operation name="makeEnquiry"> - <soap:operation soapAction="http://www.pi4soa.org/ESBBroker/Broker/makeEnquiry"/> - <wsdl:input> - <soap:body use="literal"/> - </wsdl:input> - <wsdl:output> - <soap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="cancel"> - <soap:operation soapAction="http://www.pi4soa.org/ESBBroker/Broker/cancel"/> - <wsdl:input> - <soap:body use="literal"/> - </wsdl:input> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="BrokerService"> - <wsdl:port binding="brk:BrokerBehaviorBinding" name="BrokerBehaviorPort"> - <soap:address location="http://localhost:8080/BrokerService/BrokerBehaviorPort"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> Deleted: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/ESBBrokerProcess_BrokerArtifacts.wsdl =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_BrokerArtifacts.wsdl 2011-01-07 20:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/ESBBrokerProcess_BrokerArtifacts.wsdl 2011-01-13 10:19:44 UTC (rev 571) @@ -1,18 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://www.pi4soa.org/ESBBroker/Broker" xmlns:ns2="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:ns3="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" targetNamespace="http://www.pi4soa.org/ESBBroker/Broker"> - <wsdl:import location="ESBBrokerProcess_Broker.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Broker"/> - <wsdl:import location="ESBBrokerProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/> - <wsdl:import location="ESBBrokerProcess_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> - <plnk:partnerLinkType name="BuyerToBrokerServiceLT"> - <plnk:role name="BrokerBehavior" portType="ns1:BrokerBehavior"/> - </plnk:partnerLinkType> - <plnk:partnerLinkType name="BrokerToSupplierQuoteEngineLT"> - <plnk:role name="SupplierQuoteEngineRequester" portType="ns2:SupplierBehavior"/> - </plnk:partnerLinkType> - <plnk:partnerLinkType name="BrokerToCreditAgencyLT"> - <plnk:role name="CreditAgencyRequester" portType="ns3:CreditAgencyBehavior"/> - </plnk:partnerLinkType> - <plnk:partnerLinkType name="BrokerToSupplierTxnProcessorLT"> - <plnk:role name="SupplierTxnProcessorRequester" portType="ns2:SupplierBehavior"/> - </plnk:partnerLinkType> -</wsdl:definitions> Deleted: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/ESBBrokerProcess_Buyer.bpelex =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Buyer.bpelex 2011-01-07 20:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/ESBBrokerProcess_Buyer.bpelex 2011-01-13 10:19:44 UTC (rev 571) @@ -1,71 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<extensionmodel:ExtensionMap xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:extensionmodel="http:///extensionmodel.ecore" xmlns:org.eclipse.bpel.ui.uiextensionmodel="http:///org/eclipse/bpel/ui/uiextensionmodel.ecore" namespace="http://org.eclipse.bpel.ui/"> - <extensions> - <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@variables/(a)children.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> - </extensions> - <extensions> - <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@variables/(a)children.1"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> - </extensions> - <extensions> - <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@variables/(a)children.2"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> - </extensions> - <extensions> - <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@variables/(a)children.3"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> - </extensions> - <extensions> - <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@variables/(a)children.4"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> - </extensions> - <extensions> - <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@activity"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@activity/(a)activities.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@activity/(a)activities.1"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@activity/@activities.1/@else/(a)activity"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@activity/@activities.1/@else/@activity/(a)activities.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@activity/@activities.1/(a)activity"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@activity/@activities.1/@activity/(a)activities.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@activity/@activities.1/@activity/@activities.0/@faultHandlers/@catch.0/(a)faultVariable"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/> - </extensions> - <extensions> - <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@activity/@activities.1/@activity/@activities.0/@faultHandlers/@catch.0/(a)activity"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@activity/@activities.1/@activity/@activities.0/(a)activity"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@activity/@activities.1/@activity/@activities.0/@activity/(a)activities.0"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/> - </extensions> - <extensions> - <extendedObject href="ESBBrokerProcess_Buyer.bpel#/"/> - <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ProcessExtension" modificationStamp="1294243978000"/> - </extensions> -</extensionmodel:ExtensionMap> Deleted: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/ESBBrokerProcess_BuyerArtifacts.wsdl =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_BuyerArtifacts.wsdl 2011-01-07 20:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/ESBBrokerProcess_BuyerArtifacts.wsdl 2011-01-13 10:19:44 UTC (rev 571) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://www.pi4soa.org/ESBBroker/Broker" xmlns:ns2="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" targetNamespace="http://www.pi4soa.org/ESBBroker/Buyer"> -  - <wsdl:import location="ESBBrokerProcess_Broker.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Broker"/> - <wsdl:import location="ESBBrokerProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/> - <wsdl:import location="ESBBrokerProcess_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> - <plnk:partnerLinkType name="BuyerToBrokerLT"> - <plnk:role name="BrokerRequester" portType="ns1:BrokerBehavior"/> - <plnk:role name="BrokerBehavior" portType="ns2:BuyerBehavior"/> - </plnk:partnerLinkType> -</wsdl:definitions> Deleted: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/ESBBrokerProcess_CreditAgency.wsdl =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_CreditAgency.wsdl 2011-01-07 20:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/ESBBrokerProcess_CreditAgency.wsdl 2011-01-13 10:19:44 UTC (rev 571) @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="CreditAgency" targetNamespace="http://www.pi4soa.org/ESBBroker/CreditAgency"> - <types xmlns="http://schemas.xmlsoap.org/wsdl/"> - <schema xmlns="http://www.w3.org/2001/XMLSchema"/> - </types> - <wsdl:message name="checkCreditResponse"> - <wsdl:part element="CreditCheckOk" name="content"> - </wsdl:part> - </wsdl:message> - <wsdl:message name="checkCreditRequest"> - <wsdl:part element="CreditCheckRequest" name="content"> - </wsdl:part> - </wsdl:message> - <wsdl:message name="invalidCreditFault"> - <wsdl:part element="CreditCheckInvalid" name="content"> - </wsdl:part> - </wsdl:message> - <wsdl:portType name="CreditAgencyBehavior"> - <wsdl:operation name="checkCredit"> - <wsdl:input message="cay:checkCreditRequest"> - </wsdl:input> - <wsdl:output message="cay:checkCreditResponse"> - </wsdl:output> - <wsdl:fault message="cay:invalidCreditFault" name="invalidCredit"> - </wsdl:fault> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="CreditAgencyBehaviorBinding" type="cay:CreditAgencyBehavior"> - <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="checkCredit"> - <soap:operation soapAction="http://www.pi4soa.org/ESBBroker/CreditAgency/checkCredit"/> - <wsdl:input> - <soap:body use="literal"/> - </wsdl:input> - <wsdl:output> - <soap:body use="literal"/> - </wsdl:output> - <wsdl:fault name="invalidCredit"> - <soap:fault name="invalidCredit" use="literal"/> - </wsdl:fault> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="CreditAgencyService"> - <wsdl:port binding="cay:CreditAgencyBehaviorBinding" name="CreditAgencyBehaviorPort"> - <soap:address location="http://localhost:8080/CreditAgencyService/CreditAgencyBehaviorPort"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> Deleted: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/ESBBrokerProcess_CreditAgencyArtifacts.wsdl =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_CreditAgencyArtifacts.wsdl 2011-01-07 20:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/ESBBrokerProcess_CreditAgencyArtifacts.wsdl 2011-01-13 10:19:44 UTC (rev 571) @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" targetNamespace="http://www.pi4soa.org/ESBBroker/CreditAgency"> - <wsdl:import location="ESBBrokerProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/> - <wsdl:import location="ESBBrokerProcess_Broker.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Broker"/> - <wsdl:import location="ESBBrokerProcess_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> - <plnk:partnerLinkType name="BrokerToCreditAgencyServiceLT"> - <plnk:role name="CreditAgencyService" portType="ns1:CreditAgencyBehavior"/> - </plnk:partnerLinkType> -</wsdl:definitions> Deleted: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/ESBBrokerProcess_Supplier.wsdl =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Supplier.wsdl 2011-01-07 20:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/ESBBrokerProcess_Supplier.wsdl 2011-01-13 10:19:44 UTC (rev 571) @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="Supplier" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier"> - <types xmlns="http://schemas.xmlsoap.org/wsdl/"> - <schema xmlns="http://www.w3.org/2001/XMLSchema"/> - </types> - <wsdl:message name="confirmRequest"> - <wsdl:part element="orderConfirmed" name="content"> - </wsdl:part> - </wsdl:message> - <wsdl:message name="confirmResponse"> - <wsdl:part element="bookingReference" name="content"> - </wsdl:part> - </wsdl:message> - <wsdl:message name="getQuoteResponse"> - <wsdl:part element="quote" name="content"> - </wsdl:part> - </wsdl:message> - <wsdl:message name="getQuoteRequest"> - <wsdl:part element="requestForQuote" name="content"> - </wsdl:part> - </wsdl:message> - <wsdl:portType name="SupplierBehavior"> - <wsdl:operation name="confirm"> - <wsdl:input message="spr:confirmRequest"> - </wsdl:input> - <wsdl:output message="spr:confirmResponse"> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="getQuote"> - <wsdl:input message="spr:getQuoteRequest"> - </wsdl:input> - <wsdl:output message="spr:getQuoteResponse"> - </wsdl:output> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="SupplierBehaviorBinding" type="spr:SupplierBehavior"> - <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="confirm"> - <soap:operation soapAction="http://www.pi4soa.org/ESBBroker/Supplier/confirm"/> - <wsdl:input> - <soap:body use="literal"/> - </wsdl:input> - <wsdl:output> - <soap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="getQuote"> - <soap:operation soapAction="http://www.pi4soa.org/ESBBroker/Supplier/getQuote"/> - <wsdl:input> - <soap:body use="literal"/> - </wsdl:input> - <wsdl:output> - <soap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="SupplierService"> - <wsdl:port binding="spr:SupplierBehaviorBinding" name="SupplierBehaviorPort"> - <soap:address location="http://localhost:8080/SupplierService/SupplierBehaviorPort"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> Deleted: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/PurchaseGoodsProcess_BuyerArtifacts.wsdl =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_BuyerArtifacts.wsdl 2011-01-07 20:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/PurchaseGoodsProcess_BuyerArtifacts.wsdl 2011-01-13 10:19:44 UTC (rev 571) @@ -1,9 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://www.jboss.org/examples/store" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" targetNamespace="http://www.jboss.org/savara/examples"> - <wsdl:import location="PurchaseGoodsProcess_Buyer.wsdl" namespace="http://www.jboss.org/savara/examples"/> - <wsdl:import location="PurchaseGoodsProcess_CreditAgency.wsdl" namespace="java:org.jboss.savara.examples.purchasing"/> - <wsdl:import location="PurchaseGoodsProcess_Store.wsdl" namespace="http://www.jboss.org/examples/store"/> - <plnk:partnerLinkType name="BuyerToStoreLT"> - <plnk:role name="StoreRequester" portType="ns1:StoreInterface"/> - </plnk:partnerLinkType> -</wsdl:definitions> Deleted: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/PurchaseGoodsProcess_CreditAgency.wsdl =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgency.wsdl 2011-01-07 20:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/PurchaseGoodsProcess_CreditAgency.wsdl 2011-01-13 10:19:44 UTC (rev 571) @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:pur="java:org.jboss.savara.examples.purchasing" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:sto="http://www.jboss.org/examples/store" xmlns:tns="http://www.jboss.org/savara/examples" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="CreditAgency" targetNamespace="java:org.jboss.savara.examples.purchasing"> - <types xmlns="http://schemas.xmlsoap.org/wsdl/"> - <schema xmlns="http://www.w3.org/2001/XMLSchema"/> - </types> - <wsdl:message name="checkCreditRequest"> - <wsdl:part name="content" type="pur:CreditCheckRequest"> - </wsdl:part> - </wsdl:message> - <wsdl:message name="CreditCheckFailedFault"> - <wsdl:part name="content" type="pur:CreditCheckInvalid"> - </wsdl:part> - </wsdl:message> - <wsdl:message name="checkCreditResponse"> - <wsdl:part name="content" type="pur:CreditCheckOk"> - </wsdl:part> - </wsdl:message> - <wsdl:portType name="CreditAgencyInterface"> - <wsdl:operation name="checkCredit"> - <wsdl:input message="pur:checkCreditRequest"> - </wsdl:input> - <wsdl:output message="pur:checkCreditResponse"> - </wsdl:output> - <wsdl:fault message="pur:CreditCheckFailedFault" name="CreditCheckFailed"> - </wsdl:fault> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="CreditAgencyInterfaceBinding" type="pur:CreditAgencyInterface"> - <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="checkCredit"> - <soap:operation soapAction="java:org.jboss.savara.examples.purchasing/checkCredit"/> - <wsdl:input> - <soap:body use="literal"/> - </wsdl:input> - <wsdl:output> - <soap:body use="literal"/> - </wsdl:output> - <wsdl:fault name="CreditCheckFailed"> - <soap:fault name="CreditCheckFailed" use="literal"/> - </wsdl:fault> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="CreditAgencyService"> - <wsdl:port binding="pur:CreditAgencyInterfaceBinding" name="CreditAgencyInterfacePort"> - <soap:address location="http://localhost:8080/CreditAgencyService/CreditAgencyInterfacePort"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> Deleted: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/PurchaseGoodsProcess_CreditAgencyArtifacts.wsdl =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgencyArtifacts.wsdl 2011-01-07 20:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/PurchaseGoodsProcess_CreditAgencyArtifacts.wsdl 2011-01-13 10:19:44 UTC (rev 571) @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="java:org.jboss.savara.examples.purchasing" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" targetNamespace="java:org.jboss.savara.examples.purchasing"> - <wsdl:import location="PurchaseGoodsProcess_CreditAgency.wsdl" namespace="java:org.jboss.savara.examples.purchasing"/> - <wsdl:import location="PurchaseGoodsProcess_Store.wsdl" namespace="http://www.jboss.org/examples/store"/> - <plnk:partnerLinkType name="StoreToCreditAgencyServiceLT"> - <plnk:role name="CreditAgencyInterface" portType="ns1:CreditAgencyInterface"/> - </plnk:partnerLinkType> -</wsdl:definitions> Deleted: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/PurchaseGoodsProcess_Store.wsdl =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Store.wsdl 2011-01-07 20:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/PurchaseGoodsProcess_Store.wsdl 2011-01-13 10:19:44 UTC (rev 571) @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:pur="java:org.jboss.savara.examples.purchasing" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:sto="http://www.jboss.org/examples/store" xmlns:tns="http://www.jboss.org/savara/examples" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="Store" targetNamespace="http://www.jboss.org/examples/store"> - <types xmlns="http://schemas.xmlsoap.org/wsdl/"> - <schema xmlns="http://www.w3.org/2001/XMLSchema"/> - </types> - <wsdl:message name="BuyFailedFault"> - <wsdl:part name="content" type="sto:BuyFailed"> - </wsdl:part> - </wsdl:message> - <wsdl:message name="buyRequest"> - <wsdl:part name="content" type="sto:BuyRequest"> - </wsdl:part> - </wsdl:message> - <wsdl:message name="buyResponse"> - <wsdl:part name="content" type="sto:BuyConfirmed"> - </wsdl:part> - </wsdl:message> - <wsdl:portType name="StoreInterface"> - <wsdl:operation name="buy"> - <wsdl:input message="sto:buyRequest"> - </wsdl:input> - <wsdl:output message="sto:buyResponse"> - </wsdl:output> - <wsdl:fault message="sto:BuyFailedFault" name="BuyFailed"> - </wsdl:fault> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="StoreInterfaceBinding" type="sto:StoreInterface"> - <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="buy"> - <soap:operation soapAction="http://www.jboss.org/examples/store/buy"/> - <wsdl:input> - <soap:body use="literal"/> - </wsdl:input> - <wsdl:output> - <soap:body use="literal"/> - </wsdl:output> - <wsdl:fault name="BuyFailed"> - <soap:fault name="BuyFailed" use="literal"/> - </wsdl:fault> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="StoreService"> - <wsdl:port binding="sto:StoreInterfaceBinding" name="StoreInterfacePort"> - <soap:address location="http://localhost:8080/StoreService/StoreInterfacePort"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> Deleted: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/PurchaseGoodsProcess_StoreArtifacts.wsdl =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_StoreArtifacts.wsdl 2011-01-07 20:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/PurchaseGoodsProcess_StoreArtifacts.wsdl 2011-01-13 10:19:44 UTC (rev 571) @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://www.jboss.org/examples/store" xmlns:ns2="java:org.jboss.savara.examples.purchasing" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" targetNamespace="http://www.jboss.org/examples/store"> - <wsdl:import location="PurchaseGoodsProcess_Store.wsdl" namespace="http://www.jboss.org/examples/store"/> - <wsdl:import location="PurchaseGoodsProcess_CreditAgency.wsdl" namespace="java:org.jboss.savara.examples.purchasing"/> - <plnk:partnerLinkType name="BuyerToStoreServiceLT"> - <plnk:role name="StoreInterface" portType="ns1:StoreInterface"/> - </plnk:partnerLinkType> - <plnk:partnerLinkType name="StoreToCreditAgencyLT"> - <plnk:role name="CreditAgencyRequester" portType="ns2:CreditAgencyInterface"/> - </plnk:partnerLinkType> -</wsdl:definitions> Deleted: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/ReqRespFaultProcess_BuyerArtifacts.wsdl =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_BuyerArtifacts.wsdl 2011-01-07 20:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/ReqRespFaultProcess_BuyerArtifacts.wsdl 2011-01-13 10:19:44 UTC (rev 571) @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://www.pi4soa.org/ReqRespFault/Seller" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" targetNamespace="http://www.pi4soa.org/ReqRespFault/Buyer"> - <wsdl:import location="ReqRespFaultProcess_Buyer.wsdl" namespace="http://www.pi4soa.org/ReqRespFault/Buyer"/> - <wsdl:import location="ReqRespFaultProcess_Seller.wsdl" namespace="http://www.pi4soa.org/ReqRespFault/Seller"/> - <plnk:partnerLinkType name="BuyerToSellerLT"> - <plnk:role name="SellerRequester" portType="ns1:SellerBehavior"/> - </plnk:partnerLinkType> -</wsdl:definitions> Deleted: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/ReqRespFaultProcess_Seller.wsdl =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Seller.wsdl 2011-01-07 20:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/ReqRespFaultProcess_Seller.wsdl 2011-01-13 10:19:44 UTC (rev 571) @@ -1,48 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:byr="http://www.pi4soa.org/ReqRespFault/Buyer" xmlns:slr="http://www.pi4soa.org/ReqRespFault/Seller" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.pi4soa.org/ReqRespFault" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="Seller" targetNamespace="http://www.pi4soa.org/ReqRespFault/Seller"> - <types xmlns="http://schemas.xmlsoap.org/wsdl/"> - <schema xmlns="http://www.w3.org/2001/XMLSchema"/> - </types> - <wsdl:message name="checkCreditRequest"> - <wsdl:part element="CreditCheckRequest" name="content"> - </wsdl:part> - </wsdl:message> - <wsdl:message name="checkCreditResponse"> - <wsdl:part element="CreditCheckOk" name="content"> - </wsdl:part> - </wsdl:message> - <wsdl:message name="insufficientCreditFault"> - <wsdl:part element="CreditCheckInvalid" name="content"> - </wsdl:part> - </wsdl:message> - <wsdl:portType name="SellerBehavior"> - <wsdl:operation name="checkCredit"> - <wsdl:input message="slr:checkCreditRequest"> - </wsdl:input> - <wsdl:output message="slr:checkCreditResponse"> - </wsdl:output> - <wsdl:fault message="slr:insufficientCreditFault" name="insufficientCredit"> - </wsdl:fault> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="SellerBehaviorBinding" type="slr:SellerBehavior"> - <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="checkCredit"> - <soap:operation soapAction="http://www.pi4soa.org/ReqRespFault/Seller/checkCredit"/> - <wsdl:input> - <soap:body use="literal"/> - </wsdl:input> - <wsdl:output> - <soap:body use="literal"/> - </wsdl:output> - <wsdl:fault name="insufficientCredit"> - <soap:fault name="insufficientCredit" use="literal"/> - </wsdl:fault> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="SellerService"> - <wsdl:port binding="slr:SellerBehaviorBinding" name="SellerBehaviorPort"> - <soap:address location="http://localhost:8080/SellerService/SellerBehaviorPort"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> Deleted: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/ReqRespFaultProcess_SellerArtifacts.wsdl =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_SellerArtifacts.wsdl 2011-01-07 20:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/ReqRespFaultProcess_SellerArtifacts.wsdl 2011-01-13 10:19:44 UTC (rev 571) @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://www.pi4soa.org/ReqRespFault/Seller" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" targetNamespace="http://www.pi4soa.org/ReqRespFault/Seller"> - <wsdl:import location="ReqRespFaultProcess_Seller.wsdl" namespace="http://www.pi4soa.org/ReqRespFault/Seller"/> - <plnk:partnerLinkType name="BuyerToSellerServiceLT"> - <plnk:role name="SellerBehavior" portType="ns1:SellerBehavior"/> - </plnk:partnerLinkType> -</wsdl:definitions> Deleted: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/RequestForQuote_SupplierQuoteEngine.wsdl =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngine.wsdl 2011-01-07 20:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/RequestForQuote_SupplierQuoteEngine.wsdl 2011-01-13 10:19:44 UTC (rev 571) @@ -1,62 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="Supplier" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier"> - <types xmlns="http://schemas.xmlsoap.org/wsdl/"> - <schema xmlns="http://www.w3.org/2001/XMLSchema"/> - </types> - <wsdl:message name="confirmRequest"> - <wsdl:part element="orderConfirmed" name="content"> - </wsdl:part> - </wsdl:message> - <wsdl:message name="confirmResponse"> - <wsdl:part element="bookingReference" name="content"> - </wsdl:part> - </wsdl:message> - <wsdl:message name="getQuoteResponse"> - <wsdl:part element="quote" name="content"> - </wsdl:part> - </wsdl:message> - <wsdl:message name="getQuoteRequest"> - <wsdl:part element="requestForQuote" name="content"> - </wsdl:part> - </wsdl:message> - <wsdl:portType name="SupplierBehavior"> - <wsdl:operation name="confirm"> - <wsdl:input message="spr:confirmRequest"> - </wsdl:input> - <wsdl:output message="spr:confirmResponse"> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="getQuote"> - <wsdl:input message="spr:getQuoteRequest"> - </wsdl:input> - <wsdl:output message="spr:getQuoteResponse"> - </wsdl:output> - </wsdl:operation> - </wsdl:portType> - <wsdl:binding name="SupplierBehaviorBinding" type="spr:SupplierBehavior"> - <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="confirm"> - <soap:operation soapAction="http://www.pi4soa.org/ESBBroker/Supplier/confirm"/> - <wsdl:input> - <soap:body use="literal"/> - </wsdl:input> - <wsdl:output> - <soap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - <wsdl:operation name="getQuote"> - <soap:operation soapAction="http://www.pi4soa.org/ESBBroker/Supplier/getQuote"/> - <wsdl:input> - <soap:body use="literal"/> - </wsdl:input> - <wsdl:output> - <soap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - <wsdl:service name="SupplierService"> - <wsdl:port binding="spr:SupplierBehaviorBinding" name="SupplierBehaviorPort"> - <soap:address location="http://localhost:8080/SupplierService/SupplierBehaviorPort"/> - </wsdl:port> - </wsdl:service> -</wsdl:definitions> Deleted: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/RequestForQuote_SupplierQuoteEngineArtifacts.wsdl =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngineArtifacts.wsdl 2011-01-07 20:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/bpel/RequestForQuote_SupplierQuoteEngineArtifacts.wsdl 2011-01-13 10:19:44 UTC (rev 571) @@ -1,7 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier"> - <wsdl:import location="RequestForQuote_SupplierQuoteEngine.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> - <plnk:partnerLinkType name="BrokerToSupplierQuoteEngineServiceLT"> - <plnk:role name="SupplierBehavior" portType="ns1:SupplierBehavior"/> - </plnk:partnerLinkType> -</wsdl:definitions> Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/cdm (from rev 558, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/testmodels) Deleted: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/cdm/ESBBroker.cdm =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/testmodels/ESBBroker.cdm 2011-01-07 20:02:45 UTC (rev 558) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/cdm/ESBBroker.cdm 2011-01-13 10:19:44 UTC (rev 571) @@ -1,128 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<org.pi4soa.cdl:Package xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.pi4soa.cdl="http:///org/pi4soa/cdl.ecore" description="The choreography description for ESBBroker" name="ESBBroker" author="gary" version="0.2" targetNamespace="http://www.pi4soa.org/ESBBroker"> - <typeDefinitions> - <nameSpaces description="Target Namespace for ESBBroker" prefix="tns" uRI="http://www.pi4soa.org/ESBBroker"/> - <nameSpaces description="XML Schema Namespace" prefix="xsd" uRI="http://www.w3.org/2001/XMLSchema"/> - <nameSpaces description="Target Namespace for ESBBroker" prefix="brk" uRI="http://www.pi4soa.org/ESBBroker/Broker"/> - <nameSpaces description="Target Namespace for ESBBroker" prefix="byr" uRI="http://www.pi4soa.org/ESBBroker/Buyer"/> - <nameSpaces description="Target Namespace for ESBBroker" prefix="cay" uRI="http://www.pi4soa.org/ESBBroker/CreditAgency"/> - <nameSpaces description="Target Namespace for ESBBroker" prefix="spr" uRI="http://www.pi4soa.org/ESBBroker/Supplier"/> - <informationTypes description="This is the information type BookingReference" name="BookingReference" elementName="bookingReference"/> - <informationTypes description="This is the information type Buy" name="Buy" elementName="buy"/> - <informationTypes description="This is the information type Cancel" name="Cancel" elementName="cancel"/> - <informationTypes description="This is the information type CreditInformation" name="CreditInformation" elementName="CreditCheckRequest"/> - <informationTypes description="This is the information type CreditInvalid" name="CreditInvalid" elementName="CreditCheckInvalid"/> - <informationTypes description="This is the information type CreditValid" name="CreditValid" elementName="CreditCheckOk"/> - <informationTypes description="This is the information type Enquiry" name="Enquiry" typeName="" elementName="enquiry"/> - <informationTypes description="This is the information type OrderConfirmed" name="OrderConfirmed" elementName="orderConfirmed"/> - <informationTypes description="This is the information type OrderRejected" name="OrderRejected" elementName="orderRejected"/> - <informationTypes description="This is the information type Quote" name="Quote" elementName="quote"/> - <informationTypes description="This is the information type QuoteList" name="QuoteList" elementName="quoteList"/> - <informationTypes description="This is the information type RequestForQuote" name="RequestForQuote" elementName="requestForQuote"/> - <informationTypes description="This is the information type URIType" name="URIType"/> - <tokens description="This is the token URI" name="URI" informationType="//@typeDefinitions/(a)informationTypes.12"/> - <roleTypes description="This is the role type Broker" name="Broker"> - <behaviors description="This is the behavior BrokerBehavior" name="BrokerBehavior"/> - </roleTypes> - <roleTypes description="This is the role type Buyer" name="Buyer"> - <behaviors description="This is the behavior BuyerBehavior" name="BuyerBehavior"/> - </roleTypes> - <roleTypes description="This is the role type CreditAgency" name="CreditAgency"> - <behaviors description="This is the behavior CreditAgencyBehavior" name="CreditAgencyBehavior"/> - </roleTypes> - <roleTypes description="This is the role type Supplier" name="Supplier"> - <behaviors description="This is the behavior SupplierBehavior" name="SupplierBehavior"/> - </roleTypes> - <relationshipTypes description="Relationship between Broker and CreditAgency" name="BrokerToCreditAgencyRel" firstRoleType="//@typeDefinitions/(a)roleTypes.0" secondRoleType="//@typeDefinitions/(a)roleTypes.2"/> - <relationshipTypes description="Relationship between Broker and Supplier" name="BrokerToSupplierRel" firstRoleType="//@typeDefinitions/(a)roleTypes.0" secondRoleType="//@typeDefinitions/(a)roleTypes.3"/> - <relationshipTypes description="Relationship between Buyer and Broker" name="BuyerToBrokerRel" firstRoleType="//@typeDefinitions/(a)roleTypes.1" secondRoleType="//@typeDefinitions/(a)roleTypes.0"/> - <participantTypes description="This is the participant type brk:Broker" name="brk:Broker" roleTypes="//@typeDefinitions/(a)roleTypes.0"> - <semanticAnnotations annotation="overlord.cdl.samples.LoanBroker@Broker" name="conversationType"/> - </participantTypes> - <participantTypes description="This is the participant type byr:Buyer" name="byr:Buyer" roleTypes="//@typeDefinitions/(a)roleTypes.1"> - <semanticAnnotations annotation="overlord.cdl.samples.LoanBroker@Buyer" name="conversationType"/> - </participantTypes> - <participantTypes description="This is the participant type cay:CreditAgency" name="cay:CreditAgency" roleTypes="//@typeDefinitions/(a)roleTypes.2"> - <semanticAnnotations annotation="overlord.cdl.samples.Common@CreditAgency" name="conversationType"/> - </participantTypes> - <participantTypes description="This is the participant type spr:Supplier" name="spr:Supplier" roleTypes="//@typeDefinitions/(a)roleTypes.3"> - <semanticAnnotations annotation="" name="conversationType"/> - </participantTypes> - <channelTypes description="This is the channel type BrokerChannelType" name="BrokerChannelType" referenceToken="//@typeDefinitions/(a)tokens.0" roleType="//@typeDefinitions/(a)roleTypes.0"/> - <channelTypes description="This is the channel type CreditAgencyChannelType" name="CreditAgencyChannelType" referenceToken="//@typeDefinitions/(a)tokens.0" roleType="//@typeDefinitions/(a)roleTypes.2"/> - <channelTypes description="This is the channel type SupplierChannelType" name="SupplierChannelType" referenceToken="//@typeDefinitions/(a)tokens.0" roleType="//@typeDefinitions/(a)roleTypes.3"/> - </typeDefinitions> - <choreographies description="Choreography flow for the ESBBroker process" name="ESBBrokerProcess" root="true"> - <enclosedChoreographies name="CompleteTransaction"> - <participantDefinitions name="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"/> - <variableDefinitions description="Channel to facilitate interaction to CreditAgency" name="CreditAgencyChannel" type="//@typeDefinitions/(a)channelTypes.1"/> - <variableDefinitions description="Channel to facilitate interaction to Supplier" name="SupplierChannel" type="//@typeDefinitions/(a)channelTypes.2"/> - <activities xsi:type="org.pi4soa.cdl:Interaction" name="Buy" operation="buy" channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.2"> - <exchangeDetails description="This is the exchange details for the request exchange associated with interaction Buy" name="BuyRequestExchange" type="//@typeDefinitions/(a)informationTypes.1"/> - </activities> - <activities xsi:type="org.pi4soa.cdl:Interaction" name="CheckCredit" operation="checkCredit" channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.1" relationship="//@typeDefinitions/(a)relationshipTypes.0"> - <exchangeDetails description="This is the exchange details for the request exchange associated with interaction CheckCredit" name="CheckCreditRequestExchange" type="//@typeDefinitions/(a)informationTypes.3"/> - </activities> - <activities xsi:type="org.pi4soa.cdl:Choice" description="Evaluate Credit Check Result"> - <activities xsi:type="org.pi4soa.cdl:Sequence" description="Sufficient Credit"> - <activities xsi:type="org.pi4soa.cdl:Interaction" name="CheckCreditResponse" operation="checkCredit" channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.1" relationship="//@typeDefinitions/(a)relationshipTypes.0"> - <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CheckCreditResponse" name="CheckCreditResponseRespondExchange" type="//@typeDefinitions/(a)informationTypes.5" action="Respond"/> - </activities> - <activities xsi:type="org.pi4soa.cdl:Interaction" name="ConfirmBooking" operation="confirm" channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.2" relationship="//@typeDefinitions/(a)relationshipTypes.1" toParticipant="//@choreographies.0/@enclosedChoreographies.0/(a)participantDefinitions.0"> - <exchangeDetails description="This is the exchange details for the request exchange associated with interaction ConfirmBooking" name="ConfirmBookingRequestExchange" type="//@typeDefinitions/(a)informationTypes.7"/> - <exchangeDetails description="This is the exchange details for the request exchange associated with interaction ConfirmBooking" name="ConfirmBookingRequestExchange" type="//@typeDefinitions/(a)informationTypes.0" action="Respond"/> - </activities> - <activities xsi:type="org.pi4soa.cdl:Interaction" name="Buy" operation="buy" channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.2"> - <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction Buy" name="BuyRespondExchange" type="//@typeDefinitions/(a)informationTypes.0" action="Respond" faultName=""/> - </activities> - </activities> - <activities xsi:type="org.pi4soa.cdl:Sequence" description="Insufficient Credit"> - <activities xsi:type="org.pi4soa.cdl:Interaction" name="CheckCreditFailed" operation="checkCredit" channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.1" relationship="//@typeDefinitions/(a)relationshipTypes.0"> - <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CheckCreditFailed" name="CheckCreditFailedRespondExchange" type="//@typeDefinitions/(a)informationTypes.4" action="Respond" faultName="invalidCredit"/> - </activities> - <activities xsi:type="org.pi4soa.cdl:Interaction" name="Buy" operation="buy" channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.2"> - <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction Buy" name="BuyRespondExchange" type="//@typeDefinitions/(a)informationTypes.8" action="Respond" faultName="rejected"/> - </activities> - </activities> - </activities> - </enclosedChoreographies> - <enclosedChoreographies name="RequestForQuote"> - <participantDefinitions name="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"/> - <activities xsi:type="org.pi4soa.cdl:Interaction" name="RFQ" operation="getQuote" channelVariable="//@choreographies.0/@enclosedChoreographies.1/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.1" toParticipant="//@choreographies.0/@enclosedChoreographies.1/(a)participantDefinitions.0"> - <exchangeDetails description="This is the exchange details for the request exchange associated with interaction RFQ" name="RFQRequestExchange" type="//@typeDefinitions/(a)informationTypes.11"/> - <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction RFQ" name="RFQRespondExchange" type="//@typeDefinitions/(a)informationTypes.9" action="Respond"/> - </activities> - </enclosedChoreographies> - <variableDefinitions description="Channel to facilitate interaction to Broker" name="BrokerChannel" type="//@typeDefinitions/(a)channelTypes.0" roleTypes="//@typeDefinitions/(a)roleTypes.0 //@typeDefinitions/(a)roleTypes.1"/> - <activities xsi:type="org.pi4soa.cdl:Interaction" name="Enquiry" operation="makeEnquiry" channelVariable="//@choreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.2"> - <exchangeDetails description="This is the exchange details for the request exchange associated with interaction Enquiry" name="EnquiryRequestExchange" type="//@typeDefinitions/(a)informationTypes.6"/> - </activities> - <activities xsi:type="org.pi4soa.cdl:While" name="SendRFQToSuppliers"> - <activities xsi:type="org.pi4soa.cdl:Perform" choreography="//@choreographies.0/(a)enclosedChoreographies.1"/> - </activities> - <activities xsi:type="org.pi4soa.cdl:When" name="WhenQuotesReceivedOrTimeout"> - <activities xsi:type="org.pi4soa.cdl:Interaction" name="Enquiry" operation="makeEnquiry" channelVariable="//@choreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.2"> - <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction Enquiry" name="EnquiryRespondExchange" type="//@typeDefinitions/(a)informationTypes.10" action="Respond"/> - </activities> - </activities> - <activities xsi:type="org.pi4soa.cdl:Choice"> - <activities xsi:type="org.pi4soa.cdl:Sequence"> - <activities xsi:type="org.pi4soa.cdl:Perform" choreography="//@choreographies.0/(a)enclosedChoreographies.0" waitForCompletion="false"> - <bindDetails name="BindBrokerChannel" thisVariable="//@choreographies.0/(a)variableDefinitions.0" thisRole="//@typeDefinitions/(a)roleTypes.1" freeVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0" freeRole="//@typeDefinitions/(a)roleTypes.1"/> - <bindDetails name="BindBrokerChannel" thisVariable="//@choreographies.0/(a)variableDefinitions.0" thisRole="//@typeDefinitions/(a)roleTypes.0" freeVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0" freeRole="//@typeDefinitions/(a)roleTypes.0"/> - </activities> - </activities> - <activities xsi:type="org.pi4soa.cdl:Sequence"> - <activities xsi:type="org.pi4soa.cdl:Interaction" name="Cancel" operation="cancel" channelVariable="//@choreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.2"> - <exchangeDetails description="This is the exchange details for the request exchange associated with interaction Cancel" name="CancelRequestExchange" type="//@typeDefinitions/(a)informationTypes.2"/> - </activities> - </activities> - </activities> - </choreographies> -</org.pi4soa.cdl:Package> Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/cdm/ESBBroker.cdm (from rev 564, 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.bundles.tests/src/test/resources/testmodels/cdm/ESBBroker.cdm (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/cdm/ESBBroker.cdm 2011-01-13 10:19:44 UTC (rev 571) @@ -0,0 +1,128 @@ +<?xml version="1.0" encoding="UTF-8"?> +<org.pi4soa.cdl:Package xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.pi4soa.cdl="http:///org/pi4soa/cdl.ecore" description="The choreography description for ESBBroker" name="ESBBroker" author="gary" version="0.2" targetNamespace="http://www.pi4soa.org/ESBBroker"> + <typeDefinitions> + <nameSpaces description="Target Namespace for ESBBroker" prefix="tns" uRI="http://www.pi4soa.org/ESBBroker"/> + <nameSpaces description="XML Schema Namespace" prefix="xsd" uRI="http://www.w3.org/2001/XMLSchema"/> + <nameSpaces description="Target Namespace for ESBBroker" prefix="brk" uRI="http://www.pi4soa.org/ESBBroker/Broker"/> + <nameSpaces description="Target Namespace for ESBBroker" prefix="byr" uRI="http://www.pi4soa.org/ESBBroker/Buyer"/> + <nameSpaces description="Target Namespace for ESBBroker" prefix="cay" uRI="http://www.pi4soa.org/ESBBroker/CreditAgency"/> + <nameSpaces description="Target Namespace for ESBBroker" prefix="spr" uRI="http://www.pi4soa.org/ESBBroker/Supplier"/> + <informationTypes description="This is the information type BookingReference" name="BookingReference" elementName="bookingReference"/> + <informationTypes description="This is the information type Buy" name="Buy" elementName="buy"/> + <informationTypes description="This is the information type Cancel" name="Cancel" elementName="cancel"/> + <informationTypes description="This is the information type CreditInformation" name="CreditInformation" elementName="CreditCheckRequest"/> + <informationTypes description="This is the information type CreditInvalid" name="CreditInvalid" elementName="CreditCheckInvalid"/> + <informationTypes description="This is the information type CreditValid" name="CreditValid" elementName="CreditCheckOk"/> + <informationTypes description="This is the information type Enquiry" name="Enquiry" typeName="" elementName="enquiry"/> + <informationTypes description="This is the information type OrderConfirmed" name="OrderConfirmed" elementName="orderConfirmed"/> + <informationTypes description="This is the information type OrderRejected" name="OrderRejected" elementName="orderRejected"/> + <informationTypes description="This is the information type Quote" name="Quote" elementName="quote"/> + <informationTypes description="This is the information type QuoteList" name="QuoteList" elementName="quoteList"/> + <informationTypes description="This is the information type RequestForQuote" name="RequestForQuote" elementName="requestForQuote"/> + <informationTypes description="This is the information type URIType" name="URIType"/> + <tokens description="This is the token URI" name="URI" informationType="//@typeDefinitions/(a)informationTypes.12"/> + <roleTypes description="This is the role type Broker" name="Broker"> + <behaviors description="This is the behavior BrokerBehavior" name="BrokerBehavior"/> + </roleTypes> + <roleTypes description="This is the role type Buyer" name="Buyer"> + <behaviors description="This is the behavior BuyerBehavior" name="BuyerBehavior"/> + </roleTypes> + <roleTypes description="This is the role type CreditAgency" name="CreditAgency"> + <behaviors description="This is the behavior CreditAgencyBehavior" name="CreditAgencyBehavior"/> + </roleTypes> + <roleTypes description="This is the role type Supplier" name="Supplier"> + <behaviors description="This is the behavior SupplierBehavior" name="SupplierBehavior"/> + </roleTypes> + <relationshipTypes description="Relationship between Broker and CreditAgency" name="BrokerToCreditAgencyRel" firstRoleType="//@typeDefinitions/(a)roleTypes.0" secondRoleType="//@typeDefinitions/(a)roleTypes.2"/> + <relationshipTypes description="Relationship between Broker and Supplier" name="BrokerToSupplierRel" firstRoleType="//@typeDefinitions/(a)roleTypes.0" secondRoleType="//@typeDefinitions/(a)roleTypes.3"/> + <relationshipTypes description="Relationship between Buyer and Broker" name="BuyerToBrokerRel" firstRoleType="//@typeDefinitions/(a)roleTypes.1" secondRoleType="//@typeDefinitions/(a)roleTypes.0"/> + <participantTypes description="This is the participant type brk:Broker" name="brk:Broker" roleTypes="//@typeDefinitions/(a)roleTypes.0"> + <semanticAnnotations annotation="overlord.cdl.samples.LoanBroker@Broker" name="conversationType"/> + </participantTypes> + <participantTypes description="This is the participant type byr:Buyer" name="byr:Buyer" roleTypes="//@typeDefinitions/(a)roleTypes.1"> + <semanticAnnotations annotation="overlord.cdl.samples.LoanBroker@Buyer" name="conversationType"/> + </participantTypes> + <participantTypes description="This is the participant type cay:CreditAgency" name="cay:CreditAgency" roleTypes="//@typeDefinitions/(a)roleTypes.2"> + <semanticAnnotations annotation="overlord.cdl.samples.Common@CreditAgency" name="conversationType"/> + </participantTypes> + <participantTypes description="This is the participant type spr:Supplier" name="spr:Supplier" roleTypes="//@typeDefinitions/(a)roleTypes.3"> + <semanticAnnotations annotation="" name="conversationType"/> + </participantTypes> + <channelTypes description="This is the channel type BrokerChannelType" name="BrokerChannelType" referenceToken="//@typeDefinitions/(a)tokens.0" roleType="//@typeDefinitions/(a)roleTypes.0"/> + <channelTypes description="This is the channel type CreditAgencyChannelType" name="CreditAgencyChannelType" referenceToken="//@typeDefinitions/(a)tokens.0" roleType="//@typeDefinitions/(a)roleTypes.2"/> + <channelTypes description="This is the channel type SupplierChannelType" name="SupplierChannelType" referenceToken="//@typeDefinitions/(a)tokens.0" roleType="//@typeDefinitions/(a)roleTypes.3"/> + </typeDefinitions> + <choreographies description="Choreography flow for the ESBBroker process" name="ESBBrokerProcess" root="true"> + <enclosedChoreographies name="CompleteTransaction"> + <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"/> + <variableDefinitions description="Channel to facilitate interaction to CreditAgency" name="CreditAgencyChannel" type="//@typeDefinitions/(a)channelTypes.1"/> + <variableDefinitions description="Channel to facilitate interaction to Supplier" name="SupplierChannel" type="//@typeDefinitions/(a)channelTypes.2"/> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="Buy" operation="buy" channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.2"> + <exchangeDetails description="This is the exchange details for the request exchange associated with interaction Buy" name="BuyRequestExchange" type="//@typeDefinitions/(a)informationTypes.1"/> + </activities> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="CheckCredit" operation="checkCredit" channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.1" relationship="//@typeDefinitions/(a)relationshipTypes.0"> + <exchangeDetails description="This is the exchange details for the request exchange associated with interaction CheckCredit" name="CheckCreditRequestExchange" type="//@typeDefinitions/(a)informationTypes.3"/> + </activities> + <activities xsi:type="org.pi4soa.cdl:Choice" description="Evaluate Credit Check Result"> + <activities xsi:type="org.pi4soa.cdl:Sequence" description="Sufficient Credit"> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="CheckCreditResponse" operation="checkCredit" channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.1" relationship="//@typeDefinitions/(a)relationshipTypes.0"> + <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CheckCreditResponse" name="CheckCreditResponseRespondExchange" type="//@typeDefinitions/(a)informationTypes.5" action="Respond"/> + </activities> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="ConfirmBooking" operation="confirm" channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.2" relationship="//@typeDefinitions/(a)relationshipTypes.1" toParticipant="//@choreographies.0/@enclosedChoreographies.0/(a)participantDefinitions.0"> + <exchangeDetails description="This is the exchange details for the request exchange associated with interaction ConfirmBooking" name="ConfirmBookingRequestExchange" type="//@typeDefinitions/(a)informationTypes.7"/> + <exchangeDetails description="This is the exchange details for the request exchange associated with interaction ConfirmBooking" name="ConfirmBookingRequestExchange" type="//@typeDefinitions/(a)informationTypes.0" action="Respond"/> + </activities> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="Buy" operation="buy" channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.2"> + <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction Buy" name="BuyRespondExchange" type="//@typeDefinitions/(a)informationTypes.0" action="Respond" faultName=""/> + </activities> + </activities> + <activities xsi:type="org.pi4soa.cdl:Sequence" description="Insufficient Credit"> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="CheckCreditFailed" operation="checkCredit" channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.1" relationship="//@typeDefinitions/(a)relationshipTypes.0"> + <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CheckCreditFailed" name="CheckCreditFailedRespondExchange" type="//@typeDefinitions/(a)informationTypes.4" action="Respond" faultName="invalidCredit"/> + </activities> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="Buy" operation="buy" channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.2"> + <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction Buy" name="BuyRespondExchange" type="//@typeDefinitions/(a)informationTypes.8" action="Respond" faultName="rejected"/> + </activities> + </activities> + </activities> + </enclosedChoreographies> + <enclosedChoreographies name="RequestForQuote"> + <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"/> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="RFQ" operation="getQuote" channelVariable="//@choreographies.0/@enclosedChoreographies.1/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.1" toParticipant="//@choreographies.0/@enclosedChoreographies.1/(a)participantDefinitions.0"> + <exchangeDetails description="This is the exchange details for the request exchange associated with interaction RFQ" name="RFQRequestExchange" type="//@typeDefinitions/(a)informationTypes.11"/> + <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction RFQ" name="RFQRespondExchange" type="//@typeDefinitions/(a)informationTypes.9" action="Respond"/> + </activities> + </enclosedChoreographies> + <variableDefinitions description="Channel to facilitate interaction to Broker" name="BrokerChannel" type="//@typeDefinitions/(a)channelTypes.0" roleTypes="//@typeDefinitions/(a)roleTypes.0 //@typeDefinitions/(a)roleTypes.1"/> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="Enquiry" operation="makeEnquiry" channelVariable="//@choreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.2"> + <exchangeDetails description="This is the exchange details for the request exchange associated with interaction Enquiry" name="EnquiryRequestExchange" type="//@typeDefinitions/(a)informationTypes.6"/> + </activities> + <activities xsi:type="org.pi4soa.cdl:While" name="SendRFQToSuppliers"> + <activities xsi:type="org.pi4soa.cdl:Perform" choreography="//@choreographies.0/(a)enclosedChoreographies.1"/> + </activities> + <activities xsi:type="org.pi4soa.cdl:When" name="WhenQuotesReceivedOrTimeout"> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="Enquiry" operation="makeEnquiry" channelVariable="//@choreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.2"> + <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction Enquiry" name="EnquiryRespondExchange" type="//@typeDefinitions/(a)informationTypes.10" action="Respond"/> + </activities> + </activities> + <activities xsi:type="org.pi4soa.cdl:Choice"> + <activities xsi:type="org.pi4soa.cdl:Sequence"> + <activities xsi:type="org.pi4soa.cdl:Perform" choreography="//@choreographies.0/(a)enclosedChoreographies.0" waitForCompletion="false"> + <bindDetails name="BindBrokerChannel" thisVariable="//@choreographies.0/(a)variableDefinitions.0" thisRole="//@typeDefinitions/(a)roleTypes.1" freeVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0" freeRole="//@typeDefinitions/(a)roleTypes.1"/> + <bindDetails name="BindBrokerChannel" thisVariable="//@choreographies.0/(a)variableDefinitions.0" thisRole="//@typeDefinitions/(a)roleTypes.0" freeVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0" freeRole="//@typeDefinitions/(a)roleTypes.0"/> + </activities> + </activities> + <activities xsi:type="org.pi4soa.cdl:Sequence"> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="Cancel" operation="cancel" channelVariable="//@choreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.2"> + <exchangeDetails description="This is the exchange details for the request exchange associated with interaction Cancel" name="CancelRequestExchange" type="//@typeDefinitions/(a)informationTypes.2"/> + </activities> + </activities> + </activities> + </choreographies> +</org.pi4soa.cdl:Package> Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/CompleteTransaction_SupplierTxnProcessor.wsdl (from rev 558, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/CompleteTransaction_SupplierTxnProcessor.wsdl) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/CompleteTransaction_SupplierTxnProcessor.wsdl (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/CompleteTransaction_SupplierTxnProcessor.wsdl 2011-01-13 10:19:44 UTC (rev 571) @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="Supplier" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier"> + <types xmlns="http://schemas.xmlsoap.org/wsdl/"> + <schema xmlns="http://www.w3.org/2001/XMLSchema"/> + </types> + <wsdl:message name="confirmRequest"> + <wsdl:part element="orderConfirmed" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="confirmResponse"> + <wsdl:part element="bookingReference" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="getQuoteResponse"> + <wsdl:part element="quote" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="getQuoteRequest"> + <wsdl:part element="requestForQuote" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:portType name="SupplierBehavior"> + <wsdl:operation name="confirm"> + <wsdl:input message="spr:confirmRequest"> + </wsdl:input> + <wsdl:output message="spr:confirmResponse"> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="getQuote"> + <wsdl:input message="spr:getQuoteRequest"> + </wsdl:input> + <wsdl:output message="spr:getQuoteResponse"> + </wsdl:output> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="SupplierBehaviorBinding" type="spr:SupplierBehavior"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="confirm"> + <soap:operation soapAction="http://www.pi4soa.org/ESBBroker/Supplier/confirm"/> + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="getQuote"> + <soap:operation soapAction="http://www.pi4soa.org/ESBBroker/Supplier/getQuote"/> + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="SupplierService"> + <wsdl:port binding="spr:SupplierBehaviorBinding" name="SupplierBehaviorPort"> + <soap:address location="http://localhost:8080/SupplierService/SupplierBehaviorPort"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/CompleteTransaction_SupplierTxnProcessorArtifacts.wsdl (from rev 558, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/CompleteTransaction_SupplierTxnProcessorArtifacts.wsdl) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/CompleteTransaction_SupplierTxnProcessorArtifacts.wsdl (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/CompleteTransaction_SupplierTxnProcessorArtifacts.wsdl 2011-01-13 10:19:44 UTC (rev 571) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier"> + <wsdl:import location="CompleteTransaction_SupplierTxnProcessor.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> + <plnk:partnerLinkType name="BrokerToSupplierTxnProcessorServiceLT"> + <plnk:role name="SupplierTxnProcessorService" portType="ns1:SupplierBehavior"/> + </plnk:partnerLinkType> +</wsdl:definitions> Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/ESBBrokerProcess_Broker.wsdl (from rev 558, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Broker.wsdl) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/ESBBrokerProcess_Broker.wsdl (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/ESBBrokerProcess_Broker.wsdl 2011-01-13 10:19:44 UTC (rev 571) @@ -0,0 +1,85 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="Broker" targetNamespace="http://www.pi4soa.org/ESBBroker/Broker"> + <types xmlns="http://schemas.xmlsoap.org/wsdl/"> + <schema xmlns="http://www.w3.org/2001/XMLSchema"/> + </types> + <wsdl:message name="rejectedFault"> + <wsdl:part element="orderRejected" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="makeEnquiryRequest"> + <wsdl:part element="enquiry" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="buyResponse"> + <wsdl:part element="bookingReference" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="makeEnquiryResponse"> + <wsdl:part element="quoteList" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="buyRequest"> + <wsdl:part element="buy" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="cancelRequest"> + <wsdl:part element="cancel" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:portType name="BrokerBehavior"> + <wsdl:operation name="buy"> + <wsdl:input message="brk:buyRequest"> + </wsdl:input> + <wsdl:output message="brk:buyResponse"> + </wsdl:output> + <wsdl:fault message="brk:rejectedFault" name="rejected"> + </wsdl:fault> + </wsdl:operation> + <wsdl:operation name="makeEnquiry"> + <wsdl:input message="brk:makeEnquiryRequest"> + </wsdl:input> + <wsdl:output message="brk:makeEnquiryResponse"> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="cancel"> + <wsdl:input message="brk:cancelRequest"> + </wsdl:input> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="BrokerBehaviorBinding" type="brk:BrokerBehavior"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="buy"> + <soap:operation soapAction="http://www.pi4soa.org/ESBBroker/Broker/buy"/> + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="rejected"> + <soap:fault name="rejected" use="literal"/> + </wsdl:fault> + </wsdl:operation> + <wsdl:operation name="makeEnquiry"> + <soap:operation soapAction="http://www.pi4soa.org/ESBBroker/Broker/makeEnquiry"/> + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="cancel"> + <soap:operation soapAction="http://www.pi4soa.org/ESBBroker/Broker/cancel"/> + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="BrokerService"> + <wsdl:port binding="brk:BrokerBehaviorBinding" name="BrokerBehaviorPort"> + <soap:address location="http://localhost:8080/BrokerService/BrokerBehaviorPort"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/ESBBrokerProcess_BrokerArtifacts.wsdl (from rev 558, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_BrokerArtifacts.wsdl) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/ESBBrokerProcess_BrokerArtifacts.wsdl (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/ESBBrokerProcess_BrokerArtifacts.wsdl 2011-01-13 10:19:44 UTC (rev 571) @@ -0,0 +1,18 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://www.pi4soa.org/ESBBroker/Broker" xmlns:ns2="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:ns3="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" targetNamespace="http://www.pi4soa.org/ESBBroker/Broker"> + <wsdl:import location="ESBBrokerProcess_Broker.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Broker"/> + <wsdl:import location="ESBBrokerProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/> + <wsdl:import location="ESBBrokerProcess_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> + <plnk:partnerLinkType name="BuyerToBrokerServiceLT"> + <plnk:role name="BrokerBehavior" portType="ns1:BrokerBehavior"/> + </plnk:partnerLinkType> + <plnk:partnerLinkType name="BrokerToSupplierQuoteEngineLT"> + <plnk:role name="SupplierQuoteEngineRequester" portType="ns2:SupplierBehavior"/> + </plnk:partnerLinkType> + <plnk:partnerLinkType name="BrokerToCreditAgencyLT"> + <plnk:role name="CreditAgencyRequester" portType="ns3:CreditAgencyBehavior"/> + </plnk:partnerLinkType> + <plnk:partnerLinkType name="BrokerToSupplierTxnProcessorLT"> + <plnk:role name="SupplierTxnProcessorRequester" portType="ns2:SupplierBehavior"/> + </plnk:partnerLinkType> +</wsdl:definitions> Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/ESBBrokerProcess_BuyerArtifacts.wsdl (from rev 558, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_BuyerArtifacts.wsdl) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/ESBBrokerProcess_BuyerArtifacts.wsdl (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/ESBBrokerProcess_BuyerArtifacts.wsdl 2011-01-13 10:19:44 UTC (rev 571) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://www.pi4soa.org/ESBBroker/Broker" xmlns:ns2="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" targetNamespace="http://www.pi4soa.org/ESBBroker/Buyer"> +  + <wsdl:import location="ESBBrokerProcess_Broker.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Broker"/> + <wsdl:import location="ESBBrokerProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/> + <wsdl:import location="ESBBrokerProcess_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> + <plnk:partnerLinkType name="BuyerToBrokerLT"> + <plnk:role name="BrokerRequester" portType="ns1:BrokerBehavior"/> + <plnk:role name="BrokerBehavior" portType="ns2:BuyerBehavior"/> + </plnk:partnerLinkType> +</wsdl:definitions> Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/ESBBrokerProcess_CreditAgency.wsdl (from rev 558, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_CreditAgency.wsdl) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/ESBBrokerProcess_CreditAgency.wsdl (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/ESBBrokerProcess_CreditAgency.wsdl 2011-01-13 10:19:44 UTC (rev 571) @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="CreditAgency" targetNamespace="http://www.pi4soa.org/ESBBroker/CreditAgency"> + <types xmlns="http://schemas.xmlsoap.org/wsdl/"> + <schema xmlns="http://www.w3.org/2001/XMLSchema"/> + </types> + <wsdl:message name="checkCreditResponse"> + <wsdl:part element="CreditCheckOk" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="checkCreditRequest"> + <wsdl:part element="CreditCheckRequest" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="invalidCreditFault"> + <wsdl:part element="CreditCheckInvalid" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:portType name="CreditAgencyBehavior"> + <wsdl:operation name="checkCredit"> + <wsdl:input message="cay:checkCreditRequest"> + </wsdl:input> + <wsdl:output message="cay:checkCreditResponse"> + </wsdl:output> + <wsdl:fault message="cay:invalidCreditFault" name="invalidCredit"> + </wsdl:fault> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="CreditAgencyBehaviorBinding" type="cay:CreditAgencyBehavior"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="checkCredit"> + <soap:operation soapAction="http://www.pi4soa.org/ESBBroker/CreditAgency/checkCredit"/> + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="invalidCredit"> + <soap:fault name="invalidCredit" use="literal"/> + </wsdl:fault> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="CreditAgencyService"> + <wsdl:port binding="cay:CreditAgencyBehaviorBinding" name="CreditAgencyBehaviorPort"> + <soap:address location="http://localhost:8080/CreditAgencyService/CreditAgencyBehaviorPort"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/ESBBrokerProcess_CreditAgencyArtifacts.wsdl (from rev 558, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_CreditAgencyArtifacts.wsdl) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/ESBBrokerProcess_CreditAgencyArtifacts.wsdl (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/ESBBrokerProcess_CreditAgencyArtifacts.wsdl 2011-01-13 10:19:44 UTC (rev 571) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" targetNamespace="http://www.pi4soa.org/ESBBroker/CreditAgency"> + <wsdl:import location="ESBBrokerProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/> + <wsdl:import location="ESBBrokerProcess_Broker.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Broker"/> + <wsdl:import location="ESBBrokerProcess_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> + <plnk:partnerLinkType name="BrokerToCreditAgencyServiceLT"> + <plnk:role name="CreditAgencyService" portType="ns1:CreditAgencyBehavior"/> + </plnk:partnerLinkType> +</wsdl:definitions> Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/ESBBrokerProcess_Supplier.wsdl (from rev 558, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Supplier.wsdl) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/ESBBrokerProcess_Supplier.wsdl (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/ESBBrokerProcess_Supplier.wsdl 2011-01-13 10:19:44 UTC (rev 571) @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="Supplier" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier"> + <types xmlns="http://schemas.xmlsoap.org/wsdl/"> + <schema xmlns="http://www.w3.org/2001/XMLSchema"/> + </types> + <wsdl:message name="confirmRequest"> + <wsdl:part element="orderConfirmed" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="confirmResponse"> + <wsdl:part element="bookingReference" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="getQuoteResponse"> + <wsdl:part element="quote" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="getQuoteRequest"> + <wsdl:part element="requestForQuote" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:portType name="SupplierBehavior"> + <wsdl:operation name="confirm"> + <wsdl:input message="spr:confirmRequest"> + </wsdl:input> + <wsdl:output message="spr:confirmResponse"> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="getQuote"> + <wsdl:input message="spr:getQuoteRequest"> + </wsdl:input> + <wsdl:output message="spr:getQuoteResponse"> + </wsdl:output> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="SupplierBehaviorBinding" type="spr:SupplierBehavior"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="confirm"> + <soap:operation soapAction="http://www.pi4soa.org/ESBBroker/Supplier/confirm"/> + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="getQuote"> + <soap:operation soapAction="http://www.pi4soa.org/ESBBroker/Supplier/getQuote"/> + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="SupplierService"> + <wsdl:port binding="spr:SupplierBehaviorBinding" name="SupplierBehaviorPort"> + <soap:address location="http://localhost:8080/SupplierService/SupplierBehaviorPort"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/PurchaseGoodsProcess_BuyerArtifacts.wsdl (from rev 558, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_BuyerArtifacts.wsdl) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/PurchaseGoodsProcess_BuyerArtifacts.wsdl (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/PurchaseGoodsProcess_BuyerArtifacts.wsdl 2011-01-13 10:19:44 UTC (rev 571) @@ -0,0 +1,9 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://www.jboss.org/examples/store" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" targetNamespace="http://www.jboss.org/savara/examples"> + <wsdl:import location="PurchaseGoodsProcess_Buyer.wsdl" namespace="http://www.jboss.org/savara/examples"/> + <wsdl:import location="PurchaseGoodsProcess_CreditAgency.wsdl" namespace="java:org.jboss.savara.examples.purchasing"/> + <wsdl:import location="PurchaseGoodsProcess_Store.wsdl" namespace="http://www.jboss.org/examples/store"/> + <plnk:partnerLinkType name="BuyerToStoreLT"> + <plnk:role name="StoreRequester" portType="ns1:StoreInterface"/> + </plnk:partnerLinkType> +</wsdl:definitions> Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/PurchaseGoodsProcess_CreditAgency.wsdl (from rev 558, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgency.wsdl) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/PurchaseGoodsProcess_CreditAgency.wsdl (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/PurchaseGoodsProcess_CreditAgency.wsdl 2011-01-13 10:19:44 UTC (rev 571) @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:pur="java:org.jboss.savara.examples.purchasing" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:sto="http://www.jboss.org/examples/store" xmlns:tns="http://www.jboss.org/savara/examples" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="CreditAgency" targetNamespace="java:org.jboss.savara.examples.purchasing"> + <types xmlns="http://schemas.xmlsoap.org/wsdl/"> + <schema xmlns="http://www.w3.org/2001/XMLSchema"/> + </types> + <wsdl:message name="checkCreditRequest"> + <wsdl:part name="content" type="pur:CreditCheckRequest"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="CreditCheckFailedFault"> + <wsdl:part name="content" type="pur:CreditCheckInvalid"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="checkCreditResponse"> + <wsdl:part name="content" type="pur:CreditCheckOk"> + </wsdl:part> + </wsdl:message> + <wsdl:portType name="CreditAgencyInterface"> + <wsdl:operation name="checkCredit"> + <wsdl:input message="pur:checkCreditRequest"> + </wsdl:input> + <wsdl:output message="pur:checkCreditResponse"> + </wsdl:output> + <wsdl:fault message="pur:CreditCheckFailedFault" name="CreditCheckFailed"> + </wsdl:fault> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="CreditAgencyInterfaceBinding" type="pur:CreditAgencyInterface"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="checkCredit"> + <soap:operation soapAction="java:org.jboss.savara.examples.purchasing/checkCredit"/> + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="CreditCheckFailed"> + <soap:fault name="CreditCheckFailed" use="literal"/> + </wsdl:fault> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="CreditAgencyService"> + <wsdl:port binding="pur:CreditAgencyInterfaceBinding" name="CreditAgencyInterfacePort"> + <soap:address location="http://localhost:8080/CreditAgencyService/CreditAgencyInterfacePort"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/PurchaseGoodsProcess_CreditAgencyArtifacts.wsdl (from rev 558, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgencyArtifacts.wsdl) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/PurchaseGoodsProcess_CreditAgencyArtifacts.wsdl (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/PurchaseGoodsProcess_CreditAgencyArtifacts.wsdl 2011-01-13 10:19:44 UTC (rev 571) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="java:org.jboss.savara.examples.purchasing" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" targetNamespace="java:org.jboss.savara.examples.purchasing"> + <wsdl:import location="PurchaseGoodsProcess_CreditAgency.wsdl" namespace="java:org.jboss.savara.examples.purchasing"/> + <wsdl:import location="PurchaseGoodsProcess_Store.wsdl" namespace="http://www.jboss.org/examples/store"/> + <plnk:partnerLinkType name="StoreToCreditAgencyServiceLT"> + <plnk:role name="CreditAgencyInterface" portType="ns1:CreditAgencyInterface"/> + </plnk:partnerLinkType> +</wsdl:definitions> Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/PurchaseGoodsProcess_Store.wsdl (from rev 558, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Store.wsdl) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/PurchaseGoodsProcess_Store.wsdl (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/PurchaseGoodsProcess_Store.wsdl 2011-01-13 10:19:44 UTC (rev 571) @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:pur="java:org.jboss.savara.examples.purchasing" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:sto="http://www.jboss.org/examples/store" xmlns:tns="http://www.jboss.org/savara/examples" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="Store" targetNamespace="http://www.jboss.org/examples/store"> + <types xmlns="http://schemas.xmlsoap.org/wsdl/"> + <schema xmlns="http://www.w3.org/2001/XMLSchema"/> + </types> + <wsdl:message name="BuyFailedFault"> + <wsdl:part name="content" type="sto:BuyFailed"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="buyRequest"> + <wsdl:part name="content" type="sto:BuyRequest"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="buyResponse"> + <wsdl:part name="content" type="sto:BuyConfirmed"> + </wsdl:part> + </wsdl:message> + <wsdl:portType name="StoreInterface"> + <wsdl:operation name="buy"> + <wsdl:input message="sto:buyRequest"> + </wsdl:input> + <wsdl:output message="sto:buyResponse"> + </wsdl:output> + <wsdl:fault message="sto:BuyFailedFault" name="BuyFailed"> + </wsdl:fault> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="StoreInterfaceBinding" type="sto:StoreInterface"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="buy"> + <soap:operation soapAction="http://www.jboss.org/examples/store/buy"/> + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="BuyFailed"> + <soap:fault name="BuyFailed" use="literal"/> + </wsdl:fault> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="StoreService"> + <wsdl:port binding="sto:StoreInterfaceBinding" name="StoreInterfacePort"> + <soap:address location="http://localhost:8080/StoreService/StoreInterfacePort"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/PurchaseGoodsProcess_StoreArtifacts.wsdl (from rev 558, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_StoreArtifacts.wsdl) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/PurchaseGoodsProcess_StoreArtifacts.wsdl (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/PurchaseGoodsProcess_StoreArtifacts.wsdl 2011-01-13 10:19:44 UTC (rev 571) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://www.jboss.org/examples/store" xmlns:ns2="java:org.jboss.savara.examples.purchasing" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" targetNamespace="http://www.jboss.org/examples/store"> + <wsdl:import location="PurchaseGoodsProcess_Store.wsdl" namespace="http://www.jboss.org/examples/store"/> + <wsdl:import location="PurchaseGoodsProcess_CreditAgency.wsdl" namespace="java:org.jboss.savara.examples.purchasing"/> + <plnk:partnerLinkType name="BuyerToStoreServiceLT"> + <plnk:role name="StoreInterface" portType="ns1:StoreInterface"/> + </plnk:partnerLinkType> + <plnk:partnerLinkType name="StoreToCreditAgencyLT"> + <plnk:role name="CreditAgencyRequester" portType="ns2:CreditAgencyInterface"/> + </plnk:partnerLinkType> +</wsdl:definitions> Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/ReqRespFaultProcess_BuyerArtifacts.wsdl (from rev 558, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_BuyerArtifacts.wsdl) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/ReqRespFaultProcess_BuyerArtifacts.wsdl (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/ReqRespFaultProcess_BuyerArtifacts.wsdl 2011-01-13 10:19:44 UTC (rev 571) @@ -0,0 +1,8 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://www.pi4soa.org/ReqRespFault/Seller" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" targetNamespace="http://www.pi4soa.org/ReqRespFault/Buyer"> + <wsdl:import location="ReqRespFaultProcess_Buyer.wsdl" namespace="http://www.pi4soa.org/ReqRespFault/Buyer"/> + <wsdl:import location="ReqRespFaultProcess_Seller.wsdl" namespace="http://www.pi4soa.org/ReqRespFault/Seller"/> + <plnk:partnerLinkType name="BuyerToSellerLT"> + <plnk:role name="SellerRequester" portType="ns1:SellerBehavior"/> + </plnk:partnerLinkType> +</wsdl:definitions> Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/ReqRespFaultProcess_Seller.wsdl (from rev 558, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Seller.wsdl) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/ReqRespFaultProcess_Seller.wsdl (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/ReqRespFaultProcess_Seller.wsdl 2011-01-13 10:19:44 UTC (rev 571) @@ -0,0 +1,48 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:byr="http://www.pi4soa.org/ReqRespFault/Buyer" xmlns:slr="http://www.pi4soa.org/ReqRespFault/Seller" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.pi4soa.org/ReqRespFault" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="Seller" targetNamespace="http://www.pi4soa.org/ReqRespFault/Seller"> + <types xmlns="http://schemas.xmlsoap.org/wsdl/"> + <schema xmlns="http://www.w3.org/2001/XMLSchema"/> + </types> + <wsdl:message name="checkCreditRequest"> + <wsdl:part element="CreditCheckRequest" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="checkCreditResponse"> + <wsdl:part element="CreditCheckOk" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="insufficientCreditFault"> + <wsdl:part element="CreditCheckInvalid" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:portType name="SellerBehavior"> + <wsdl:operation name="checkCredit"> + <wsdl:input message="slr:checkCreditRequest"> + </wsdl:input> + <wsdl:output message="slr:checkCreditResponse"> + </wsdl:output> + <wsdl:fault message="slr:insufficientCreditFault" name="insufficientCredit"> + </wsdl:fault> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="SellerBehaviorBinding" type="slr:SellerBehavior"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="checkCredit"> + <soap:operation soapAction="http://www.pi4soa.org/ReqRespFault/Seller/checkCredit"/> + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + </wsdl:output> + <wsdl:fault name="insufficientCredit"> + <soap:fault name="insufficientCredit" use="literal"/> + </wsdl:fault> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="SellerService"> + <wsdl:port binding="slr:SellerBehaviorBinding" name="SellerBehaviorPort"> + <soap:address location="http://localhost:8080/SellerService/SellerBehaviorPort"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/ReqRespFaultProcess_SellerArtifacts.wsdl (from rev 558, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_SellerArtifacts.wsdl) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/ReqRespFaultProcess_SellerArtifacts.wsdl (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/ReqRespFaultProcess_SellerArtifacts.wsdl 2011-01-13 10:19:44 UTC (rev 571) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://www.pi4soa.org/ReqRespFault/Seller" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" targetNamespace="http://www.pi4soa.org/ReqRespFault/Seller"> + <wsdl:import location="ReqRespFaultProcess_Seller.wsdl" namespace="http://www.pi4soa.org/ReqRespFault/Seller"/> + <plnk:partnerLinkType name="BuyerToSellerServiceLT"> + <plnk:role name="SellerBehavior" portType="ns1:SellerBehavior"/> + </plnk:partnerLinkType> +</wsdl:definitions> Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/RequestForQuote_SupplierQuoteEngine.wsdl (from rev 558, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngine.wsdl) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/RequestForQuote_SupplierQuoteEngine.wsdl (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/RequestForQuote_SupplierQuoteEngine.wsdl 2011-01-13 10:19:44 UTC (rev 571) @@ -0,0 +1,62 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="Supplier" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier"> + <types xmlns="http://schemas.xmlsoap.org/wsdl/"> + <schema xmlns="http://www.w3.org/2001/XMLSchema"/> + </types> + <wsdl:message name="confirmRequest"> + <wsdl:part element="orderConfirmed" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="confirmResponse"> + <wsdl:part element="bookingReference" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="getQuoteResponse"> + <wsdl:part element="quote" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:message name="getQuoteRequest"> + <wsdl:part element="requestForQuote" name="content"> + </wsdl:part> + </wsdl:message> + <wsdl:portType name="SupplierBehavior"> + <wsdl:operation name="confirm"> + <wsdl:input message="spr:confirmRequest"> + </wsdl:input> + <wsdl:output message="spr:confirmResponse"> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="getQuote"> + <wsdl:input message="spr:getQuoteRequest"> + </wsdl:input> + <wsdl:output message="spr:getQuoteResponse"> + </wsdl:output> + </wsdl:operation> + </wsdl:portType> + <wsdl:binding name="SupplierBehaviorBinding" type="spr:SupplierBehavior"> + <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> + <wsdl:operation name="confirm"> + <soap:operation soapAction="http://www.pi4soa.org/ESBBroker/Supplier/confirm"/> + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + <wsdl:operation name="getQuote"> + <soap:operation soapAction="http://www.pi4soa.org/ESBBroker/Supplier/getQuote"/> + <wsdl:input> + <soap:body use="literal"/> + </wsdl:input> + <wsdl:output> + <soap:body use="literal"/> + </wsdl:output> + </wsdl:operation> + </wsdl:binding> + <wsdl:service name="SupplierService"> + <wsdl:port binding="spr:SupplierBehaviorBinding" name="SupplierBehaviorPort"> + <soap:address location="http://localhost:8080/SupplierService/SupplierBehaviorPort"/> + </wsdl:port> + </wsdl:service> +</wsdl:definitions> Copied: branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/RequestForQuote_SupplierQuoteEngineArtifacts.wsdl (from rev 558, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngineArtifacts.wsdl) =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/RequestForQuote_SupplierQuoteEngineArtifacts.wsdl (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/testmodels/wsdl/RequestForQuote_SupplierQuoteEngineArtifacts.wsdl 2011-01-13 10:19:44 UTC (rev 571) @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<wsdl:definitions xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:ns1="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:plnk="http://docs.oasis-open.org/wsbpel/2.0/plnktype" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier"> + <wsdl:import location="RequestForQuote_SupplierQuoteEngine.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/> + <plnk:partnerLinkType name="BrokerToSupplierQuoteEngineServiceLT"> + <plnk:role name="SupplierBehavior" portType="ns1:SupplierBehavior"/> + </plnk:partnerLinkType> +</wsdl:definitions> Property changes on: branches/experimental/2.0.x/bundles/org.savara.scenario ___________________________________________________________________ Name: svn:ignore - .classpath .project + .classpath .project target

13 years, 5 months

1
0
0 / 0

savara SVN: r570 - branches/experimental/2.0.x/bundles/org.savara.scenario.

by do-not-reply＠jboss.org

Author: objectiser Date: 2011-01-13 04:50:14 -0500 (Thu, 13 Jan 2011) New Revision: 570 Modified: branches/experimental/2.0.x/bundles/org.savara.scenario/ Log: Property changes on: branches/experimental/2.0.x/bundles/org.savara.scenario ___________________________________________________________________ Name: svn:ignore + .classpath .project

13 years, 5 months

1
0
0 / 0

savara SVN: r569 - in branches/experimental/2.0.x/bundles: org.savara.scenario and 10 other directories.

by do-not-reply＠jboss.org

Author: objectiser Date: 2011-01-13 04:49:29 -0500 (Thu, 13 Jan 2011) New Revision: 569 Added: branches/experimental/2.0.x/bundles/org.savara.scenario/ branches/experimental/2.0.x/bundles/org.savara.scenario/Copyright.txt branches/experimental/2.0.x/bundles/org.savara.scenario/META-INF/ branches/experimental/2.0.x/bundles/org.savara.scenario/META-INF/MANIFEST.MF branches/experimental/2.0.x/bundles/org.savara.scenario/build.properties branches/experimental/2.0.x/bundles/org.savara.scenario/pom.xml branches/experimental/2.0.x/bundles/org.savara.scenario/src/ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Event.java branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Group.java branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Import.java branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Link.java branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/MessageEvent.java branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/ObjectFactory.java branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/ReceiveEvent.java branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Role.java branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Scenario.java branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/SendEvent.java branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/TimeElapsedEvent.java branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/package-info.java branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/util/ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/util/ScenarioModelUtil.java branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/resources/ branches/experimental/2.0.x/bundles/org.savara.scenario/src/test/ branches/experimental/2.0.x/bundles/org.savara.scenario/src/test/java/ Modified: branches/experimental/2.0.x/bundles/pom.xml Log: Added scenario model. Added: branches/experimental/2.0.x/bundles/org.savara.scenario/Copyright.txt =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/Copyright.txt (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/Copyright.txt 2011-01-13 09:49:29 UTC (rev 569) @@ -0,0 +1,17 @@ +/* + * 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. + */ Added: branches/experimental/2.0.x/bundles/org.savara.scenario/META-INF/MANIFEST.MF =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/META-INF/MANIFEST.MF (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/META-INF/MANIFEST.MF 2011-01-13 09:49:29 UTC (rev 569) @@ -0,0 +1,13 @@ +Manifest-Version: 1.0 +Bundle-ManifestVersion: 2 +Bundle-Name: SAVARA Scenario +Bundle-SymbolicName: org.savara.scenario +Bundle-Version: 2.0.0.SNAPSHOT +Bundle-Activator: org.savara.scenario.osgi.Activator +Bundle-Vendor: www.savara.org +Bundle-RequiredExecutionEnvironment: JavaSE-1.6 +Import-Package: org.junit, + org.osgi.framework +Require-Bundle: org.scribble.common, + org.savara.common +Export-Package: org.savara.scenario.model Added: branches/experimental/2.0.x/bundles/org.savara.scenario/build.properties =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/build.properties (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/build.properties 2011-01-13 09:49:29 UTC (rev 569) @@ -0,0 +1,4 @@ +source.. = src/main/java/ +output.. = bin/ +bin.includes = META-INF/,\ + . Added: branches/experimental/2.0.x/bundles/org.savara.scenario/pom.xml =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/pom.xml (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/pom.xml 2011-01-13 09:49:29 UTC (rev 569) @@ -0,0 +1,44 @@ +<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.scenario</artifactId> + <version>2.0.0-SNAPSHOT</version> + <packaging>jar</packaging> + <name>Savara::Bundles::Scenario</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.savara.bundles</groupId> + <artifactId>org.savara.common</artifactId> + <version>${savara.version}</version> + </dependency> + <dependency> + <groupId>org.apache.felix</groupId> + <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> Added: branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Event.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Event.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Event.java 2011-01-13 09:49:29 UTC (rev 569) @@ -0,0 +1,136 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2011.01.12 at 11:30:41 PM GMT +// + + +package org.savara.scenario.model; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlIDREF; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + * Java class for Event complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="Event"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" /> + * <attribute name="role" type="{http://www.w3.org/2001/XMLSchema}IDREF" /> + * <attribute name="errorExpected" type="{http://www.w3.org/2001/XMLSchema}boolean" /> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Event") +@XmlSeeAlso({ + Import.class, + TimeElapsedEvent.class, + MessageEvent.class, + Group.class +}) +public class Event { + + @XmlAttribute(name = "ID") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlID + @XmlSchemaType(name = "ID") + protected String id; + @XmlAttribute(name = "role") + @XmlIDREF + @XmlSchemaType(name = "IDREF") + protected Object role; + @XmlAttribute(name = "errorExpected") + protected Boolean errorExpected; + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getID() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setID(String value) { + this.id = value; + } + + /** + * Gets the value of the role property. + * + * @return + * possible object is + * {@link Object } + * + */ + public Object getRole() { + return role; + } + + /** + * Sets the value of the role property. + * + * @param value + * allowed object is + * {@link Object } + * + */ + public void setRole(Object value) { + this.role = value; + } + + /** + * Gets the value of the errorExpected property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public Boolean isErrorExpected() { + return errorExpected; + } + + /** + * Sets the value of the errorExpected property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setErrorExpected(Boolean value) { + this.errorExpected = value; + } + +} Added: branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Group.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Group.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Group.java 2011-01-13 09:49:29 UTC (rev 569) @@ -0,0 +1,104 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2011.01.12 at 11:30:41 PM GMT +// + + +package org.savara.scenario.model; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlType; + + +/** + * Java class for Group complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="Group"> + * <complexContent> + * <extension base="{http://www.savara.org/scenario}Event"> + * <sequence> + * <element name="events" type="{http://www.savara.org/scenario}Event" maxOccurs="unbounded" minOccurs="0"/> + * </sequence> + * <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" /> + * </extension> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Group", propOrder = { + "events" +}) +public class Group + extends Event +{ + + protected List<Event> events; + @XmlAttribute(name = "name") + protected String name; + + /** + * Gets the value of the events property. + * + * + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the events property. + * + * + * For example, to add a new item, do as follows: + * <pre> + * getEvents().add(newItem); + * </pre> + * + * + * + * Objects of the following type(s) are allowed in the list + * {@link Event } + * + * + */ + public List<Event> getEvents() { + if (events == null) { + events = new ArrayList<Event>(); + } + return this.events; + } + + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + +} Added: branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Import.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Import.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Import.java 2011-01-13 09:49:29 UTC (rev 569) @@ -0,0 +1,96 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2011.01.12 at 11:30:41 PM GMT +// + + +package org.savara.scenario.model; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + * Java class for Import complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="Import"> + * <complexContent> + * <extension base="{http://www.savara.org/scenario}Event"> + * <attribute name="url" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * <attribute name="group" type="{http://www.w3.org/2001/XMLSchema}string" /> + * </extension> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Import") +public class Import + extends Event +{ + + @XmlAttribute(name = "url") + @XmlSchemaType(name = "anyURI") + protected String url; + @XmlAttribute(name = "group") + protected String group; + + /** + * Gets the value of the url property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getUrl() { + return url; + } + + /** + * Sets the value of the url property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setUrl(String value) { + this.url = value; + } + + /** + * Gets the value of the group property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getGroup() { + return group; + } + + /** + * Sets the value of the group property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setGroup(String value) { + this.group = value; + } + +} Added: branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Link.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Link.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Link.java 2011-01-13 09:49:29 UTC (rev 569) @@ -0,0 +1,98 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2011.01.12 at 11:30:41 PM GMT +// + + +package org.savara.scenario.model; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlIDREF; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; + + +/** + * Java class for Link complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="Link"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <attribute name="source" type="{http://www.w3.org/2001/XMLSchema}IDREF" /> + * <attribute name="target" type="{http://www.w3.org/2001/XMLSchema}IDREF" /> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Link") +public class Link { + + @XmlAttribute(name = "source") + @XmlIDREF + @XmlSchemaType(name = "IDREF") + protected Object source; + @XmlAttribute(name = "target") + @XmlIDREF + @XmlSchemaType(name = "IDREF") + protected Object target; + + /** + * Gets the value of the source property. + * + * @return + * possible object is + * {@link Object } + * + */ + public Object getSource() { + return source; + } + + /** + * Sets the value of the source property. + * + * @param value + * allowed object is + * {@link Object } + * + */ + public void setSource(Object value) { + this.source = value; + } + + /** + * Gets the value of the target property. + * + * @return + * possible object is + * {@link Object } + * + */ + public Object getTarget() { + return target; + } + + /** + * Sets the value of the target property. + * + * @param value + * allowed object is + * {@link Object } + * + */ + public void setTarget(Object value) { + this.target = value; + } + +} Added: branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/MessageEvent.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/MessageEvent.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/MessageEvent.java 2011-01-13 09:49:29 UTC (rev 569) @@ -0,0 +1,155 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2011.01.12 at 11:30:41 PM GMT +// + + +package org.savara.scenario.model; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlSeeAlso; +import javax.xml.bind.annotation.XmlType; + + +/** + * Java class for MessageEvent complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="MessageEvent"> + * <complexContent> + * <extension base="{http://www.savara.org/scenario}Event"> + * <attribute name="operationName" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="faultName" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="type" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="value" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * </extension> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "MessageEvent") +@XmlSeeAlso({ + ReceiveEvent.class, + SendEvent.class +}) +public class MessageEvent + extends Event +{ + + @XmlAttribute(name = "operationName") + protected String operationName; + @XmlAttribute(name = "faultName") + protected String faultName; + @XmlAttribute(name = "type") + protected String type; + @XmlAttribute(name = "value") + @XmlSchemaType(name = "anyURI") + protected String value; + + /** + * Gets the value of the operationName property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getOperationName() { + return operationName; + } + + /** + * Sets the value of the operationName property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setOperationName(String value) { + this.operationName = value; + } + + /** + * Gets the value of the faultName property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getFaultName() { + return faultName; + } + + /** + * Sets the value of the faultName property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setFaultName(String value) { + this.faultName = value; + } + + /** + * Gets the value of the type property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getType() { + return type; + } + + /** + * Sets the value of the type property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setType(String value) { + this.type = value; + } + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + +} Added: branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/ObjectFactory.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/ObjectFactory.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/ObjectFactory.java 2011-01-13 09:49:29 UTC (rev 569) @@ -0,0 +1,132 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2011.01.12 at 11:30:41 PM GMT +// + + +package org.savara.scenario.model; + +import javax.xml.bind.JAXBElement; +import javax.xml.bind.annotation.XmlElementDecl; +import javax.xml.bind.annotation.XmlRegistry; +import javax.xml.namespace.QName; + + +/** + * This object contains factory methods for each + * Java content interface and Java element interface + * generated in the org.savara.scenario.model package. + * An ObjectFactory allows you to programatically + * construct new instances of the Java representation + * for XML content. The Java representation of XML + * content can consist of schema derived interfaces + * and classes representing the binding of schema + * type definitions, element declarations and model + * groups. Factory methods for each of these are + * provided in this class. + * + */ +@XmlRegistry +public class ObjectFactory { + + private final static QName _Scenario_QNAME = new QName("http://www.savara.org/scenario", "scenario"); + + /** + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.savara.scenario.model + * + */ + public ObjectFactory() { + } + + /** + * Create an instance of {@link Scenario } + * + */ + public Scenario createScenario() { + return new Scenario(); + } + + /** + * Create an instance of {@link Link } + * + */ + public Link createLink() { + return new Link(); + } + + /** + * Create an instance of {@link TimeElapsedEvent } + * + */ + public TimeElapsedEvent createTimeElapsedEvent() { + return new TimeElapsedEvent(); + } + + /** + * Create an instance of {@link Role } + * + */ + public Role createRole() { + return new Role(); + } + + /** + * Create an instance of {@link Event } + * + */ + public Event createEvent() { + return new Event(); + } + + /** + * Create an instance of {@link Group } + * + */ + public Group createGroup() { + return new Group(); + } + + /** + * Create an instance of {@link SendEvent } + * + */ + public SendEvent createSendEvent() { + return new SendEvent(); + } + + /** + * Create an instance of {@link ReceiveEvent } + * + */ + public ReceiveEvent createReceiveEvent() { + return new ReceiveEvent(); + } + + /** + * Create an instance of {@link MessageEvent } + * + */ + public MessageEvent createMessageEvent() { + return new MessageEvent(); + } + + /** + * Create an instance of {@link Import } + * + */ + public Import createImport() { + return new Import(); + } + + /** + * Create an instance of {@link JAXBElement }{@code <}{@link Scenario }{@code >}} + * + */ + @XmlElementDecl(namespace = "http://www.savara.org/scenario", name = "scenario") + public JAXBElement<Scenario> createScenario(Scenario value) { + return new JAXBElement<Scenario>(_Scenario_QNAME, Scenario.class, null, value); + } + +} Added: branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/ReceiveEvent.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/ReceiveEvent.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/ReceiveEvent.java 2011-01-13 09:49:29 UTC (rev 569) @@ -0,0 +1,39 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2011.01.12 at 11:30:41 PM GMT +// + + +package org.savara.scenario.model; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * Java class for ReceiveEvent complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="ReceiveEvent"> + * <complexContent> + * <extension base="{http://www.savara.org/scenario}MessageEvent"> + * </extension> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "ReceiveEvent") +public class ReceiveEvent + extends MessageEvent +{ + + +} Added: branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Role.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Role.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Role.java 2011-01-13 09:49:29 UTC (rev 569) @@ -0,0 +1,99 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2011.01.12 at 11:30:41 PM GMT +// + + +package org.savara.scenario.model; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlID; +import javax.xml.bind.annotation.XmlSchemaType; +import javax.xml.bind.annotation.XmlType; +import javax.xml.bind.annotation.adapters.CollapsedStringAdapter; +import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; + + +/** + * Java class for Role complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="Role"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" /> + * <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" /> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Role") +public class Role { + + @XmlAttribute(name = "ID") + @XmlJavaTypeAdapter(CollapsedStringAdapter.class) + @XmlID + @XmlSchemaType(name = "ID") + protected String id; + @XmlAttribute(name = "name") + protected String name; + + /** + * Gets the value of the id property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getID() { + return id; + } + + /** + * Sets the value of the id property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setID(String value) { + this.id = value; + } + + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + +} Added: branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Scenario.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Scenario.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/Scenario.java 2011-01-13 09:49:29 UTC (rev 569) @@ -0,0 +1,224 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2011.01.12 at 11:30:41 PM GMT +// + + +package org.savara.scenario.model; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * Java class for Scenario complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="Scenario"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="roles" type="{http://www.savara.org/scenario}Role" maxOccurs="unbounded"/> + * <element name="events" type="{http://www.savara.org/scenario}Event" maxOccurs="unbounded"/> + * <element name="links" type="{http://www.savara.org/scenario}Link" maxOccurs="unbounded"/> + * </sequence> + * <attribute name="name" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="description" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="author" type="{http://www.w3.org/2001/XMLSchema}string" /> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "Scenario", propOrder = { + "roles", + "events", + "links" +}) +public class Scenario { + + @XmlElement(required = true) + protected List<Role> roles; + @XmlElement(required = true) + protected List<Event> events; + @XmlElement(required = true) + protected List<Link> links; + @XmlAttribute(name = "name") + protected String name; + @XmlAttribute(name = "description") + protected String description; + @XmlAttribute(name = "author") + protected String author; + + /** + * Gets the value of the roles property. + * + * + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the roles property. + * + * + * For example, to add a new item, do as follows: + * <pre> + * getRoles().add(newItem); + * </pre> + * + * + * + * Objects of the following type(s) are allowed in the list + * {@link Role } + * + * + */ + public List<Role> getRoles() { + if (roles == null) { + roles = new ArrayList<Role>(); + } + return this.roles; + } + + /** + * Gets the value of the events property. + * + * + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the events property. + * + * + * For example, to add a new item, do as follows: + * <pre> + * getEvents().add(newItem); + * </pre> + * + * + * + * Objects of the following type(s) are allowed in the list + * {@link Event } + * + * + */ + public List<Event> getEvents() { + if (events == null) { + events = new ArrayList<Event>(); + } + return this.events; + } + + /** + * Gets the value of the links property. + * + * + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the links property. + * + * + * For example, to add a new item, do as follows: + * <pre> + * getLinks().add(newItem); + * </pre> + * + * + * + * Objects of the following type(s) are allowed in the list + * {@link Link } + * + * + */ + public List<Link> getLinks() { + if (links == null) { + links = new ArrayList<Link>(); + } + return this.links; + } + + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + + /** + * Gets the value of the description property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDescription() { + return description; + } + + /** + * Sets the value of the description property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDescription(String value) { + this.description = value; + } + + /** + * Gets the value of the author property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getAuthor() { + return author; + } + + /** + * Sets the value of the author property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setAuthor(String value) { + this.author = value; + } + +} Added: branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/SendEvent.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/SendEvent.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/SendEvent.java 2011-01-13 09:49:29 UTC (rev 569) @@ -0,0 +1,39 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2011.01.12 at 11:30:41 PM GMT +// + + +package org.savara.scenario.model; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlType; + + +/** + * Java class for SendEvent complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="SendEvent"> + * <complexContent> + * <extension base="{http://www.savara.org/scenario}MessageEvent"> + * </extension> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "SendEvent") +public class SendEvent + extends MessageEvent +{ + + +} Added: branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/TimeElapsedEvent.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/TimeElapsedEvent.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/TimeElapsedEvent.java 2011-01-13 09:49:29 UTC (rev 569) @@ -0,0 +1,67 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2011.01.12 at 11:30:41 PM GMT +// + + +package org.savara.scenario.model; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlType; + + +/** + * Java class for TimeElapsedEvent complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="TimeElapsedEvent"> + * <complexContent> + * <extension base="{http://www.savara.org/scenario}Event"> + * <attribute name="duration" type="{http://www.w3.org/2001/XMLSchema}string" /> + * </extension> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "TimeElapsedEvent") +public class TimeElapsedEvent + extends Event +{ + + @XmlAttribute(name = "duration") + protected String duration; + + /** + * Gets the value of the duration property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDuration() { + return duration; + } + + /** + * Sets the value of the duration property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDuration(String value) { + this.duration = value; + } + +} Added: branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/package-info.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/package-info.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/model/package-info.java 2011-01-13 09:49:29 UTC (rev 569) @@ -0,0 +1,9 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.2-146 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2011.01.12 at 11:30:41 PM GMT +// + +(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://www.savara.org/scenario", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +package org.savara.scenario.model; Added: branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/util/ScenarioModelUtil.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/util/ScenarioModelUtil.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.scenario/src/main/java/org/savara/scenario/util/ScenarioModelUtil.java 2011-01-13 09:49:29 UTC (rev 569) @@ -0,0 +1,68 @@ +/* + * Copyright 2009-10 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.scenario.util; + +import java.io.IOException; + +import javax.xml.bind.JAXBContext; +import javax.xml.bind.JAXBElement; +import javax.xml.bind.Marshaller; +import javax.xml.bind.Unmarshaller; + +import org.savara.scenario.model.Scenario; + +public class ScenarioModelUtil { + + public static Scenario deserialize(java.io.InputStream is) throws IOException { + Scenario ret=null; + + try { + JAXBContext context = JAXBContext.newInstance("org.savara.scenario.model", + ScenarioModelUtil.class.getClassLoader()); + Unmarshaller unmarshaller = context.createUnmarshaller(); + + //note: setting schema to null will turn validator off + //unmarshaller.setSchema(null); + Object xmlObject = unmarshaller.unmarshal(is); + + if (xmlObject instanceof JAXBElement) { + ret = (Scenario)((JAXBElement<?>)xmlObject).getValue(); + } + + } catch(Exception e) { + throw new IOException("Failed to deserialize scenario", e); + } + + return(ret); + } + + public static void serialize(Scenario scenario, java.io.OutputStream os) throws IOException { + + try { + org.savara.scenario.model.ObjectFactory factory= + new org.savara.scenario.model.ObjectFactory(); + + JAXBContext context = JAXBContext.newInstance(Scenario.class); + Marshaller marshaller = context.createMarshaller(); + marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE); + + marshaller.marshal(factory.createScenario(scenario), os); + } catch(Exception e) { + throw new IOException("Failed to serialize scenario", e); + } + } +} Modified: branches/experimental/2.0.x/bundles/pom.xml =================================================================== --- branches/experimental/2.0.x/bundles/pom.xml 2011-01-12 17:15:21 UTC (rev 568) +++ branches/experimental/2.0.x/bundles/pom.xml 2011-01-13 09:49:29 UTC (rev 569) @@ -23,6 +23,7 @@ <module>org.savara.bpel</module> <module>org.savara.bpel.tests</module> <module>org.savara.contract</module> + <module>org.savara.scenario</module> <module>org.savara.common</module> <module>org.savara.pi4soa.cdm</module> <module>org.savara.wsdl</module>

13 years, 5 months

1
0
0 / 0

Build failed in Hudson: jbosstools-savara-1.2_trunk #226

by jboss-qa-internal＠redhat.com

See <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.2_trunk/226/cha...> Changes: [nickboldt] update readme for usage and results [nickboldt] increase timeout for p2 director operation [nickboldt] add help target instead of comments in ant script; add JBT target platform URL in otherRepos examples ------------------------------------------ [...truncated 17912 lines...] [INFO] Fetching org.eclipse.sdk_3.6.2.r362_v20100929-7Q7m7ADDaKh5py5C9f1kQXv_p6z-50gz09paZXCU1CV7x.jar (2.4kB of 29.85kB at 0B/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/featu... [INFO] Downloading org.eclipse.ui.carbon [INFO] Fetching org.eclipse.ui.carbon_4.0.100.M20100825-0800.jar.pack.gz (0B of 9.62kB at 0B/s) from http://mirror.cc.vt.edu/pub/eclipse/eclipse/updates/3.6/R-3.6.1-201009090... [INFO] 1 operation remaining. [INFO] Fetching org.eclipse.ui.carbon_4.0.100.M20100825-0800.jar.pack.gz (3.71kB of 9.62kB at 0B/s) from http://mirror.cc.vt.edu/pub/eclipse/eclipse/updates/3.6/R-3.6.1-201009090... [INFO] Downloading org.eclipse.ui.carbon.source [INFO] Fetching org.eclipse.ui.carbon.source_4.0.100.M20100825-0800.jar.pack.gz (0B of 9.39kB at 0B/s) from http://eclipse.mirrors.tds.net/updates/3.6/R-3.6.1-201009090800/plugins/o... [INFO] 1 operation remaining. [INFO] Fetching org.eclipse.ui.carbon.source_4.0.100.M20100825-0800.jar.pack.gz (1.32kB of 9.39kB at 0B/s) from http://eclipse.mirrors.tds.net/updates/3.6/R-3.6.1-201009090800/plugins/o... [INFO] Downloading org.eclipse.equinox.launcher.carbon.macosx [INFO] Downloading org.eclipse.rcp.configuration_root.carbon.macosx.x86 [INFO] Downloading org.eclipse.swt.carbon.macosx.source [INFO] Downloading org.eclipse.equinox.launcher.carbon.macosx [INFO] Fetching org.eclipse.equinox.launcher.carbon.macosx_1.1.2.R36x_v20101019_1345.jar (0B of 53.56kB at 0B/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/plugi... [INFO] 1 operation remaining. [INFO] Fetching org.eclipse.equinox.launcher.carbon.macosx_1.1.2.R36x_v20101019_1345.jar (2.4kB of 53.56kB at 0B/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/plugi... [INFO] Downloading org.eclipse.rcp.configuration_root.carbon.macosx.x86 [INFO] Fetching org.eclipse.rcp.configuration_root.carbon.macosx.x86_1.0.0.M20101020-0925 (0B of 45.93kB at 0B/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/binar... [INFO] 1 operation remaining. [INFO] Fetching org.eclipse.rcp.configuration_root.carbon.macosx.x86_1.0.0.M20101020-0925 (2.4kB of 45.93kB at 0B/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/binar... [INFO] Downloading org.eclipse.swt.carbon.macosx.source [INFO] Fetching org.eclipse.swt.carbon.macosx.source_3.6.1.v3656a.jar (0B of 1.71MB at 0B/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/plugi... [INFO] 1 operation remaining. [INFO] Fetching org.eclipse.swt.carbon.macosx.source_3.6.1.v3656a.jar (2.4kB of 1.71MB at 0B/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/plugi... [INFO] Fetching org.eclipse.swt.carbon.macosx.source_3.6.1.v3656a.jar (267.19kB of 1.71MB at 264.54kB/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/plugi... [INFO] Fetching org.eclipse.swt.carbon.macosx.source_3.6.1.v3656a.jar (838.79kB of 1.71MB at 415.39kB/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/plugi... [INFO] Fetching org.eclipse.swt.carbon.macosx.source_3.6.1.v3656a.jar (1.36MB of 1.71MB at 449.07kB/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/plugi... [INFO] Downloading org.eclipse.compare.win32 [INFO] Fetching org.eclipse.compare.win32_1.0.100.I20100505-1245.jar.pack.gz (0B of 18.27kB at 0B/s) from http://www.gtlib.gatech.edu/pub/eclipse/eclipse/updates/3.6/R-3.6-2010060... [INFO] 1 operation remaining. [INFO] Fetching org.eclipse.compare.win32_1.0.100.I20100505-1245.jar.pack.gz (1.32kB of 18.27kB at 0B/s) from http://www.gtlib.gatech.edu/pub/eclipse/eclipse/updates/3.6/R-3.6-2010060... [INFO] Downloading org.eclipse.core.net.win32.x86 [INFO] Fetching org.eclipse.core.net.win32.x86_1.0.100.I20100511-0800.jar.pack.gz (0B of 27.44kB at 0B/s) from http://www.gtlib.gatech.edu/pub/eclipse/eclipse/updates/3.6/R-3.6-2010060... [INFO] 1 operation remaining. [INFO] Fetching org.eclipse.core.net.win32.x86_1.0.100.I20100511-0800.jar.pack.gz (1.32kB of 27.44kB at 0B/s) from http://www.gtlib.gatech.edu/pub/eclipse/eclipse/updates/3.6/R-3.6-2010060... [INFO] Downloading org.eclipse.core.resources.win32.x86 [INFO] Fetching org.eclipse.core.resources.win32.x86_3.5.100.v20100505-1345.jar.pack.gz (0B of 15.34kB at 0B/s) from http://www.gtlib.gatech.edu/pub/eclipse/eclipse/updates/3.6/R-3.6-2010060... [INFO] 1 operation remaining. [INFO] Fetching org.eclipse.core.resources.win32.x86_3.5.100.v20100505-1345.jar.pack.gz (1.32kB of 15.34kB at 0B/s) from http://www.gtlib.gatech.edu/pub/eclipse/eclipse/updates/3.6/R-3.6-2010060... [INFO] Downloading org.eclipse.equinox.security.win32.x86 [INFO] Fetching org.eclipse.equinox.security.win32.x86_1.0.200.v20100503.jar.pack.gz (0B of 17.25kB at 0B/s) from http://mirror.cs.rit.edu/mirrors/eclipse/eclipse/updates/3.6/R-3.6-201006... [INFO] 1 operation remaining. [INFO] Fetching org.eclipse.equinox.security.win32.x86_1.0.200.v20100503.jar.pack.gz (1.32kB of 17.25kB at 0B/s) from http://mirror.cs.rit.edu/mirrors/eclipse/eclipse/updates/3.6/R-3.6-201006... [INFO] Downloading org.eclipse.ui.win32 [INFO] Fetching org.eclipse.ui.win32_3.2.200.I20100509-0800.jar.pack.gz (0B of 12.18kB at 0B/s) from http://www.gtlib.gatech.edu/pub/eclipse/eclipse/updates/3.6/R-3.6-2010060... [INFO] 1 operation remaining. [INFO] Fetching org.eclipse.ui.win32_3.2.200.I20100509-0800.jar.pack.gz (1.32kB of 12.18kB at 0B/s) from http://www.gtlib.gatech.edu/pub/eclipse/eclipse/updates/3.6/R-3.6-2010060... [INFO] Downloading org.eclipse.update.core.win32 [INFO] Fetching org.eclipse.update.core.win32_3.2.200.v20100512.jar.pack.gz (0B of 83.29kB at 0B/s) from http://ftp.ussg.iu.edu/eclipse/eclipse/updates/3.6/R-3.6-201006080911/plu... [INFO] 1 operation remaining. [INFO] Fetching org.eclipse.update.core.win32_3.2.200.v20100512.jar.pack.gz (2.4kB of 83.29kB at 0B/s) from http://ftp.ussg.iu.edu/eclipse/eclipse/updates/3.6/R-3.6-201006080911/plu... [INFO] Downloading org.eclipse.compare.win32.source [INFO] Fetching org.eclipse.compare.win32.source_1.0.100.I20100505-1245.jar.pack.gz (0B of 14.16kB at 0B/s) from http://ftp.ussg.iu.edu/eclipse/eclipse/updates/3.6/R-3.6-201006080911/plu... [INFO] 1 operation remaining. [INFO] Fetching org.eclipse.compare.win32.source_1.0.100.I20100505-1245.jar.pack.gz (2.4kB of 14.16kB at 0B/s) from http://ftp.ussg.iu.edu/eclipse/eclipse/updates/3.6/R-3.6-201006080911/plu... [INFO] Downloading org.eclipse.ui.win32.source [INFO] Fetching org.eclipse.ui.win32.source_3.2.200.I20100509-0800.jar.pack.gz (0B of 11.65kB at 0B/s) from http://mirror.cc.vt.edu/pub/eclipse/eclipse/updates/3.6/R-3.6-20100608091... [INFO] 1 operation remaining. [INFO] Fetching org.eclipse.ui.win32.source_3.2.200.I20100509-0800.jar.pack.gz (3.71kB of 11.65kB at 0B/s) from http://mirror.cc.vt.edu/pub/eclipse/eclipse/updates/3.6/R-3.6-20100608091... [INFO] Downloading org.eclipse.update.core.win32.source [INFO] Fetching org.eclipse.update.core.win32.source_3.2.200.v20100512.jar.pack.gz (0B of 9.69kB at 0B/s) from http://carroll.aset.psu.edu/pub/eclipse/eclipse/updates/3.6/R-3.6-2010060... [INFO] 1 operation remaining. [INFO] Fetching org.eclipse.update.core.win32.source_3.2.200.v20100512.jar.pack.gz (3.71kB of 9.69kB at 0B/s) from http://carroll.aset.psu.edu/pub/eclipse/eclipse/updates/3.6/R-3.6-2010060... [INFO] Downloading org.eclipse.equinox.security.win32.x86.source [INFO] Fetching org.eclipse.equinox.security.win32.x86.source_1.0.200.v20100503.jar.pack.gz (0B of 9.62kB at 0B/s) from http://carroll.aset.psu.edu/pub/eclipse/eclipse/updates/3.6/R-3.6-2010060... [INFO] 1 operation remaining. [INFO] Fetching org.eclipse.equinox.security.win32.x86.source_1.0.200.v20100503.jar.pack.gz (3.71kB of 9.62kB at 0B/s) from http://carroll.aset.psu.edu/pub/eclipse/eclipse/updates/3.6/R-3.6-2010060... [INFO] Downloading org.eclipse.core.filesystem.win32.x86 [INFO] Fetching org.eclipse.core.filesystem.win32.x86_1.1.201.R36x_v20100727-0745.jar.pack.gz (0B of 28.23kB at 0B/s) from http://www.gtlib.gatech.edu/pub/eclipse/eclipse/updates/3.6/R-3.6.1-20100... [INFO] 1 operation remaining. [INFO] Fetching org.eclipse.core.filesystem.win32.x86_1.1.201.R36x_v20100727-0745.jar.pack.gz (1.32kB of 28.23kB at 0B/s) from http://www.gtlib.gatech.edu/pub/eclipse/eclipse/updates/3.6/R-3.6.1-20100... [INFO] Downloading org.eclipse.equinox.launcher.win32.win32.x86 [INFO] Downloading org.eclipse.rcp.configuration_root.win32.win32.x86 [INFO] Downloading org.eclipse.swt.win32.win32.x86.source [INFO] Downloading org.eclipse.equinox.launcher.win32.win32.x86 [INFO] Fetching org.eclipse.equinox.launcher.win32.win32.x86_1.1.2.R36x_v20101019_1345.jar (0B of 25kB at 0B/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/plugi... [INFO] 1 operation remaining. [INFO] Fetching org.eclipse.equinox.launcher.win32.win32.x86_1.1.2.R36x_v20101019_1345.jar (2.4kB of 25kB at 0B/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/plugi... [INFO] Downloading org.eclipse.rcp.configuration_root.win32.win32.x86 [INFO] Fetching org.eclipse.rcp.configuration_root.win32.win32.x86_1.0.0.M20101020-0925 (0B of 22.64kB at 0B/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/binar... [INFO] 1 operation remaining. [INFO] Fetching org.eclipse.rcp.configuration_root.win32.win32.x86_1.0.0.M20101020-0925 (2.4kB of 22.64kB at 0B/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/binar... [INFO] Downloading org.eclipse.swt.win32.win32.x86.source [INFO] Fetching org.eclipse.swt.win32.win32.x86.source_3.6.1.v3656a.jar (0B of 2.17MB at 0B/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/plugi... [INFO] 1 operation remaining. [INFO] Fetching org.eclipse.swt.win32.win32.x86.source_3.6.1.v3656a.jar (2.4kB of 2.17MB at 0B/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/plugi... [INFO] Fetching org.eclipse.swt.win32.win32.x86.source_3.6.1.v3656a.jar (269.85kB of 2.17MB at 268.52kB/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/plugi... [INFO] Fetching org.eclipse.swt.win32.win32.x86.source_3.6.1.v3656a.jar (843.6kB of 2.17MB at 421.14kB/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/plugi... [INFO] Fetching org.eclipse.swt.win32.win32.x86.source_3.6.1.v3656a.jar (1.32MB of 2.17MB at 435.99kB/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/plugi... [INFO] Fetching org.eclipse.swt.win32.win32.x86.source_3.6.1.v3656a.jar (1.82MB of 2.17MB at 449.57kB/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/plugi... [INFO] Downloading org.eclipse.core.filesystem.linux.x86 [INFO] Fetching org.eclipse.core.filesystem.linux.x86_1.4.0.v20100505-1235.jar.pack.gz (0B of 7.67kB at 0B/s) from http://mirror.cs.rit.edu/mirrors/eclipse/eclipse/updates/3.6/R-3.6-201006... [INFO] 1 operation remaining. [INFO] Fetching org.eclipse.core.filesystem.linux.x86_1.4.0.v20100505-1235.jar.pack.gz (1.32kB of 7.67kB at 0B/s) from http://mirror.cs.rit.edu/mirrors/eclipse/eclipse/updates/3.6/R-3.6-201006... [INFO] Downloading org.eclipse.update.core.linux [INFO] Fetching org.eclipse.update.core.linux_3.2.200.v20100512.jar.pack.gz (0B of 6.97kB at 0B/s) from http://mirror.cc.vt.edu/pub/eclipse/eclipse/updates/3.6/R-3.6-20100608091... [INFO] 1 operation remaining. [INFO] Fetching org.eclipse.update.core.linux_3.2.200.v20100512.jar.pack.gz (3.71kB of 6.97kB at 0B/s) from http://mirror.cc.vt.edu/pub/eclipse/eclipse/updates/3.6/R-3.6-20100608091... [INFO] Downloading org.eclipse.update.core.linux.source [INFO] Fetching org.eclipse.update.core.linux.source_3.2.200.v20100512.jar.pack.gz (0B of 7.3kB at 0B/s) from http://mirror.cs.rit.edu/mirrors/eclipse/eclipse/updates/3.6/R-3.6-201006... [INFO] 1 operation remaining. [INFO] Fetching org.eclipse.update.core.linux.source_3.2.200.v20100512.jar.pack.gz (1.32kB of 7.3kB at 0B/s) from http://mirror.cs.rit.edu/mirrors/eclipse/eclipse/updates/3.6/R-3.6-201006... [INFO] Downloading org.eclipse.core.net.linux.x86 [INFO] Fetching org.eclipse.core.net.linux.x86_1.1.100.R36x_v20100825-0800.jar.pack.gz (0B of 34.09kB at 0B/s) from http://mirror.cc.columbia.edu/pub/software/eclipse/eclipse/updates/3.6/R-... [INFO] 1 operation remaining. [INFO] Fetching org.eclipse.core.net.linux.x86_1.1.100.R36x_v20100825-0800.jar.pack.gz (2.39kB of 34.09kB at 0B/s) from http://mirror.cc.columbia.edu/pub/software/eclipse/eclipse/updates/3.6/R-... [INFO] Downloading org.eclipse.equinox.launcher.gtk.linux.x86 [INFO] Downloading org.eclipse.rcp.configuration_root.gtk.linux.x86 [INFO] Downloading org.eclipse.swt.gtk.linux.x86.source [INFO] Downloading org.eclipse.equinox.launcher.gtk.linux.x86 [INFO] Fetching org.eclipse.equinox.launcher.gtk.linux.x86_1.1.2.R36x_v20101019_1345.jar (0B of 71.55kB at 0B/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/plugi... [INFO] 1 operation remaining. [INFO] Fetching org.eclipse.equinox.launcher.gtk.linux.x86_1.1.2.R36x_v20101019_1345.jar (2.4kB of 71.55kB at 0B/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/plugi... [INFO] Downloading org.eclipse.rcp.configuration_root.gtk.linux.x86 [INFO] Fetching org.eclipse.rcp.configuration_root.gtk.linux.x86_1.0.0.M20101020-0925 (0B of 183.22kB at 0B/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/binar... [INFO] 1 operation remaining. [INFO] Fetching org.eclipse.rcp.configuration_root.gtk.linux.x86_1.0.0.M20101020-0925 (2.4kB of 183.22kB at 0B/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/binar... [INFO] Fetching org.eclipse.rcp.configuration_root.gtk.linux.x86_1.0.0.M20101020-0925 (88.73kB of 183.22kB at 87.4kB/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/binar... [INFO] Downloading org.eclipse.swt.gtk.linux.x86.source [INFO] Fetching org.eclipse.swt.gtk.linux.x86.source_3.6.1.v3656a.jar (0B of 1.86MB at 0B/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/plugi... [INFO] 1 operation remaining. [INFO] Fetching org.eclipse.swt.gtk.linux.x86.source_3.6.1.v3656a.jar (2.4kB of 1.86MB at 0B/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/plugi... [INFO] Fetching org.eclipse.swt.gtk.linux.x86.source_3.6.1.v3656a.jar (111.31kB of 1.86MB at 109.98kB/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/plugi... [INFO] Fetching org.eclipse.swt.gtk.linux.x86.source_3.6.1.v3656a.jar (465.92kB of 1.86MB at 232.29kB/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/plugi... [INFO] Fetching org.eclipse.swt.gtk.linux.x86.source_3.6.1.v3656a.jar (898.3kB of 1.86MB at 277.66kB/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/plugi... [INFO] Fetching org.eclipse.swt.gtk.linux.x86.source_3.6.1.v3656a.jar (1.36MB of 1.86MB at 327.77kB/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/plugi... [INFO] Fetching org.eclipse.swt.gtk.linux.x86.source_3.6.1.v3656a.jar (1.81MB of 1.86MB at 357.84kB/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/plugi... [INFO] Downloading org.eclipse.core.filesystem.linux.x86_64 [INFO] Fetching org.eclipse.core.filesystem.linux.x86_64_1.2.0.v20100505-1235.jar.pack.gz (0B of 7.94kB at 0B/s) from http://www.gtlib.gatech.edu/pub/eclipse/eclipse/updates/3.6/R-3.6-2010060... [INFO] 1 operation remaining. [INFO] Fetching org.eclipse.core.filesystem.linux.x86_64_1.2.0.v20100505-1235.jar.pack.gz (1.32kB of 7.94kB at 0B/s) from http://www.gtlib.gatech.edu/pub/eclipse/eclipse/updates/3.6/R-3.6-2010060... [INFO] Downloading org.eclipse.core.net.linux.x86_64 [INFO] Fetching org.eclipse.core.net.linux.x86_64_1.1.0.I20100505-1245.jar.pack.gz (0B of 34.97kB at 0B/s) from http://mirror.cc.vt.edu/pub/eclipse/eclipse/updates/3.6/R-3.6-20100608091... [INFO] 1 operation remaining. [INFO] Fetching org.eclipse.core.net.linux.x86_64_1.1.0.I20100505-1245.jar.pack.gz (3.71kB of 34.97kB at 0B/s) from http://mirror.cc.vt.edu/pub/eclipse/eclipse/updates/3.6/R-3.6-20100608091... [INFO] Downloading org.eclipse.equinox.launcher.gtk.linux.x86_64 [INFO] Downloading org.eclipse.rcp.configuration_root.gtk.linux.x86_64 [INFO] Downloading org.eclipse.swt.gtk.linux.x86_64.source [INFO] Downloading org.eclipse.equinox.launcher.gtk.linux.x86_64 [INFO] Fetching org.eclipse.equinox.launcher.gtk.linux.x86_64_1.1.2.R36x_v20101019_1345.jar (0B of 75.79kB at 0B/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/plugi... [INFO] 1 operation remaining. [INFO] Fetching org.eclipse.equinox.launcher.gtk.linux.x86_64_1.1.2.R36x_v20101019_1345.jar (2.4kB of 75.79kB at 0B/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/plugi... [INFO] Downloading org.eclipse.rcp.configuration_root.gtk.linux.x86_64 [INFO] Fetching org.eclipse.rcp.configuration_root.gtk.linux.x86_64_1.0.0.M20101020-0925 (0B of 201.11kB at 0B/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/binar... [INFO] 1 operation remaining. [INFO] Fetching org.eclipse.rcp.configuration_root.gtk.linux.x86_64_1.0.0.M20101020-0925 (2.4kB of 201.11kB at 0B/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/binar... [INFO] Fetching org.eclipse.rcp.configuration_root.gtk.linux.x86_64_1.0.0.M20101020-0925 (88.73kB of 201.11kB at 87.4kB/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/binar... [INFO] Downloading org.eclipse.swt.gtk.linux.x86_64.source [INFO] Fetching org.eclipse.swt.gtk.linux.x86_64.source_3.6.1.v3656a.jar (0B of 1.86MB at 0B/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/plugi... [INFO] 1 operation remaining. [INFO] Fetching org.eclipse.swt.gtk.linux.x86_64.source_3.6.1.v3656a.jar (2.4kB of 1.86MB at 0B/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/plugi... [INFO] Fetching org.eclipse.swt.gtk.linux.x86_64.source_3.6.1.v3656a.jar (215.15kB of 1.86MB at 213.82kB/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/plugi... [INFO] Fetching org.eclipse.swt.gtk.linux.x86_64.source_3.6.1.v3656a.jar (783kB of 1.86MB at 381.69kB/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/plugi... [INFO] Fetching org.eclipse.swt.gtk.linux.x86_64.source_3.6.1.v3656a.jar (1.29MB of 1.86MB at 419.68kB/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/plugi... [INFO] Fetching org.eclipse.swt.gtk.linux.x86_64.source_3.6.1.v3656a.jar (1.85MB of 1.86MB at 456.62kB/s) from http://download.jboss.org/jbosstools/updates/target-platform/latest/plugi... [INFO] Expected eclipse log file: <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.2_trunk/ws/sour...> [INFO] Command line: /bin/sh -c cd <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.2_trunk/ws/sour...> && /qa/tools/opt/x86_64/jdk1.6.0_20/jre/bin/java -Dosgi.noShutdown=false -Dosgi.os=linux -Dosgi.ws=gtk -Dosgi.arch=x86_64 -Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=256m -Dusage_reporting_enabled=false -jar <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.2_trunk/ws/m2-r...> -data <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.2_trunk/ws/sour...> -dev <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.2_trunk/ws/sour...> -install <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.2_trunk/ws/sour...> -configuration <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.2_trunk/ws/sour...> -application org.sonatype.tycho.surefire.osgibooter.uitest -testproperties <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.2_trunk/ws/sour...> -testApplication org.eclipse.ui.ide.workbench -product org.eclipse.sdk.ide An error has occurred. See the log file <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.2_trunk/ws/sour....> [INFO] [INFO] ------------------------------------------------------------------------ [INFO] Building Savara::Tools::Site 1.2.0-SNAPSHOT [INFO] ------------------------------------------------------------------------ Downloading: http://repository.jboss.org/maven2/org/apache/maven/plugins/maven-install... Downloading: https://repository.jboss.org/nexus/content/groups/developer/org/apache/ma... Downloading: http://repository.jboss.org/nexus/content/groups/public/org/apache/maven/... Downloading: http://snapshots.jboss.org/maven2/org/apache/maven/plugins/maven-install-... Downloading: http://repo1.maven.org/maven2/org/apache/maven/plugins/maven-install-plug... Downloaded: http://repository.jboss.org/nexus/content/groups/public/org/apache/maven/... (515 B at 0.4 KB/sec) Downloaded: http://repo1.maven.org/maven2/org/apache/maven/plugins/maven-install-plug... (503 B at 0.4 KB/sec) Downloaded: https://repository.jboss.org/nexus/content/groups/developer/org/apache/ma... (703 B at 0.2 KB/sec) Downloading: https://repository.jboss.org/nexus/content/groups/developer/org/apache/ma... Downloading: http://repository.jboss.org/maven2/org/apache/maven/plugins/maven-deploy-... Downloading: http://snapshots.jboss.org/maven2/org/apache/maven/plugins/maven-deploy-p... Downloading: http://repository.jboss.org/nexus/content/groups/public/org/apache/maven/... Downloading: http://repo1.maven.org/maven2/org/apache/maven/plugins/maven-deploy-plugi... Downloaded: http://repository.jboss.org/nexus/content/groups/public/org/apache/maven/... (474 B at 0.7 KB/sec) Downloaded: https://repository.jboss.org/nexus/content/groups/developer/org/apache/ma... (718 B at 0.9 KB/sec) Downloaded: http://repo1.maven.org/maven2/org/apache/maven/plugins/maven-deploy-plugi... (556 B at 0.2 KB/sec) [INFO] [INFO] --- maven-clean-plugin:2.4.1:clean (default-clean) @ site --- [INFO] [INFO] --- maven-osgi-packaging-plugin:0.10.0:build-qualifier (default-build-qualifier) @ site --- [INFO] [INFO] --- maven-osgi-packaging-plugin:0.10.0:update-site (default-update-site) @ site --- [INFO] [INFO] --- tycho-p2-plugin:0.10.0:update-site-p2-metadata (default-update-site-p2-metadata) @ site --- [INFO] Command line: /bin/sh -c cd <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.2_trunk/ws/sour...> && /qa/tools/opt/x86_64/jdk1.6.0_20/jre/bin/java -jar <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.2_trunk/ws/m2-r...> -nosplash -application org.eclipse.equinox.p2.publisher.UpdateSitePublisher -source <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.2_trunk/ws/sour...> -metadataRepository <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.2_trunk/ws/sour...> -metadataRepositoryName Savara::Tools::Site -artifactRepository <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.2_trunk/ws/sour...> -artifactRepositoryName 'Savara::Tools::Site Artifacts' -noDefaultIUs -compress Generating metadata for .. Generation completed with success [0 seconds]. [INFO] [INFO] --- maven-osgi-packaging-plugin:0.10.0:update-site-packaging (default-update-site-packaging) @ site --- [INFO] Building zip: <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.2_trunk/ws/sour...> [INFO] Building zip: <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.2_trunk/ws/sour...> [INFO] [INFO] --- maven-install-plugin:2.3.1:install (default-install) @ site --- [INFO] Installing <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.2_trunk/ws/sour...> to <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.2_trunk/ws/m2-r...> [INFO] Installing <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.2_trunk/ws/sour...> to <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.2_trunk/ws/m2-r...> [INFO] Installing <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.2_trunk/ws/sour...> to <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.2_trunk/ws/m2-r...> [INFO] ------------------------------------------------------------------------ [INFO] Reactor Summary: [INFO] [INFO] Savara::Tools ..................................... SUCCESS [0.336s] [INFO] Savara::Tools::Plugins ............................ SUCCESS [0.013s] [INFO] Savara::Tools::Plugins::ScribbleEclipse ........... SUCCESS [59.198s] [INFO] Savara::Tools::Plugins::Pi4SOACDM ................. SUCCESS [22.999s] [INFO] Savara::Tools::Plugins::ProtocolContract .......... SUCCESS [7.065s] [INFO] Savara::Tools::Plugins::ToolsTAPModel ............. SUCCESS [5.546s] [INFO] Savara::Tools::Plugins::ToolsTAPValidation ........ SUCCESS [7.007s] [INFO] Savara::Tools::Plugins::ToolsTAPEclipse ........... SUCCESS [5.648s] [INFO] Savara::Tools::Plugins::ToolsWSDL ................. SUCCESS [12.355s] [INFO] Savara::Tools::Plugins::ToolsBPEL ................. SUCCESS [8.448s] [INFO] Savara::Tools::Plugins::ToolsValidator ............ SUCCESS [7.234s] [INFO] Savara::Tools::Plugins::ToolsBPMN ................. SUCCESS [8.022s] [INFO] Savara::Tools::Plugins::ToolsMonitor .............. SUCCESS [10.278s] [INFO] Savara::Tools::Features ........................... SUCCESS [0.016s] [INFO] Savara::Tools::Features::ScribbleProtocol ......... SUCCESS [11.618s] [INFO] Savara::Tools::Features::SavaraTools .............. SUCCESS [6.695s] [INFO] Savara::Tools::Features::JBossSavaraTools ......... SUCCESS [3.304s] [INFO] Savara::Tools::Tests .............................. SUCCESS [0.009s] [INFO] Savara::Tools::Tests::ProtocolContract ............ FAILURE [7:21.283s] [INFO] Savara::Tools::Site ............................... SUCCESS [10.640s] [INFO] ------------------------------------------------------------------------ [INFO] BUILD FAILURE [INFO] ------------------------------------------------------------------------ [INFO] Total time: 17:27.947s [INFO] Finished at: Wed Jan 12 18:03:57 EST 2011 [INFO] Final Memory: 176M/353M [INFO] ------------------------------------------------------------------------ [ERROR] Failed to execute goal org.sonatype.tycho:maven-osgi-test-plugin:0.10.0:test (default-test) on project org.savara.protocol.contract.tests: There are test failures. [ERROR] [ERROR] Please refer to <http://hudson.qa.jboss.com/hudson/job/jbosstools-savara-1.2_trunk/ws/sour...> for the individual test results. [ERROR] -> [Help 1] [ERROR] [ERROR] To see the full stack trace of the errors, re-run Maven with the -e switch. [ERROR] Re-run Maven using the -X switch to enable full debug logging. [ERROR] [ERROR] For more information about the errors and possible solutions, please read the following articles: [ERROR] [Help 1] http://cwiki.apache.org/confluence/display/MAVEN/MojoFailureException [ERROR] [ERROR] After correcting the problems, you can resume the build with the command [ERROR] mvn <goals> -rf :org.savara.protocol.contract.tests Terminating xvnc. [jbosstools-savara-1.2_trunk] $ vncserver -kill :12 Killing Xvnc process ID 9464 Archiving artifacts Recording test results

13 years, 5 months

1
1
0 / 0

savara SVN: r568 - in branches/experimental/2.0.x/bundles: org.savara.common/src/main/java/org/savara/common/model/util and 2 other directories.

by do-not-reply＠jboss.org

Author: objectiser Date: 2011-01-12 12:15:21 -0500 (Wed, 12 Jan 2011) New Revision: 568 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)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/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.common/src/main/java/org/savara/common/model/util/PropertyName.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.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/InteractionConverterRuleImpl.java branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolModelConverterRuleImpl.java Log: SAVARA-158 - store type information in the TypeImport components of the protocol model, rather than as properties on the type references in the message signatures. 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-12 14:30:08 UTC (rev 567) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)Broker.bpel 2011-01-12 17:15:21 UTC (rev 568) @@ -25,17 +25,17 @@ <variable messageType="brk:cancelRequest" name="cancelRequestVar"/> </variables> <sequence> - <receive createInstance="yes" variable="makeEnquiryRequestVar" operation="makeEnquiry" portType="brk:Broker" 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:SupplierQuoteEngine" 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:Broker" 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:Broker" partnerLink="BuyerToBroker"> <sequence> @@ -43,14 +43,14 @@ <faultHandlers> <catch faultMessageType="cay:invalidCreditFault" faultVariable="invalidCreditFaultVar" faultName="cay:invalidCredit"> <sequence> - <reply faultName="brk:rejected" variable="rejectedFaultVar" operation="buy" portType="brk:Broker" 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: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"/> + <invoke outputVariable="checkCreditResponseVar" inputVariable="checkCreditRequestVar" operation="checkCredit" portType="cay:CreditAgency" partnerLink="BrokerToCreditAgency" name="Send_CreditInformation"/> + <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> 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-12 14:30:08 UTC (rev 567) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)Buyer.bpel 2011-01-12 17:15:21 UTC (rev 568) @@ -15,7 +15,7 @@ <variable messageType="brk:cancelRequest" name="cancelRequestVar"/> </variables> <sequence> - <invoke outputVariable="makeEnquiryResponseVar" inputVariable="makeEnquiryRequestVar" operation="makeEnquiry" portType="brk:Broker" 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="brk:Broker" 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="brk:Broker" 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-12 14:30:08 UTC (rev 567) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)CreditAgency.bpel 2011-01-12 17:15:21 UTC (rev 568) @@ -13,14 +13,14 @@ <variable messageType="cay:invalidCreditFault" name="invalidCreditFaultVar"/> </variables> <sequence> - <receive createInstance="yes" variable="checkCreditRequestVar" operation="checkCredit" portType="cay:CreditAgency" partnerLink="BrokerToCreditAgency" name="Receive_CreditCheckRequest"/> + <receive createInstance="yes" variable="checkCreditRequestVar" operation="checkCredit" portType="cay:CreditAgency" partnerLink="BrokerToCreditAgency" name="Receive_CreditInformation"/> <if> <sequence> - <reply variable="checkCreditResponseVar" operation="checkCredit" portType="cay:CreditAgency" partnerLink="BrokerToCreditAgency" name="Send_CreditCheckOk"/> + <reply variable="checkCreditResponseVar" operation="checkCredit" portType="cay:CreditAgency" partnerLink="BrokerToCreditAgency" name="Send_CreditValid"/> </sequence> <else> <sequence> - <reply faultName="cay:invalidCredit" variable="invalidCreditFaultVar" operation="checkCredit" portType="cay:CreditAgency" partnerLink="BrokerToCreditAgency" name="Send_CreditCheckInvalid"/> + <reply faultName="cay:invalidCredit" variable="invalidCreditFaultVar" operation="checkCredit" portType="cay:CreditAgency" partnerLink="BrokerToCreditAgency" name="Send_CreditInvalid"/> </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-12 14:30:08 UTC (rev 567) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel 2011-01-12 17:15:21 UTC (rev 568) @@ -10,7 +10,7 @@ <variable messageType="spr:getQuoteResponse" name="getQuoteResponseVar"/> </variables> <sequence> - <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"/> + <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-12 14:30:08 UTC (rev 567) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel 2011-01-12 17:15:21 UTC (rev 568) @@ -12,7 +12,7 @@ <variable messageType="spr:confirmResponse" name="confirmResponseVar"/> </variables> <sequence> - <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"/> + <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/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-12 14:30:08 UTC (rev 567) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ReqRespFault(a)Buyer.bpel 2011-01-12 17:15:21 UTC (rev 568) @@ -17,7 +17,7 @@ </catch> </faultHandlers> <sequence> - <invoke outputVariable="checkCreditResponseVar" inputVariable="checkCreditRequestVar" operation="checkCredit" portType="slr:Seller" partnerLink="BuyerToSeller" name="Send_CreditCheckRequest"/> + <invoke outputVariable="checkCreditResponseVar" inputVariable="checkCreditRequestVar" operation="checkCredit" portType="slr:Seller" partnerLink="BuyerToSeller" name="Send_CreditInformation"/> </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-12 14:30:08 UTC (rev 567) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ReqRespFault(a)Seller.bpel 2011-01-12 17:15:21 UTC (rev 568) @@ -11,14 +11,14 @@ <variable messageType="slr:insufficientCreditFault" name="insufficientCreditFaultVar"/> </variables> <sequence> - <receive createInstance="yes" variable="checkCreditRequestVar" operation="checkCredit" portType="slr:Seller" partnerLink="BuyerToSeller" name="Receive_CreditCheckRequest"/> + <receive createInstance="yes" variable="checkCreditRequestVar" operation="checkCredit" portType="slr:Seller" partnerLink="BuyerToSeller" name="Receive_CreditInformation"/> <if> <sequence> - <reply variable="checkCreditResponseVar" operation="checkCredit" portType="slr:Seller" partnerLink="BuyerToSeller" name="Send_CreditCheckOk"/> + <reply variable="checkCreditResponseVar" operation="checkCredit" portType="slr:Seller" partnerLink="BuyerToSeller" name="Send_CreditValid"/> </sequence> <else> <sequence> - <reply faultName="slr:insufficientCredit" variable="insufficientCreditFaultVar" operation="checkCredit" portType="slr:Seller" partnerLink="BuyerToSeller" name="Send_CreditCheckInvalid"/> + <reply faultName="slr:insufficientCredit" variable="insufficientCreditFaultVar" operation="checkCredit" portType="slr:Seller" partnerLink="BuyerToSeller" name="Send_CreditInvalid"/> </sequence> </else> </if> 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-12 14:30:08 UTC (rev 567) +++ branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/util/PropertyName.java 2011-01-12 17:15:21 UTC (rev 568) @@ -25,8 +25,6 @@ public static final String NAMESPACE = "Namespace"; - public static final String DATA_TYPE = "DataType"; - public static final String INTERFACE_NAME = "InterfaceName"; public static final String FAULT_NAME = "FaultName"; @@ -34,9 +32,6 @@ 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"; - // XSD sub types public static final String XSD_ELEMENT = "XSDElement"; public static final String XSD_TYPE = "XSDType"; 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-12 14:30:08 UTC (rev 567) +++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractIntrospector.java 2011-01-12 17:15:21 UTC (rev 568) @@ -42,8 +42,11 @@ import org.scribble.protocol.model.Run; import org.scribble.protocol.model.ModelObject; import org.scribble.protocol.model.Role; +import org.scribble.protocol.model.TypeImport; +import org.scribble.protocol.model.TypeImportList; import org.scribble.protocol.model.TypeReference; import org.scribble.protocol.model.When; +import org.scribble.protocol.util.TypeReferenceUtil; /** * This class examines a protocol to determine the contract that represents @@ -441,13 +444,23 @@ TypeDefinition td=new TypeDefinition(); td.setName(tref.getName()); - td.setDataType((String)tref.getProperties().get(PropertyName.DATA_TYPE)); + TypeImport ti=TypeReferenceUtil.getTypeImport(tref); + if (ti != null) { + TypeImportList til=(TypeImportList)ti.getParent(); + + td.setDataType(ti.getDataType().getDetails()); + + if (til != null) { + td.setTypeSystem(til.getFormat()); + } + } + //td.setDataType((String)tref.getProperties().get(PropertyName.DATA_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)); + //td.setTypeSystem((String)tref.getProperties().get(PropertyName.TYPE_SYSTEM)); getContract().getTypeDefinitions().add(td); } 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-12 14:30:08 UTC (rev 567) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConverterUtil.java 2011-01-12 17:15:21 UTC (rev 568) @@ -68,6 +68,8 @@ } if (typeName != null) { + ret.setName(infoType.getName()); + /* ret.setName(org.pi4soa.common.xml.XMLUtils.getLocalname(typeName)); ret.getProperties().put(PropertyName.DATA_TYPE, @@ -75,7 +77,7 @@ 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)); + */ } return(ret); 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-12 14:30:08 UTC (rev 567) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/InteractionConverterRuleImpl.java 2011-01-12 17:15:21 UTC (rev 568) @@ -743,6 +743,7 @@ ms.getTypeReferences().add(ref); // TODO: Determine if required (SAVARA-158) + /* ms.getProperties().put(PropertyName.TYPE_SYSTEM, TypeSystem.XSD); if (NamesUtil.isSet(itype.getTypeName())) { @@ -765,6 +766,7 @@ ns); } */ + /* } else if (NamesUtil.isSet(itype.getElementName())) { String ns=CDLTypeUtil.getNamespace(itype.getElementName(), cdl); @@ -785,7 +787,7 @@ ns); } */ - } + //} } return(ms); 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-12 14:30:08 UTC (rev 567) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolModelConverterRuleImpl.java 2011-01-12 17:15:21 UTC (rev 568) @@ -21,12 +21,17 @@ import java.util.logging.Logger; +import javax.xml.namespace.QName; + import org.pi4soa.cdl.*; import org.pi4soa.cdl.util.CDLTypeUtil; +import org.pi4soa.common.xml.XMLUtils; import org.savara.common.model.util.PropertyName; +import org.savara.common.model.util.TypeSystem; import org.savara.contract.generator.ContractGenerator; import org.savara.contract.generator.ContractGeneratorFactory; import org.scribble.protocol.model.*; +import org.scribble.protocol.model.DataType; public class ProtocolModelConverterRuleImpl implements ConverterRule { @@ -82,27 +87,10 @@ 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)); - - // Convert token locators - /* TODO: How to deal with identity and locators - java.util.Iterator<TokenLocator> locators= - cdlpack.getTypeDefinitions().getTokenLocators().iterator(); - - while (locators.hasNext()) { - TokenLocator locator=locators.next(); + // Convert information types into type imports + for (org.pi4soa.cdl.InformationType itype : cdlpack.getTypeDefinitions().getInformationTypes()) { - IdentityLocator idLocator=new IdentityLocator(); - idLocator.setLocator(locator.getToken().getName(), - locator.getQuery()); - - TypeReference typeRef=ConverterUtil.getTypeReference(locator.getInformationType()); - idLocator.setType(typeRef); - - ret.getIdentityLocators().add(idLocator); } - */ // Convert root choreography java.util.Iterator<org.pi4soa.cdl.Choreography> iter= @@ -127,26 +115,6 @@ logger.severe("Failed to find conversation conversion rule"); } - // Clear the inner definition for any Compose activities - // The inner definitions are temporarily established to - // help internal analysis, e.g. to determine initiator - // roles - - /* - * TODO: Not sure if necessary to clear out definitions??? - * - for (int i=0; i < context.getComposeActivities().size(); i++) { - // Save parent - Protocol defn=context.getComposeActivities().get(i).getProtocol(); - ModelObject parent=defn.getParent(); - - context.getComposeActivities().get(i).setInlineDefinition(null); - - // Re-establish parent - defn.setParent(parent); - } - */ - // Derive contracts associated with the protocol model ContractGenerator cg=ContractGeneratorFactory.getContractGenerator(); if (cg != null) { @@ -155,61 +123,72 @@ return(ret); } - - - /** - * This method generates a namespace associated with - * the supplied CDL package. - * - * @param cdlpack The choreography package - * @return The namespace - */ - /* - protected static org.scribble.protocol.model.Namespace getNamespace( - org.pi4soa.cdl.Package cdlpack) { - org.scribble.protocol.model.Namespace ret=new org.scribble.protocol.model.Namespace(); + + protected void setupTypeImport(org.pi4soa.cdl.InformationType infoType, ProtocolModel model) { + org.pi4soa.common.xml.XMLPrefixResolver resolver= + org.pi4soa.cdl.util.CDLTypeUtil.getPrefixResolver(infoType.getPackage()); + String typeName=null; - String ns=cdlpack.getTargetNamespace()+"/"+cdlpack.getName(); - - if (ns.startsWith("http://")) { - ns = ns.substring(7); + if (org.pi4soa.common.util.NamesUtil.isSet(infoType.getTypeName())) { + typeName = infoType.getTypeName(); + } else if (org.pi4soa.common.util.NamesUtil.isSet(infoType.getElementName())) { + typeName = infoType.getElementName(); } - if (ns.startsWith("www.")) { - ns = ns.substring(4); - } - - java.util.StringTokenizer st=new java.util.StringTokenizer(ns, "/"); - boolean f_first=true; - String namespace=null; - - while (st.hasMoreTokens()) { - String token=st.nextToken(); + if (typeName != null) { + String prefix=XMLUtils.getPrefix(typeName); + String location=null; - if (f_first) { - java.util.StringTokenizer innerst= - new java.util.StringTokenizer(token, "."); - while (innerst.hasMoreTokens()) { - if (namespace == null) { - namespace = innerst.nextToken(); - } else { - namespace = innerst.nextToken()+"."+namespace; + // Find location + if (prefix != null) { + for (NameSpace ns : infoType.getPackage().getTypeDefinitions().getNameSpaces()) { + if (ns.getPrefix().equals(prefix)) { + location = ns.getURI(); + break; } } + } + + // Check if type import exists for the location + TypeImportList til=null; + + for (ImportList il : model.getImports()) { + if (il instanceof TypeImportList) { + TypeImportList tilist=(TypeImportList)il; + + if ((tilist.getLocation() == null && location == null) || + (tilist.getLocation() != null && location != null && + tilist.getLocation().equals(location))) { + til = tilist; + break; + } + } + } + + if (til == null) { + til = new TypeImportList(); + til.setFormat(TypeSystem.XSD); + til.setLocation(location); - f_first = false; + model.getImports().add(til); + } + + TypeImport ti=til.getTypeImport(infoType.getName()); + + String dataType=(new QName(org.pi4soa.common.xml.XMLUtils.getNamespace(typeName, resolver, null), + org.pi4soa.common.xml.XMLUtils.getLocalname(typeName))).toString(); + + if (ti == null) { + ti = new TypeImport(); + ti.setName(infoType.getName()); + ti.setDataType(new DataType(dataType)); + + til.getTypeImports().add(ti); } else { - namespace += "."+token; + // TODO: Verify same data type } } - - if (namespace != null) { - ret.setName(namespace.toLowerCase()); - } - - return(ret); } - */ private static Logger logger = Logger.getLogger(ProtocolModelConverterRuleImpl.class.getName()); }

13 years, 5 months

1
0
0 / 0

savara SVN: r567 - in branches/experimental/2.0.x/bundles: org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules and 1 other directory.

by do-not-reply＠jboss.org

Author: objectiser Date: 2011-01-12 09:30:08 -0500 (Wed, 12 Jan 2011) New Revision: 567 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.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/FinalizeConverterRuleImpl.java branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/PerformConverterRuleImpl.java Log: Update to reflect changes in protocol model. 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-12 13:42:44 UTC (rev 566) +++ branches/experimental/2.0.x/bundles/org.savara.contract/src/test/java/org/savara/contract/generator/impl/ContractIntrospectorTest.java 2011-01-12 14:30:08 UTC (rev 567) @@ -109,7 +109,6 @@ ProtocolReference ref1=new ProtocolReference(); ref1.setName("mid"); ref1.setRole(r); - ref1.setInner(true); Run run1=new Run(); run1.setProtocolReference(ref1); @@ -120,7 +119,6 @@ ProtocolReference ref2=new ProtocolReference(); ref2.setName("sub"); ref2.setRole(r); - ref2.setInner(true); Run run2=new Run(); run2.setProtocolReference(ref2); Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/FinalizeConverterRuleImpl.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/FinalizeConverterRuleImpl.java 2011-01-12 13:42:44 UTC (rev 566) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/FinalizeConverterRuleImpl.java 2011-01-12 14:30:08 UTC (rev 567) @@ -60,7 +60,6 @@ ProtocolReference ref=new ProtocolReference(); ref.setName(cdl.getChoreography().getName()+"_"+cdl.getFinalizer().getName()); - ref.setInner(true); ret.setProtocolReference(ref); Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/PerformConverterRuleImpl.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/PerformConverterRuleImpl.java 2011-01-12 13:42:44 UTC (rev 566) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/PerformConverterRuleImpl.java 2011-01-12 14:30:08 UTC (rev 567) @@ -101,7 +101,6 @@ ProtocolReference ref=new ProtocolReference(); ref.setName(cdl.getChoreography().getName()); - ref.setInner(true); run.setProtocolReference(ref);

13 years, 5 months

1
0
0 / 0

savara SVN: r566 - in branches/experimental/2.0.x: bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change and 15 other directories.

by do-not-reply＠jboss.org

Author: objectiser Date: 2011-01-12 08:42:44 -0500 (Wed, 12 Jan 2011) New Revision: 566 Added: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/rules/ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/rules/ConverterUtilTest.java branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/cdm/ESBBroker.cdm 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/parser/ParserTest.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/ProtocolToBPELModelGenerator.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/BPELModelChangeContext.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ModelChangeUtils.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/RunModelChangeRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/BPELProtocolParser.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ConversionContext.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/DefaultConversionContext.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/InvokeParserRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/PickParserRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ReceiveParserRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ReplyParserRule.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/util/BPELInteractionUtil.java branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/java/org/savara/bpel/model/change/ModelChangeUtilsTest.java branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/change/AbstractModelChangeContext.java branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/change/ModelChangeContext.java 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.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/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/PerformConverterRuleImpl.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/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java Log: Update to use changes in the scribble apis primarily related to 'run' parameters and protocol parameter definitions, and passing in a context to enable external resources to be located. Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/ProtocolToBPELModelGenerator.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/ProtocolToBPELModelGenerator.java 2011-01-10 19:42:04 UTC (rev 565) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/generator/ProtocolToBPELModelGenerator.java 2011-01-12 13:42:44 UTC (rev 566) @@ -24,6 +24,7 @@ import org.savara.bpel.model.change.BPELModelChangeContext; import org.savara.common.model.generator.ModelGenerator; import org.scribble.common.resource.ResourceLocator; +import org.scribble.common.logging.CachedJournal; import org.scribble.common.logging.Journal; import org.scribble.protocol.ProtocolDefinitions; import org.scribble.protocol.model.*; @@ -41,7 +42,7 @@ public Object generate(Object source, Journal journal, ResourceLocator locator) { BPELModelChangeContext context= - new BPELModelChangeContext(); + new BPELModelChangeContext(null, new CachedJournal()); ProtocolModel pm=(ProtocolModel)source; // Create BPEL model Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/BPELModelChangeContext.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/BPELModelChangeContext.java 2011-01-10 19:42:04 UTC (rev 565) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/BPELModelChangeContext.java 2011-01-12 13:42:44 UTC (rev 566) @@ -21,6 +21,8 @@ import org.savara.common.model.change.AbstractModelChangeContext; import org.savara.common.model.change.ModelChangeRule; +import org.scribble.common.logging.Journal; +import org.scribble.protocol.ProtocolContext; /** * This class provides a default implementation for the model @@ -42,9 +44,11 @@ /** * This is the constructor for the model change context. * - * @param role The role associated with the model + * @param context The protocol context + * @param journal The journal */ - public BPELModelChangeContext() { + public BPELModelChangeContext(ProtocolContext context, Journal journal) { + super(context, journal); } /** Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ModelChangeUtils.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ModelChangeUtils.java 2011-01-10 19:42:04 UTC (rev 565) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ModelChangeUtils.java 2011-01-12 13:42:44 UTC (rev 566) @@ -19,7 +19,9 @@ import org.savara.common.model.change.ModelChangeContext; import org.savara.contract.model.Contract; +import org.scribble.common.logging.Journal; import org.scribble.protocol.model.*; +import org.scribble.protocol.util.ProtocolModelUtil; /** * Model change utilities. @@ -173,7 +175,7 @@ */ @SuppressWarnings("unchecked") public static void pushRoleContractMapping(ModelChangeContext context, - Run run) { + Run run, Journal journal) { if (context.getProperties().containsKey(Contract.class.getName())) { java.util.Map<String,Contract> contracts= @@ -189,16 +191,50 @@ } } - /* TODO: NEED TO CONSIDER HOW ROLES/CONTRACTS WILL BE BOUND USING - * POSITIONAL INFO. - */ - for (Parameter p : run.getParameters()) { - Contract c=contracts.remove(p.getName()); + // Store protocol against mapped role + Protocol defn=run.getProtocol(); + + if (defn == null) { + // Check if protocol import defined for protocol + ProtocolImport pi=ProtocolModelUtil.getProtocolImport(run.getModel(), + run.getProtocolReference()); - if (c != null) { - contracts.put(p.getBoundName(), c); + if (pi == null) { + journal.error("Referenced protocol '"+run.getProtocolReference().getName()+ + "' not found within model or in import statements", run.getProperties()); + } else { + ProtocolModel pm=context.getProtocolContext().getProtocolModel(pi, journal); + + if (pm != null) { + defn = pm.getProtocol(); + } else { + journal.error("Referenced protocol '"+run.getProtocolReference().getName()+ + "' could not be loaded from location '"+pi.getLocation()+"'", + run.getProperties()); + } } } + + if (defn != null) { + + if (defn.getParameterDefinitions().size() == + run.getParameters().size()) { + for (int i=0; i < run.getParameters().size(); i++) { + Parameter p=run.getParameters().get(i); + ParameterDefinition pd=defn.getParameterDefinitions().get(i); + + Contract c=contracts.remove(p.getName()); + + if (c != null) { + contracts.put(pd.getName(), c); + } + } + } else { + journal.error("Referenced protocol '"+run.getProtocolReference().getName()+ + "' is expecting a different number of parameters", + run.getProperties()); + } + } } } @@ -211,7 +247,7 @@ */ @SuppressWarnings("unchecked") public static void popRoleContractMapping(ModelChangeContext context, - Run run) { + Run run, Journal journal) { if (context.getProperties().containsKey(Contract.class.getName())) { java.util.Map<String,Contract> contracts= @@ -227,16 +263,50 @@ } } - /* TODO: NEED TO CONSIDER HOW ROLES/CONTRACTS WILL BE BOUND USING - * POSITIONAL INFO. - */ - for (Parameter db : run.getParameters()) { - Contract c=contracts.remove(db.getBoundName()); + // Store protocol against mapped role + Protocol defn=run.getProtocol(); + + if (defn == null) { + // Check if protocol import defined for protocol + ProtocolImport pi=ProtocolModelUtil.getProtocolImport(run.getModel(), + run.getProtocolReference()); - if (c != null) { - contracts.put(db.getName(), c); + if (pi == null) { + journal.error("Referenced protocol '"+run.getProtocolReference().getName()+ + "' not found within model or in import statements", run.getProperties()); + } else { + ProtocolModel pm=context.getProtocolContext().getProtocolModel(pi, journal); + + if (pm != null) { + defn = pm.getProtocol(); + } else { + journal.error("Referenced protocol '"+run.getProtocolReference().getName()+ + "' could not be loaded from location '"+pi.getLocation()+"'", + run.getProperties()); + } } } + + if (defn != null) { + + if (defn.getParameterDefinitions().size() == + run.getParameters().size()) { + for (int i=0; i < run.getParameters().size(); i++) { + Parameter p=run.getParameters().get(i); + ParameterDefinition pd=defn.getParameterDefinitions().get(i); + + Contract c=contracts.remove(pd.getName()); + + if (c != null) { + contracts.put(p.getName(), c); + } + } + } else { + journal.error("Referenced protocol '"+run.getProtocolReference().getName()+ + "' is expecting a different number of parameters", + run.getProperties()); + } + } } } } Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/RunModelChangeRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/RunModelChangeRule.java 2011-01-10 19:42:04 UTC (rev 565) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/RunModelChangeRule.java 2011-01-12 13:42:44 UTC (rev 566) @@ -86,7 +86,7 @@ if (elem.getProtocol() != null) { // Push details related to sub-choreo - ModelChangeUtils.pushRoleContractMapping(context, elem); + ModelChangeUtils.pushRoleContractMapping(context, elem, context.getJournal()); ModelChangeUtils.addContracts(context, elem.getProtocol(), false); @@ -116,9 +116,7 @@ context.setParent(seq); for (int i=0; i < acts.size(); i++) { - //if ((acts.get(i) instanceof Definition) == false) { - context.insert(model, acts.get(i), null); - //} + context.insert(model, acts.get(i), null); } // Reset old parent @@ -127,7 +125,7 @@ // Pop details related to sub-choreo ModelChangeUtils.removeContracts(context, elem.getProtocol(), false); - ModelChangeUtils.popRoleContractMapping(context, elem); + ModelChangeUtils.popRoleContractMapping(context, elem, context.getJournal()); } return(true); Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/BPELProtocolParser.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/BPELProtocolParser.java 2011-01-10 19:42:04 UTC (rev 565) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/BPELProtocolParser.java 2011-01-12 13:42:44 UTC (rev 566) @@ -24,8 +24,8 @@ import org.savara.bpel.model.TProcess; import org.savara.bpel.parser.rules.DefaultConversionContext; import org.savara.bpel.util.BPELModelUtil; -import org.scribble.common.resource.ResourceLocator; import org.scribble.common.logging.Journal; +import org.scribble.protocol.ProtocolContext; import org.scribble.protocol.model.*; import org.scribble.protocol.parser.ProtocolParser; @@ -39,7 +39,7 @@ return(sourceType.equals(BPELDefinitions.BPEL_TYPE)); } - public ProtocolModel parse(java.io.InputStream is, Journal journal, ResourceLocator locator) + public ProtocolModel parse(java.io.InputStream is, Journal journal, ProtocolContext context) throws java.io.IOException { ProtocolModel ret=new ProtocolModel(); @@ -72,9 +72,9 @@ } // Convert the process contents - DefaultConversionContext context=new DefaultConversionContext(role, process, locator); + DefaultConversionContext convContext=new DefaultConversionContext(role, process, context); - context.convert(process, protocol.getBlock().getContents(), journal); + convContext.convert(process, protocol.getBlock().getContents(), journal); return(ret); } Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ConversionContext.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ConversionContext.java 2011-01-10 19:42:04 UTC (rev 565) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ConversionContext.java 2011-01-12 13:42:44 UTC (rev 566) @@ -21,7 +21,7 @@ import org.savara.bpel.model.TScope; import org.savara.bpel.model.TVariable; import org.scribble.common.logging.Journal; -import org.scribble.common.resource.ResourceLocator; +import org.scribble.protocol.ProtocolContext; import org.scribble.protocol.model.Activity; public interface ConversionContext { @@ -35,11 +35,11 @@ public void convert(Object component, java.util.List<Activity> activities, Journal journal); /** - * This method returns a reference to the resource locator. + * This method returns a reference to the protocol context. * - * @return The resource locator + * @return The protocol context */ - public ResourceLocator getResourceLocator(); + public ProtocolContext getProtocolContext(); /** * This method returns the process. Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/DefaultConversionContext.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/DefaultConversionContext.java 2011-01-10 19:42:04 UTC (rev 565) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/DefaultConversionContext.java 2011-01-12 13:42:44 UTC (rev 566) @@ -21,7 +21,7 @@ import org.savara.bpel.model.TScope; import org.savara.bpel.model.TVariable; import org.scribble.common.logging.Journal; -import org.scribble.common.resource.ResourceLocator; +import org.scribble.protocol.ProtocolContext; import org.scribble.protocol.model.Activity; /** @@ -32,7 +32,7 @@ private String m_role=null; private TProcess m_process=null; - private ResourceLocator m_resourceLocator=null; + private ProtocolContext m_context=null; private java.util.Map<String,TVariable> m_variables= new java.util.HashMap<String,TVariable>(); private java.util.Stack<TScope> m_scopeStack=new java.util.Stack<TScope>(); @@ -62,12 +62,12 @@ * * @param role The role * @param proc The process - * @param locator The resource locator + * @param context The protocol context */ - public DefaultConversionContext(String role, TProcess proc, ResourceLocator locator) { + public DefaultConversionContext(String role, TProcess proc, ProtocolContext context) { m_role = role; m_process = proc; - m_resourceLocator = locator; + m_context = context; } /** @@ -91,12 +91,12 @@ } /** - * This method returns a reference to the environment context. + * This method returns a reference to the protocol context. * - * @return The environment context + * @return The protocol context */ - public ResourceLocator getResourceLocator() { - return(m_resourceLocator); + public ProtocolContext getProtocolContext() { + return(m_context); } /** Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/InvokeParserRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/InvokeParserRule.java 2011-01-10 19:42:04 UTC (rev 565) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/InvokeParserRule.java 2011-01-12 13:42:44 UTC (rev 566) @@ -127,7 +127,7 @@ TVariable var=context.getVariable(invoke.getInputVariable()); String xmlType=BPELInteractionUtil.getXMLType(context.getProcess(), var.getMessageType(), - context.getResourceLocator()); + context.getProtocolContext().getResourceLocator()); TypeReference tref=TypeReferenceUtil.createTypeReference(xmlType, context); @@ -160,7 +160,7 @@ TVariable var=context.getVariable(invoke.getOutputVariable()); String xmlType=BPELInteractionUtil.getXMLType(context.getProcess(), var.getMessageType(), - context.getResourceLocator()); + context.getProtocolContext().getResourceLocator()); TypeReference tref=TypeReferenceUtil.createTypeReference(xmlType, context); @@ -201,7 +201,7 @@ if (var != null) { String xmlType=BPELInteractionUtil.getXMLType(context.getProcess(), var.getMessageType(), - context.getResourceLocator()); + context.getProtocolContext().getResourceLocator()); tref = TypeReferenceUtil.createTypeReference(xmlType, context); //tref.setLocalpart(var.getMessageType()); Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/PickParserRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/PickParserRule.java 2011-01-10 19:42:04 UTC (rev 565) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/PickParserRule.java 2011-01-12 13:42:44 UTC (rev 566) @@ -82,7 +82,7 @@ TVariable var=context.getVariable(onMessageElem.getVariable()); String xmlType=BPELInteractionUtil.getXMLType(context.getProcess(), var.getMessageType(), - context.getResourceLocator()); + context.getProtocolContext().getResourceLocator()); TypeReference tref=TypeReferenceUtil.createTypeReference(xmlType, context); Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ReceiveParserRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ReceiveParserRule.java 2011-01-10 19:42:04 UTC (rev 565) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ReceiveParserRule.java 2011-01-12 13:42:44 UTC (rev 566) @@ -51,7 +51,7 @@ TVariable var=context.getVariable(elem.getVariable()); String xmlType=BPELInteractionUtil.getXMLType(context.getProcess(), var.getMessageType(), - context.getResourceLocator()); + context.getProtocolContext().getResourceLocator()); TypeReference tref=TypeReferenceUtil.createTypeReference(xmlType, context); Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ReplyParserRule.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ReplyParserRule.java 2011-01-10 19:42:04 UTC (rev 565) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ReplyParserRule.java 2011-01-12 13:42:44 UTC (rev 566) @@ -50,7 +50,7 @@ TVariable var=context.getVariable(reply.getVariable()); String xmlType=BPELInteractionUtil.getXMLType(context.getProcess(), var.getMessageType(), - context.getResourceLocator()); + context.getProtocolContext().getResourceLocator()); TypeReference tref=TypeReferenceUtil.createTypeReference(xmlType, context); Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/util/BPELInteractionUtil.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/util/BPELInteractionUtil.java 2011-01-10 19:42:04 UTC (rev 565) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/util/BPELInteractionUtil.java 2011-01-12 13:42:44 UTC (rev 566) @@ -160,15 +160,19 @@ imp.getLocation() != null && imp.getLocation().endsWith(".wsdl")) { - java.net.URI uri= - locator.getResourceURI(imp.getLocation()); - - if (uri != null) { - ret = getXMLType(wsdlMessageType, uri); - - if (ret != null) { - break; + try { + java.net.URI uri= + locator.getResourceURI(imp.getLocation()); + + if (uri != null) { + ret = getXMLType(wsdlMessageType, uri); + + if (ret != null) { + break; + } } + } catch(Exception e) { + e.printStackTrace(); } } } Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/java/org/savara/bpel/model/change/ModelChangeUtilsTest.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/java/org/savara/bpel/model/change/ModelChangeUtilsTest.java 2011-01-10 19:42:04 UTC (rev 565) +++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/test/java/org/savara/bpel/model/change/ModelChangeUtilsTest.java 2011-01-12 13:42:44 UTC (rev 566) @@ -20,6 +20,7 @@ import org.savara.bpel.model.change.ModelChangeUtils; import org.savara.common.model.change.ModelChangeContext; import org.savara.contract.model.*; +import org.scribble.common.logging.CachedJournal; import org.scribble.protocol.model.*; import junit.framework.TestCase; @@ -33,7 +34,7 @@ private static final String MY_OTHER_LOCATED_ROLE = "MyOtherLocatedRole"; public void testInitialiseContracts() { - ModelChangeContext context=new BPELModelChangeContext(); + ModelChangeContext context=new BPELModelChangeContext(null, new CachedJournal()); Protocol conv=new Protocol(); Role r=new Role(); @@ -58,7 +59,7 @@ } public void testInitialiseContractsTwice() { - ModelChangeContext context=new BPELModelChangeContext(); + ModelChangeContext context=new BPELModelChangeContext(null, new CachedJournal()); Protocol conv=new Protocol(); Role r=new Role(); @@ -104,7 +105,7 @@ } public void testPushRoleContractMapping() { - ModelChangeContext context=new BPELModelChangeContext(); + ModelChangeContext context=new BPELModelChangeContext(null, new CachedJournal()); Protocol conv=new Protocol(); Role r1=new Role(); @@ -129,6 +130,10 @@ Protocol subconv=new Protocol(); subconv.setName(SUB_PROTOCOL); + ParameterDefinition pd=new ParameterDefinition(); + pd.setName(MY_OTHER_ROLE); + subconv.getParameterDefinitions().add(pd); + Role subr1=new Role(); subr1.setName(MY_OTHER_LOCATED_ROLE); subconv.setRole(subr1); @@ -144,12 +149,12 @@ Parameter db=new Parameter(); db.setName(r2.getName()); - db.setBoundName(MY_OTHER_ROLE); + //db.setBoundName(MY_OTHER_ROLE); run.getParameters().add(db); conv.getBlock().add(subconv); - ModelChangeUtils.pushRoleContractMapping(context, run); + ModelChangeUtils.pushRoleContractMapping(context, run, null); Contract c3=ModelChangeUtils.getContract(context, new Role(MY_ROLE)); Contract c4=ModelChangeUtils.getContract(context, new Role(MY_OTHER_ROLE)); @@ -183,7 +188,7 @@ } public void testPopRoleContractMapping() { - ModelChangeContext context=new BPELModelChangeContext(); + ModelChangeContext context=new BPELModelChangeContext(null, new CachedJournal()); Protocol conv=new Protocol(); Role r1=new Role(); @@ -200,6 +205,10 @@ Protocol subconv=new Protocol(); subconv.setName(SUB_PROTOCOL); + + ParameterDefinition pd=new ParameterDefinition(); + pd.setName(MY_OTHER_ROLE); + subconv.getParameterDefinitions().add(pd); Role subr1=new Role(); subr1.setName(MY_OTHER_LOCATED_ROLE); @@ -235,12 +244,12 @@ Parameter db=new Parameter(); db.setName(r2.getName()); - db.setBoundName(MY_OTHER_ROLE); + //db.setBoundName(MY_OTHER_ROLE); run.getParameters().add(db); conv.getBlock().add(subconv); - ModelChangeUtils.popRoleContractMapping(context, run); + ModelChangeUtils.popRoleContractMapping(context, run, null); Contract c3=ModelChangeUtils.getContract(context, new Role(MY_ROLE)); Contract c4=ModelChangeUtils.getContract(context, new Role(MY_OTHER_ROLE)); 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-10 19:42:04 UTC (rev 565) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java 2011-01-12 13:42:44 UTC (rev 566) @@ -36,10 +36,10 @@ public static Test suite() { TestSuite suite = new TestSuite("Choreography->BPEL Generator Tests"); + suite.addTest(new ChoreographyToBPELTester("ESBBroker", "Broker")); suite.addTest(new ChoreographyToBPELTester("ESBBroker", "Buyer")); suite.addTest(new ChoreographyToBPELTester("ESBBroker", "SupplierTxnProcessor")); suite.addTest(new ChoreographyToBPELTester("ESBBroker", "CreditAgency")); - suite.addTest(new ChoreographyToBPELTester("ESBBroker", "Broker")); suite.addTest(new ChoreographyToBPELTester("ESBBroker", "SupplierQuoteEngine")); suite.addTest(new ChoreographyToBPELTester("PurchaseGoods", "Buyer")); @@ -48,7 +48,7 @@ suite.addTest(new ChoreographyToBPELTester("ReqRespFault", "Buyer")); suite.addTest(new ChoreographyToBPELTester("ReqRespFault", "Seller")); - + return suite; } @@ -112,9 +112,9 @@ org.scribble.protocol.model.ProtocolModel model=null; + CDMProtocolParser parser=new CDMProtocolParser(); + try { - CDMProtocolParser parser=new CDMProtocolParser(); - model = parser.parse(is, journal, null); } catch(Exception e) { result.addError(this, new Throwable("Parsing choreography failed")); @@ -155,7 +155,7 @@ new org.scribble.protocol.projection.impl.ProtocolProjectorImpl(); org.scribble.protocol.model.ProtocolModel projected= - projector.project(model, role, journal); + projector.project(model, role, journal, null); /* Currently if a 'fail' is performed in Tycho build, it * hangs the build. 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-10 19:42:04 UTC (rev 565) +++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/parser/ParserTest.java 2011-01-12 13:42:44 UTC (rev 566) @@ -21,6 +21,7 @@ import org.scribble.common.logging.CachedJournal; import org.scribble.common.resource.ResourceLocator; +import org.scribble.protocol.DefaultProtocolContext; import org.scribble.protocol.model.ProtocolModel; import junit.framework.TestCase; @@ -98,7 +99,8 @@ try { BPELProtocolParser parser=new BPELProtocolParser(); - model = parser.parse(is, journal, new ResourceLoaderImpl()); + model = parser.parse(is, journal, new DefaultProtocolContext(null, + new ResourceLoaderImpl())); } catch(Exception e) { e.printStackTrace(); result.addError(this, new Throwable("Parsing BPEL failed")); Modified: branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/change/AbstractModelChangeContext.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/change/AbstractModelChangeContext.java 2011-01-10 19:42:04 UTC (rev 565) +++ branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/change/AbstractModelChangeContext.java 2011-01-12 13:42:44 UTC (rev 566) @@ -19,6 +19,8 @@ */ package org.savara.common.model.change; +import org.scribble.common.logging.Journal; +import org.scribble.protocol.ProtocolContext; import org.scribble.protocol.model.*; /** @@ -28,17 +30,40 @@ public abstract class AbstractModelChangeContext implements ModelChangeContext { private Object m_parent=null; + private ProtocolContext m_context=null; + private Journal m_journal=null; private java.util.Map<String,Object> m_properties=new java.util.HashMap<String,Object>(); /** * This is the constructor for the model change context. * - * @param role The role associated with the model + * @param context The protocol context + * @param journal The journal */ - public AbstractModelChangeContext() { + public AbstractModelChangeContext(ProtocolContext context, Journal journal) { + m_context = context; + m_journal = journal; } /** + * This method returns the protocol context. + * + * @return The protocol context + */ + public ProtocolContext getProtocolContext() { + return(m_context); + } + + /** + * This method returns the journal. + * + * @return The journal + */ + public Journal getJournal() { + return(m_journal); + } + + /** * This method returns a list of model change rules appropriate * for the notation being changed. * Modified: branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/change/ModelChangeContext.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/change/ModelChangeContext.java 2011-01-10 19:42:04 UTC (rev 565) +++ branches/experimental/2.0.x/bundles/org.savara.common/src/main/java/org/savara/common/model/change/ModelChangeContext.java 2011-01-12 13:42:44 UTC (rev 566) @@ -19,6 +19,8 @@ */ package org.savara.common.model.change; +import org.scribble.common.logging.Journal; +import org.scribble.protocol.ProtocolContext; import org.scribble.protocol.model.*; /** @@ -28,6 +30,20 @@ public interface ModelChangeContext { /** + * This method returns the protocol context. + * + * @return The protocol context + */ + public ProtocolContext getProtocolContext(); + + /** + * This method returns the protocol context. + * + * @return The protocol context + */ + public Journal getJournal(); + + /** * This method returns the current parent component. * * @return The parent 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-10 19:42:04 UTC (rev 565) +++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/ContractGenerator.java 2011-01-12 13:42:44 UTC (rev 566) @@ -19,6 +19,7 @@ import org.savara.contract.model.Contract; import org.scribble.common.logging.Journal; +import org.scribble.protocol.ProtocolContext; import org.scribble.protocol.model.Protocol; import org.scribble.protocol.model.ProtocolModel; @@ -36,9 +37,10 @@ * * @param pm The protocol model * @param journal The journal + * @param context The protocol context * @throws IllegalArgumentException */ - public void generate(ProtocolModel pm, Journal journal) throws IllegalArgumentException; + public void generate(ProtocolModel pm, Journal journal, ProtocolContext context) throws IllegalArgumentException; /** * This method generates a contract associated with a supplied located 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-10 19:42:04 UTC (rev 565) +++ branches/experimental/2.0.x/bundles/org.savara.contract/src/main/java/org/savara/contract/generator/impl/ContractGeneratorImpl.java 2011-01-12 13:42:44 UTC (rev 566) @@ -22,12 +22,11 @@ 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.ProtocolContext; 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 @@ -43,13 +42,14 @@ * * @param pm The protocol model * @param journal The journal + * @param context The protocol context * @throws IllegalArgumentException */ - public void generate(ProtocolModel pm, Journal journal) throws IllegalArgumentException { + public void generate(ProtocolModel pm, Journal journal, ProtocolContext context) throws IllegalArgumentException { java.util.List<Role> roles=pm.getRoles(); for (Role r : roles) { - ProtocolModel lm=ScribbleServices.getProtocolProjector().project(pm, r, journal); + ProtocolModel lm=ScribbleServices.getProtocolProjector().project(pm, r, journal, context); if (lm != null) { Contract c=generate(lm.getProtocol(), journal); 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-10 19:42:04 UTC (rev 565) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/CDMProtocolParser.java 2011-01-12 13:42:44 UTC (rev 566) @@ -27,9 +27,9 @@ import org.savara.pi4soa.cdm.parser.rules.ConverterRuleFactory; import org.savara.pi4soa.cdm.parser.rules.DefaultConverterContext; import org.scribble.common.logging.Journal; +import org.scribble.protocol.ProtocolContext; import org.scribble.protocol.model.ProtocolModel; import org.scribble.protocol.parser.ProtocolParser; -import org.scribble.common.resource.ResourceLocator; /** * This class provides the model parser for the CDM notation. @@ -47,7 +47,7 @@ return("cdm".equals(sourceType)); } - public ProtocolModel parse(java.io.InputStream is, Journal journal, ResourceLocator locator) + public ProtocolModel parse(java.io.InputStream is, Journal journal, ProtocolContext context) throws java.io.IOException { ProtocolModel ret=null; @@ -61,7 +61,7 @@ if (rule != null) { ConverterContext cctxt= - new DefaultConverterContext(journal); + new DefaultConverterContext(journal, context); 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/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-10 19:42:04 UTC (rev 565) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConverterContext.java 2011-01-12 13:42:44 UTC (rev 566) @@ -22,11 +22,19 @@ import org.pi4soa.cdl.Choreography; import org.pi4soa.cdl.ExchangeDetails; import org.scribble.common.logging.Journal; +import org.scribble.protocol.ProtocolContext; import org.scribble.protocol.model.*; public interface ConverterContext { /** + * This method returns the protocol context. + * + * @return The protocol context + */ + public ProtocolContext getProtocolContext(); + + /** * This method returns the journal for reporting issues. * * @return The journal 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-10 19:42:04 UTC (rev 565) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ConverterUtil.java 2011-01-12 13:42:44 UTC (rev 566) @@ -21,7 +21,14 @@ import javax.xml.namespace.QName; +import org.pi4soa.cdl.Choreography; +import org.pi4soa.cdl.DefaultCDLVisitor; import org.pi4soa.cdl.ExchangeDetails; +import org.pi4soa.cdl.Interaction; +import org.pi4soa.cdl.Participant; +import org.pi4soa.cdl.ParticipantType; +import org.pi4soa.cdl.util.CDLTypeUtil; +import org.pi4soa.common.xml.XMLUtils; import org.savara.common.model.util.PropertyName; import org.savara.common.model.util.TypeSystem; import org.scribble.protocol.model.*; @@ -31,8 +38,6 @@ */ public class ConverterUtil { - private static final String QNAME = "QName"; - /** * This method converts the supplied information type into a * type reference. @@ -93,4 +98,180 @@ return(ret); } + public static java.util.List<Role> getRoleParameters(final Choreography choreo) { + java.util.List<Role> ret=new java.util.Vector<Role>(); + + // If root choreo, then no parameters + if (choreo.getRoot() == Boolean.TRUE) { + return(ret); + } + + final java.util.List<ParticipantType> partTypes=new java.util.Vector<ParticipantType>(); + final java.util.List<Participant> partInstances=new java.util.Vector<Participant>(); + + choreo.visit(new DefaultCDLVisitor() { + + // TODO: SAVARA-161 May also need to handle 'perform' (and take care of recursion), + // as a participant type may not be used in an intermediate sub-choreo, + // but still would need to be passed through it to any child sub-choreos. + // Sub-choreos should not process participant instances, so need to ignore these + // if not the primary choreo being visited. + + public void interaction(Interaction interaction) { + + if (interaction.getEnclosingChoreography() != choreo) { + return; + } + + if (interaction.getFromParticipant() != null) { + if (partInstances.contains(interaction.getFromParticipant()) == false) { + partInstances.add(interaction.getFromParticipant()); + } + } else { + ParticipantType ptype= + org.pi4soa.cdl.util.PackageUtil.getParticipantForRoleType( + interaction.getFromRoleType()); + + if (ptype != null && + partTypes.contains(ptype) == false) { + partTypes.add(ptype); + } + } + + if (interaction.getToParticipant() != null) { + if (partInstances.contains(interaction.getToParticipant()) == false) { + partInstances.add(interaction.getToParticipant()); + } + } else { + ParticipantType ptype= + org.pi4soa.cdl.util.PackageUtil.getParticipantForRoleType( + interaction.getToRoleType()); + + if (ptype != null && + partTypes.contains(ptype) == false) { + partTypes.add(ptype); + } + } + } + }); + + // Define roles + java.util.Iterator<ParticipantType> ptiter=partTypes.iterator(); + + while (ptiter.hasNext()) { + ParticipantType ptype=ptiter.next(); + + Role role=new Role(); + role.setName(XMLUtils.getLocalname(ptype.getName())); + role.getProperties().put(PropertyName.NAMESPACE, + CDLTypeUtil.getNamespace(ptype.getName(), ptype, true)); + + ret.add(role); + } + + java.util.Iterator<Participant> piter=partInstances.iterator(); + + while (piter.hasNext()) { + Participant pinst=piter.next(); + + // Only include 'free' participant instances, as these are bound by + // a calling protocol. + if (pinst.getFree() == Boolean.TRUE) { + Role role=new Role(); + role.setName(XMLUtils.getLocalname(pinst.getName())); + role.getProperties().put(PropertyName.NAMESPACE, + CDLTypeUtil.getNamespace(pinst.getName(), pinst, true)); + + ret.add(role); + } + } + + return(ret); + } + + public static java.util.List<Role> getRoleDeclarations(final Choreography choreo) { + java.util.List<Role> ret=new java.util.Vector<Role>(); + + final java.util.List<ParticipantType> partTypes=new java.util.Vector<ParticipantType>(); + final java.util.List<Participant> partInstances=new java.util.Vector<Participant>(); + + choreo.visit(new DefaultCDLVisitor() { + + public void interaction(Interaction interaction) { + + if (interaction.getEnclosingChoreography() != choreo) { + return; + } + + if (interaction.getFromParticipant() != null) { + if (partInstances.contains(interaction.getFromParticipant()) == false) { + partInstances.add(interaction.getFromParticipant()); + } + } else { + ParticipantType ptype= + org.pi4soa.cdl.util.PackageUtil.getParticipantForRoleType( + interaction.getFromRoleType()); + + if (ptype != null && + partTypes.contains(ptype) == false) { + partTypes.add(ptype); + } + } + + if (interaction.getToParticipant() != null) { + if (partInstances.contains(interaction.getToParticipant()) == false) { + partInstances.add(interaction.getToParticipant()); + } + } else { + ParticipantType ptype= + org.pi4soa.cdl.util.PackageUtil.getParticipantForRoleType( + interaction.getToRoleType()); + + if (ptype != null && + partTypes.contains(ptype) == false) { + partTypes.add(ptype); + } + } + } + }); + + // Define roles + + if (choreo.getRoot() == Boolean.TRUE) { + // Use complete list for now - when SAVARA-161 being fixed, then could use + // the participant type list returned from scanning the full choreo + java.util.Iterator<ParticipantType> ptiter=// partTypes.iterator(); + choreo.getPackage().getTypeDefinitions().getParticipantTypes().iterator(); + + while (ptiter.hasNext()) { + ParticipantType ptype=ptiter.next(); + + Role role=new Role(); + role.setName(XMLUtils.getLocalname(ptype.getName())); + role.getProperties().put(PropertyName.NAMESPACE, + CDLTypeUtil.getNamespace(ptype.getName(), ptype, true)); + + ret.add(role); + } + } + + java.util.Iterator<Participant> piter=partInstances.iterator(); + + while (piter.hasNext()) { + Participant pinst=piter.next(); + + // Check that not a 'free' participant instance - i.e. is not bound + // from outer choreo + if (pinst.getFree() == Boolean.FALSE) { + Role role=new Role(); + role.setName(XMLUtils.getLocalname(pinst.getName())); + role.getProperties().put(PropertyName.NAMESPACE, + CDLTypeUtil.getNamespace(pinst.getName(), pinst, true)); + + ret.add(role); + } + } + + return(ret); + } } 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-10 19:42:04 UTC (rev 565) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/DefaultConverterContext.java 2011-01-12 13:42:44 UTC (rev 566) @@ -24,6 +24,7 @@ import org.pi4soa.cdl.Choreography; import org.pi4soa.cdl.ExchangeDetails; import org.scribble.common.logging.Journal; +import org.scribble.protocol.ProtocolContext; import org.scribble.protocol.model.*; /** @@ -32,12 +33,14 @@ public class DefaultConverterContext implements ConverterContext { private Journal m_journal=null; + private ProtocolContext m_context=null; /** * Default constructor. */ - public DefaultConverterContext(Journal journal) { + public DefaultConverterContext(Journal journal, ProtocolContext context) { m_journal = journal; + m_context = context; } /** @@ -64,6 +67,15 @@ */ /** + * This method returns the protocol context. + * + * @return The protocol context + */ + public ProtocolContext getProtocolContext() { + return(m_context); + } + + /** * This method returns the journal for reporting issues. * * @return The journal Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/PerformConverterRuleImpl.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/PerformConverterRuleImpl.java 2011-01-10 19:42:04 UTC (rev 565) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/PerformConverterRuleImpl.java 2011-01-12 13:42:44 UTC (rev 566) @@ -65,8 +65,25 @@ context.pushScope(); // Define roles - ProtocolConverterRuleImpl.defineRoles(context, cdl.getChoreography(), (Block)ret); + //ProtocolConverterRuleImpl.defineRoles(context, cdl.getChoreography(), (Block)ret); + java.util.List<Role> roles=ConverterUtil.getRoleParameters(cdl.getChoreography()); + for (Role r : roles) { + context.setState(r.getName(), r); + } + + roles = ConverterUtil.getRoleDeclarations(cdl.getChoreography()); + + if (roles.size() > 0) { + RoleList rl=new RoleList(); + for (Role r : roles) { + rl.getRoles().add(r); + context.setState(r.getName(), r); + } + ((Block)ret).add(rl); + } + + // Convert sub-activities ProtocolConverterRuleImpl.convertActivities(context, cdl.getChoreography().getActivities(), (Block)ret); context.popScope(); @@ -88,6 +105,15 @@ run.setProtocolReference(ref); + // Generate roles + java.util.List<Role> roles=ConverterUtil.getRoleParameters(cdl.getChoreography()); + + for (Role r : roles) { + Parameter p=new Parameter(); + p.setName(r.getName()); + run.getParameters().add(p); + } + // Convert binding parameters java.util.List<BindDetails> bds=cdl.getBindDetails(); @@ -95,6 +121,11 @@ // Only convert if a variable, not a channel // TODO: Need to also convert explicit channels + + /* TODO SAVARA-160 Don't convert variables for now, as protocol does not + * use them. However when assertions are defined, they may be + * useful, and also if participants are bound. + * if (bds.get(i).getThisVariable() instanceof org.pi4soa.cdl.Variable) { Parameter db=new Parameter(); @@ -102,13 +133,14 @@ if (state instanceof Role) { db.setName(((Role)state).getName()); - db.setBoundName(bds.get(i).getFreeVariable().getName()); + //db.setBoundName(bds.get(i).getFreeVariable().getName()); run.getParameters().add(db); } else { logger.finer("State not found for '"+bds.get(i).getThisVariable().getName()+"'"); } } + */ } ret = run; @@ -117,5 +149,5 @@ return(ret); } - private static Logger logger = Logger.getLogger("org.pi4soa.scribble.cdm.parser.rules"); + private static Logger logger = Logger.getLogger("org.savara.pi4soa.cdm.parser.rules"); } 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-10 19:42:04 UTC (rev 565) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolConverterRuleImpl.java 2011-01-12 13:42:44 UTC (rev 566) @@ -82,8 +82,31 @@ ret.setName(choreo.getName()); // Define roles - defineRoles(context, choreo, ret.getBlock()); + //defineRoles(context, choreo, ret.getBlock()); + java.util.List<Role> roles=ConverterUtil.getRoleParameters(choreo); + for (Role r : roles) { + ParameterDefinition pd=new ParameterDefinition(); + pd.setName(r.getName()); + ret.getParameterDefinitions().add(pd); + + context.setState(r.getName(), r); + } + + roles = ConverterUtil.getRoleDeclarations(choreo); + + if (roles.size() > 0) { + RoleList rl=new RoleList(); + + for (Role r : roles) { + rl.getRoles().add(r); + + context.setState(r.getName(), r); + } + + ret.getBlock().add(rl); + } + // Check if root, then need to project other sibling choreos if (choreo.getRoot() == Boolean.TRUE) { @@ -250,7 +273,7 @@ return(ret); } - + /* protected static void defineRoles(ConverterContext context, final Choreography choreo, Block block) { @@ -320,61 +343,6 @@ roleList.getRoles().add(role); context.setState(role.getName(), role); - - // TODO: registerRole seems to only deal with ConversationType - // which is not required when using TAP - //registerRole(context, choreo, conv, roleList, role, pinst); - - // Setup interfaces - /* - for (int i=0; i < pinst.getRoleTypes().size(); i++) { - Contract contract=null; - - if (role.getProperties().containsKey(Contract.class.getName())) { - contract = (Contract)role.getProperties().get( - Contract.class.getName()); - } else { - contract = new Contract(); - - java.util.List<?> ptypes= - PackageUtil.getParticipantsForRoleTypes(choreo.getPackage(), - pinst.getRoleTypes()); - - if (ptypes.size() == 1) { - ParticipantType pt=(ParticipantType)ptypes.get(0); - - contract.setName(XMLUtils.getLocalname(pt.getName())); - contract.setNamespace(CDLTypeUtil.getNamespace(pt.getName(), pt)); - } else { - - logger.warning("Could not find single participant type for participant instance '"+ - pinst.getName()+"'"); - contract.setName(XMLUtils.getLocalname(pinst.getName())); - contract.setNamespace(CDLTypeUtil.getNamespace(pinst.getName(), pinst)); - } - - // Setup namespace to prefix mappings - java.util.List<NameSpace> nspaces=pinst.getPackage().getTypeDefinitions().getNameSpaces(); - - for (int j=0; j < nspaces.size(); j++) { - org.savara.contract.model.Namespace ns= - new org.savara.contract.model.Namespace(); - - ns.setPrefix(nspaces.get(j).getPrefix()); - ns.setURI(nspaces.get(j).getURI()); - ns.setSchemaLocation(nspaces.get(j).getSchemaLocation()); - - contract.getNamespaces().add(ns); - } - - role.getProperties().put(Contract.class.getName(), - contract); - } - - setupInterfaces((org.pi4soa.cdl.RoleType)pinst.getRoleTypes().get(i), - contract, intfDeriver); - } - */ } java.util.Iterator<ParticipantType> ptiter=partTypes.iterator(); @@ -403,51 +371,9 @@ roleList.getRoles().add(role); context.setState(role.getName(), role); - - if (choreo.getRoot() == Boolean.TRUE) { - // TODO: registerRole seems to only deal with ConversationType - // which is not required when using TAP - //registerRole(context, choreo, conv, roleList, role, ptype); - - // Setup interfaces - /* - for (int i=0; i < ptype.getRoleTypes().size(); i++) { - Contract contract=null; - - if (role.getProperties().containsKey(Contract.class.getName())) { - contract = (Contract)role.getProperties().get( - Contract.class.getName()); - } else { - contract = new Contract(); - - contract.setName(XMLUtils.getLocalname(ptype.getName())); - contract.setNamespace(CDLTypeUtil.getNamespace(ptype.getName(), ptype, true)); - - // Setup namespace to prefix mappings - java.util.List<NameSpace> nspaces=ptype.getPackage().getTypeDefinitions().getNameSpaces(); - - for (int j=0; j < nspaces.size(); j++) { - org.savara.contract.model.Namespace ns= - new org.savara.contract.model.Namespace(); - - ns.setPrefix(nspaces.get(j).getPrefix()); - ns.setURI(nspaces.get(j).getURI()); - ns.setSchemaLocation(nspaces.get(j).getSchemaLocation()); - - contract.getNamespaces().add(ns); - } - - role.getProperties().put(Contract.class.getName(), - contract); - } - - setupInterfaces((org.pi4soa.cdl.RoleType)ptype.getRoleTypes().get(i), - contract, intfDeriver); - } - */ - } } } + */ /* protected static void setupInterfaces(org.pi4soa.cdl.RoleType roleType, Contract contract, @@ -694,6 +620,7 @@ private static Logger logger = Logger.getLogger(ProtocolConverterRuleImpl.class.getPackage().getName()); + /* public static class InterfaceVisitorImpl implements InterfaceVisitor, java.io.Serializable { @@ -764,12 +691,6 @@ if (defn.getElement() != null && defn.getElement().trim().length() > 0) { td.setName(defn.getElement()); - /* - if (defn.getElementNamespace() != null) { - td.setNamespace(defn.getElementNamespace()); - } - */ - QName qname=new QName(defn.getElementNamespace(), defn.getElement()); td.setDataType(qname.toString()); @@ -777,13 +698,7 @@ } else if (defn.getType() != null && defn.getType().trim().length() > 0) { td.setName(defn.getType()); - - /* - if (defn.getTypeNamespace() != null) { - td.setNamespace(defn.getTypeNamespace()); - } - */ - + QName qname=new QName(defn.getTypeNamespace(), defn.getType()); td.setDataType(qname.toString()); @@ -827,4 +742,5 @@ } } + */ } 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-10 19:42:04 UTC (rev 565) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolModelConverterRuleImpl.java 2011-01-12 13:42:44 UTC (rev 566) @@ -150,7 +150,7 @@ // Derive contracts associated with the protocol model ContractGenerator cg=ContractGeneratorFactory.getContractGenerator(); if (cg != null) { - cg.generate(ret, context.getJournal()); + cg.generate(ret, context.getJournal(), context.getProtocolContext()); } return(ret); Added: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/rules/ConverterUtilTest.java =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/rules/ConverterUtilTest.java (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/rules/ConverterUtilTest.java 2011-01-12 13:42:44 UTC (rev 566) @@ -0,0 +1,234 @@ +/* + * 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.pi4soa.cdm.parser.rules; + +import static org.junit.Assert.*; + +import org.pi4soa.cdl.CDLManager; +import org.savara.common.util.ScribbleServices; +import org.scribble.common.logging.Journal; +import org.scribble.protocol.model.ProtocolModel; +import org.scribble.protocol.model.Role; + +public class ConverterUtilTest { + + @org.junit.Test + public void testGetRoleDeclarationsTopChoreo() { + org.pi4soa.cdl.Package cdlpack=null; + + try { + cdlpack = CDLManager.load("cdm/ESBBroker.cdm"); + } catch(Exception e) { + e.printStackTrace(); + fail("Failed to load choreography: "+e); + } + + if (cdlpack.getChoreographies().size() != 1) { + fail("Expecting only one top level choreo"); + } + + java.util.List<Role> roles=ConverterUtil.getRoleDeclarations(cdlpack.getChoreographies().get(0)); + + if (roles.size() != 4) { + fail("Was expecting 4 roles"); + } + + if (roles.contains(new Role("Broker")) == false) { + fail("Broker not found"); + } + + if (roles.contains(new Role("Buyer")) == false) { + fail("Buyer not found"); + } + + if (roles.contains(new Role("CreditAgency")) == false) { + fail("CreditAgency not found"); + } + + // Maybe only until the search is refined to used participant types + if (roles.contains(new Role("Supplier")) == false) { + fail("Supplier not found"); + } + } + + @org.junit.Test + public void testGetRoleDeclarationsSubChoreo1() { + org.pi4soa.cdl.Package cdlpack=null; + + try { + cdlpack = CDLManager.load("cdm/ESBBroker.cdm"); + } catch(Exception e) { + e.printStackTrace(); + fail("Failed to load choreography: "+e); + } + + if (cdlpack.getChoreographies().size() != 1) { + fail("Expecting only one top level choreo"); + } + + org.pi4soa.cdl.Choreography top=cdlpack.getChoreographies().get(0); + + org.pi4soa.cdl.Choreography sub=top.getEnclosedChoreography("RequestForQuote"); + + if (sub == null) { + fail("Failed to get 'RequestForQuote' sub-choreo"); + } + + java.util.List<Role> roles=ConverterUtil.getRoleDeclarations(sub); + + if (roles.size() != 1) { + fail("Was expecting 1 roles"); + } + + if (roles.contains(new Role("SupplierQuoteEngine")) == false) { + fail("SupplierQuoteEngine not found"); + } + } + + @org.junit.Test + public void testGetRoleDeclarationsSubChoreo2() { + org.pi4soa.cdl.Package cdlpack=null; + + try { + cdlpack = CDLManager.load("cdm/ESBBroker.cdm"); + } catch(Exception e) { + e.printStackTrace(); + fail("Failed to load choreography: "+e); + } + + if (cdlpack.getChoreographies().size() != 1) { + fail("Expecting only one top level choreo"); + } + + org.pi4soa.cdl.Choreography top=cdlpack.getChoreographies().get(0); + + org.pi4soa.cdl.Choreography sub=top.getEnclosedChoreography("CompleteTransaction"); + + if (sub == null) { + fail("Failed to get 'CompleteTransaction' sub-choreo"); + } + + java.util.List<Role> roles=ConverterUtil.getRoleDeclarations(sub); + + if (roles.size() != 1) { + fail("Was expecting 1 roles"); + } + + if (roles.contains(new Role("SupplierTxnProcessor")) == false) { + fail("SupplierTxnProcessor not found"); + } + } + + @org.junit.Test + public void testGetRoleParametersTopChoreo() { + org.pi4soa.cdl.Package cdlpack=null; + + try { + cdlpack = CDLManager.load("cdm/ESBBroker.cdm"); + } catch(Exception e) { + e.printStackTrace(); + fail("Failed to load choreography: "+e); + } + + if (cdlpack.getChoreographies().size() != 1) { + fail("Expecting only one top level choreo"); + } + + java.util.List<Role> roles=ConverterUtil.getRoleParameters(cdlpack.getChoreographies().get(0)); + + if (roles.size() != 0) { + fail("Was expecting 0 roles"); + } + } + + @org.junit.Test + public void testGetRoleParametersSubChoreo1() { + org.pi4soa.cdl.Package cdlpack=null; + + try { + cdlpack = CDLManager.load("cdm/ESBBroker.cdm"); + } catch(Exception e) { + e.printStackTrace(); + fail("Failed to load choreography: "+e); + } + + if (cdlpack.getChoreographies().size() != 1) { + fail("Expecting only one top level choreo"); + } + + org.pi4soa.cdl.Choreography top=cdlpack.getChoreographies().get(0); + + org.pi4soa.cdl.Choreography sub=top.getEnclosedChoreography("RequestForQuote"); + + if (sub == null) { + fail("Failed to get 'RequestForQuote' sub-choreo"); + } + + java.util.List<Role> roles=ConverterUtil.getRoleParameters(sub); + + if (roles.size() != 1) { + fail("Was expecting 1 roles"); + } + + if (roles.contains(new Role("Broker")) == false) { + fail("Broker not found"); + } + } + + @org.junit.Test + public void testGetRoleParametersSubChoreo2() { + org.pi4soa.cdl.Package cdlpack=null; + + try { + cdlpack = CDLManager.load("cdm/ESBBroker.cdm"); + } catch(Exception e) { + e.printStackTrace(); + fail("Failed to load choreography: "+e); + } + + if (cdlpack.getChoreographies().size() != 1) { + fail("Expecting only one top level choreo"); + } + + org.pi4soa.cdl.Choreography top=cdlpack.getChoreographies().get(0); + + org.pi4soa.cdl.Choreography sub=top.getEnclosedChoreography("CompleteTransaction"); + + if (sub == null) { + fail("Failed to get 'CompleteTransaction' sub-choreo"); + } + + java.util.List<Role> roles=ConverterUtil.getRoleParameters(sub); + + if (roles.size() != 3) { + fail("Was expecting 3 roles"); + } + + if (roles.contains(new Role("Broker")) == false) { + fail("Broker not found"); + } + + if (roles.contains(new Role("Buyer")) == false) { + fail("Buyer not found"); + } + + if (roles.contains(new Role("CreditAgency")) == false) { + fail("CreditAgency not found"); + } + } +} Added: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/cdm/ESBBroker.cdm =================================================================== --- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/cdm/ESBBroker.cdm (rev 0) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/resources/cdm/ESBBroker.cdm 2011-01-12 13:42:44 UTC (rev 566) @@ -0,0 +1,128 @@ +<?xml version="1.0" encoding="UTF-8"?> +<org.pi4soa.cdl:Package xmi:version="2.0" xmlns:xmi="http://www.omg.org/XMI" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:org.pi4soa.cdl="http:///org/pi4soa/cdl.ecore" description="The choreography description for ESBBroker" name="ESBBroker" author="gary" version="0.2" targetNamespace="http://www.pi4soa.org/ESBBroker"> + <typeDefinitions> + <nameSpaces description="Target Namespace for ESBBroker" prefix="tns" uRI="http://www.pi4soa.org/ESBBroker"/> + <nameSpaces description="XML Schema Namespace" prefix="xsd" uRI="http://www.w3.org/2001/XMLSchema"/> + <nameSpaces description="Target Namespace for ESBBroker" prefix="brk" uRI="http://www.pi4soa.org/ESBBroker/Broker"/> + <nameSpaces description="Target Namespace for ESBBroker" prefix="byr" uRI="http://www.pi4soa.org/ESBBroker/Buyer"/> + <nameSpaces description="Target Namespace for ESBBroker" prefix="cay" uRI="http://www.pi4soa.org/ESBBroker/CreditAgency"/> + <nameSpaces description="Target Namespace for ESBBroker" prefix="spr" uRI="http://www.pi4soa.org/ESBBroker/Supplier"/> + <informationTypes description="This is the information type BookingReference" name="BookingReference" elementName="bookingReference"/> + <informationTypes description="This is the information type Buy" name="Buy" elementName="buy"/> + <informationTypes description="This is the information type Cancel" name="Cancel" elementName="cancel"/> + <informationTypes description="This is the information type CreditInformation" name="CreditInformation" elementName="CreditCheckRequest"/> + <informationTypes description="This is the information type CreditInvalid" name="CreditInvalid" elementName="CreditCheckInvalid"/> + <informationTypes description="This is the information type CreditValid" name="CreditValid" elementName="CreditCheckOk"/> + <informationTypes description="This is the information type Enquiry" name="Enquiry" typeName="" elementName="enquiry"/> + <informationTypes description="This is the information type OrderConfirmed" name="OrderConfirmed" elementName="orderConfirmed"/> + <informationTypes description="This is the information type OrderRejected" name="OrderRejected" elementName="orderRejected"/> + <informationTypes description="This is the information type Quote" name="Quote" elementName="quote"/> + <informationTypes description="This is the information type QuoteList" name="QuoteList" elementName="quoteList"/> + <informationTypes description="This is the information type RequestForQuote" name="RequestForQuote" elementName="requestForQuote"/> + <informationTypes description="This is the information type URIType" name="URIType"/> + <tokens description="This is the token URI" name="URI" informationType="//@typeDefinitions/(a)informationTypes.12"/> + <roleTypes description="This is the role type Broker" name="Broker"> + <behaviors description="This is the behavior BrokerBehavior" name="BrokerBehavior"/> + </roleTypes> + <roleTypes description="This is the role type Buyer" name="Buyer"> + <behaviors description="This is the behavior BuyerBehavior" name="BuyerBehavior"/> + </roleTypes> + <roleTypes description="This is the role type CreditAgency" name="CreditAgency"> + <behaviors description="This is the behavior CreditAgencyBehavior" name="CreditAgencyBehavior"/> + </roleTypes> + <roleTypes description="This is the role type Supplier" name="Supplier"> + <behaviors description="This is the behavior SupplierBehavior" name="SupplierBehavior"/> + </roleTypes> + <relationshipTypes description="Relationship between Broker and CreditAgency" name="BrokerToCreditAgencyRel" firstRoleType="//@typeDefinitions/(a)roleTypes.0" secondRoleType="//@typeDefinitions/(a)roleTypes.2"/> + <relationshipTypes description="Relationship between Broker and Supplier" name="BrokerToSupplierRel" firstRoleType="//@typeDefinitions/(a)roleTypes.0" secondRoleType="//@typeDefinitions/(a)roleTypes.3"/> + <relationshipTypes description="Relationship between Buyer and Broker" name="BuyerToBrokerRel" firstRoleType="//@typeDefinitions/(a)roleTypes.1" secondRoleType="//@typeDefinitions/(a)roleTypes.0"/> + <participantTypes description="This is the participant type brk:Broker" name="brk:Broker" roleTypes="//@typeDefinitions/(a)roleTypes.0"> + <semanticAnnotations annotation="overlord.cdl.samples.LoanBroker@Broker" name="conversationType"/> + </participantTypes> + <participantTypes description="This is the participant type byr:Buyer" name="byr:Buyer" roleTypes="//@typeDefinitions/(a)roleTypes.1"> + <semanticAnnotations annotation="overlord.cdl.samples.LoanBroker@Buyer" name="conversationType"/> + </participantTypes> + <participantTypes description="This is the participant type cay:CreditAgency" name="cay:CreditAgency" roleTypes="//@typeDefinitions/(a)roleTypes.2"> + <semanticAnnotations annotation="overlord.cdl.samples.Common@CreditAgency" name="conversationType"/> + </participantTypes> + <participantTypes description="This is the participant type spr:Supplier" name="spr:Supplier" roleTypes="//@typeDefinitions/(a)roleTypes.3"> + <semanticAnnotations annotation="" name="conversationType"/> + </participantTypes> + <channelTypes description="This is the channel type BrokerChannelType" name="BrokerChannelType" referenceToken="//@typeDefinitions/(a)tokens.0" roleType="//@typeDefinitions/(a)roleTypes.0"/> + <channelTypes description="This is the channel type CreditAgencyChannelType" name="CreditAgencyChannelType" referenceToken="//@typeDefinitions/(a)tokens.0" roleType="//@typeDefinitions/(a)roleTypes.2"/> + <channelTypes description="This is the channel type SupplierChannelType" name="SupplierChannelType" referenceToken="//@typeDefinitions/(a)tokens.0" roleType="//@typeDefinitions/(a)roleTypes.3"/> + </typeDefinitions> + <choreographies description="Choreography flow for the ESBBroker process" name="ESBBrokerProcess" root="true"> + <enclosedChoreographies name="CompleteTransaction"> + <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"/> + <variableDefinitions description="Channel to facilitate interaction to CreditAgency" name="CreditAgencyChannel" type="//@typeDefinitions/(a)channelTypes.1"/> + <variableDefinitions description="Channel to facilitate interaction to Supplier" name="SupplierChannel" type="//@typeDefinitions/(a)channelTypes.2"/> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="Buy" operation="buy" channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.2"> + <exchangeDetails description="This is the exchange details for the request exchange associated with interaction Buy" name="BuyRequestExchange" type="//@typeDefinitions/(a)informationTypes.1"/> + </activities> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="CheckCredit" operation="checkCredit" channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.1" relationship="//@typeDefinitions/(a)relationshipTypes.0"> + <exchangeDetails description="This is the exchange details for the request exchange associated with interaction CheckCredit" name="CheckCreditRequestExchange" type="//@typeDefinitions/(a)informationTypes.3"/> + </activities> + <activities xsi:type="org.pi4soa.cdl:Choice" description="Evaluate Credit Check Result"> + <activities xsi:type="org.pi4soa.cdl:Sequence" description="Sufficient Credit"> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="CheckCreditResponse" operation="checkCredit" channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.1" relationship="//@typeDefinitions/(a)relationshipTypes.0"> + <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CheckCreditResponse" name="CheckCreditResponseRespondExchange" type="//@typeDefinitions/(a)informationTypes.5" action="Respond"/> + </activities> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="ConfirmBooking" operation="confirm" channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.2" relationship="//@typeDefinitions/(a)relationshipTypes.1" toParticipant="//@choreographies.0/@enclosedChoreographies.0/(a)participantDefinitions.0"> + <exchangeDetails description="This is the exchange details for the request exchange associated with interaction ConfirmBooking" name="ConfirmBookingRequestExchange" type="//@typeDefinitions/(a)informationTypes.7"/> + <exchangeDetails description="This is the exchange details for the request exchange associated with interaction ConfirmBooking" name="ConfirmBookingRequestExchange" type="//@typeDefinitions/(a)informationTypes.0" action="Respond"/> + </activities> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="Buy" operation="buy" channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.2"> + <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction Buy" name="BuyRespondExchange" type="//@typeDefinitions/(a)informationTypes.0" action="Respond" faultName=""/> + </activities> + </activities> + <activities xsi:type="org.pi4soa.cdl:Sequence" description="Insufficient Credit"> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="CheckCreditFailed" operation="checkCredit" channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.1" relationship="//@typeDefinitions/(a)relationshipTypes.0"> + <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CheckCreditFailed" name="CheckCreditFailedRespondExchange" type="//@typeDefinitions/(a)informationTypes.4" action="Respond" faultName="invalidCredit"/> + </activities> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="Buy" operation="buy" channelVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.2"> + <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction Buy" name="BuyRespondExchange" type="//@typeDefinitions/(a)informationTypes.8" action="Respond" faultName="rejected"/> + </activities> + </activities> + </activities> + </enclosedChoreographies> + <enclosedChoreographies name="RequestForQuote"> + <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"/> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="RFQ" operation="getQuote" channelVariable="//@choreographies.0/@enclosedChoreographies.1/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.1" toParticipant="//@choreographies.0/@enclosedChoreographies.1/(a)participantDefinitions.0"> + <exchangeDetails description="This is the exchange details for the request exchange associated with interaction RFQ" name="RFQRequestExchange" type="//@typeDefinitions/(a)informationTypes.11"/> + <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction RFQ" name="RFQRespondExchange" type="//@typeDefinitions/(a)informationTypes.9" action="Respond"/> + </activities> + </enclosedChoreographies> + <variableDefinitions description="Channel to facilitate interaction to Broker" name="BrokerChannel" type="//@typeDefinitions/(a)channelTypes.0" roleTypes="//@typeDefinitions/(a)roleTypes.0 //@typeDefinitions/(a)roleTypes.1"/> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="Enquiry" operation="makeEnquiry" channelVariable="//@choreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.2"> + <exchangeDetails description="This is the exchange details for the request exchange associated with interaction Enquiry" name="EnquiryRequestExchange" type="//@typeDefinitions/(a)informationTypes.6"/> + </activities> + <activities xsi:type="org.pi4soa.cdl:While" name="SendRFQToSuppliers"> + <activities xsi:type="org.pi4soa.cdl:Perform" choreography="//@choreographies.0/(a)enclosedChoreographies.1"/> + </activities> + <activities xsi:type="org.pi4soa.cdl:When" name="WhenQuotesReceivedOrTimeout"> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="Enquiry" operation="makeEnquiry" channelVariable="//@choreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.2"> + <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction Enquiry" name="EnquiryRespondExchange" type="//@typeDefinitions/(a)informationTypes.10" action="Respond"/> + </activities> + </activities> + <activities xsi:type="org.pi4soa.cdl:Choice"> + <activities xsi:type="org.pi4soa.cdl:Sequence"> + <activities xsi:type="org.pi4soa.cdl:Perform" choreography="//@choreographies.0/(a)enclosedChoreographies.0" waitForCompletion="false"> + <bindDetails name="BindBrokerChannel" thisVariable="//@choreographies.0/(a)variableDefinitions.0" thisRole="//@typeDefinitions/(a)roleTypes.1" freeVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0" freeRole="//@typeDefinitions/(a)roleTypes.1"/> + <bindDetails name="BindBrokerChannel" thisVariable="//@choreographies.0/(a)variableDefinitions.0" thisRole="//@typeDefinitions/(a)roleTypes.0" freeVariable="//@choreographies.0/@enclosedChoreographies.0/(a)variableDefinitions.0" freeRole="//@typeDefinitions/(a)roleTypes.0"/> + </activities> + </activities> + <activities xsi:type="org.pi4soa.cdl:Sequence"> + <activities xsi:type="org.pi4soa.cdl:Interaction" name="Cancel" operation="cancel" channelVariable="//@choreographies.0/(a)variableDefinitions.0" relationship="//@typeDefinitions/(a)relationshipTypes.2"> + <exchangeDetails description="This is the exchange details for the request exchange associated with interaction Cancel" name="CancelRequestExchange" type="//@typeDefinitions/(a)informationTypes.2"/> + </activities> + </activities> + </activities> + </choreographies> +</org.pi4soa.cdl:Package> 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-10 19:42:04 UTC (rev 565) +++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java 2011-01-12 13:42:44 UTC (rev 566) @@ -45,6 +45,8 @@ import org.savara.wsdl.generator.soap.SOAPDocLitWSDLBinding; import org.scribble.common.logging.CachedJournal; import org.scribble.common.logging.Journal; +import org.scribble.common.resource.DefaultResourceLocator; +import org.scribble.protocol.DefaultProtocolContext; import org.scribble.protocol.model.*; import org.eclipse.core.runtime.*; import org.eclipse.jst.common.project.facet.WtpUtils; @@ -218,8 +220,11 @@ CachedJournal journal=new CachedJournal(); + DefaultProtocolContext context=new DefaultProtocolContext(ScribbleServices.getParserManager(), + new DefaultResourceLocator(cdmResource.getParent().getFullPath().toFile())); + ProtocolModel local=ScribbleServices.getProtocolProjector().project(m_protocolModel, - localRole, journal); + localRole, journal, context); if (local != null) { // TODO: Obtain model generator from manager class (SAVARA-156)

13 years, 5 months

1
0
0 / 0

savara SVN: r565 - in branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm: META-INF and 1 other directories.

by do-not-reply＠jboss.org

Author: objectiser Date: 2011-01-10 14:42:04 -0500 (Mon, 10 Jan 2011) New Revision: 565 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/pom.xml branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/CDMProtocolParserTest.java Log: Main distribution and tools build now working. 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-09 23:22:28 UTC (rev 564) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/META-INF/MANIFEST.MF 2011-01-10 19:42:04 UTC (rev 565) @@ -15,6 +15,7 @@ org.scribble.common, org.scribble.protocol, org.junit, - org.savara.common + org.savara.common, + org.scribble.protocol.projection Export-Package: org.savara.pi4soa.cdm, org.savara.pi4soa.cdm.parser 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-09 23:22:28 UTC (rev 564) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/pom.xml 2011-01-10 19:42:04 UTC (rev 565) @@ -70,6 +70,12 @@ <version>${emfecore.version}</version> </dependency> <dependency> + <groupId>org.scribble.bundles</groupId> + <artifactId>org.scribble.protocol.projection</artifactId> + <version>${scribble.version}</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>${junit.version}</version> 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-09 23:22:28 UTC (rev 564) +++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/CDMProtocolParserTest.java 2011-01-10 19:42:04 UTC (rev 565) @@ -2,6 +2,7 @@ import static org.junit.Assert.*; +import org.savara.common.util.ScribbleServices; import org.scribble.common.logging.Journal; import org.scribble.protocol.model.ProtocolModel; @@ -67,6 +68,12 @@ e.printStackTrace(); } } + + @org.junit.Before + public void setup() { + ScribbleServices.setProtocolProjector( + new org.scribble.protocol.projection.impl.ProtocolProjectorImpl()); + } @org.junit.Test public void testParse() {

13 years, 5 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

savara-commits January 2011