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

do-not-reply at jboss.org do-not-reply at jboss.org
Thu Jan 13 05:19:46 EST 2011


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 at Broker.bpel
   branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker at Buyer.bpel
   branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker at CreditAgency.bpel
   branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker at SupplierQuoteEngine.bpel
   branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker at SupplierTxnProcessor.bpel
   branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/PurchaseGoods at Buyer.bpel
   branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/PurchaseGoods at CreditAgency.bpel
   branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/PurchaseGoods at Store.bpel
   branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ReqRespFault at Buyer.bpel
   branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ReqRespFault at 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 at Broker.bpel
   branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker at Buyer.bpel
   branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker at CreditAgency.bpel
   branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker at SupplierQuoteEngine.bpel
   branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker at SupplierTxnProcessor.bpel
   branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/PurchaseGoods at Buyer.bpel
   branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/PurchaseGoods at CreditAgency.bpel
   branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/PurchaseGoods at Store.bpel
   branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ReqRespFault at Buyer.bpel
   branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ReqRespFault at 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 at Broker"));
-        suite.addTest(new BPELToProtocolTest("ESBBrokerProcess_Buyer", "ESBBroker at Buyer"));  
-        suite.addTest(new BPELToProtocolTest("ESBBrokerProcess_CreditAgency", "ESBBroker at CreditAgency"));
-
-        suite.addTest(new BPELToProtocolTest("RequestForQuote_SupplierQuoteEngine", "ESBBroker at SupplierQuoteEngine"));
-        suite.addTest(new BPELToProtocolTest("CompleteTransaction_SupplierTxnProcessor", "ESBBroker at SupplierTxnProcessor"));
-
-        suite.addTest(new BPELToProtocolTest("PurchaseGoodsProcess_Buyer", "PurchaseGoods at Buyer"));
-        suite.addTest(new BPELToProtocolTest("PurchaseGoodsProcess_CreditAgency", "PurchaseGoods at CreditAgency"));
-        suite.addTest(new BPELToProtocolTest("PurchaseGoodsProcess_Store", "PurchaseGoods at Store"));
-        
-        suite.addTest(new BPELToProtocolTest("ReqRespFaultProcess_Buyer", "ReqRespFault at Buyer"));
-        suite.addTest(new BPELToProtocolTest("ReqRespFaultProcess_Seller", "ReqRespFault at 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 at Service", "LoanApprovalService at 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 at Broker"));
+        suite.addTest(new BPELToProtocolTest("ESBBrokerProcess_Buyer", "ESBBroker at Buyer"));  
+        suite.addTest(new BPELToProtocolTest("ESBBrokerProcess_CreditAgency", "ESBBroker at CreditAgency"));
+
+        suite.addTest(new BPELToProtocolTest("RequestForQuote_SupplierQuoteEngine", "ESBBroker at SupplierQuoteEngine"));
+        suite.addTest(new BPELToProtocolTest("CompleteTransaction_SupplierTxnProcessor", "ESBBroker at SupplierTxnProcessor"));
+
+        suite.addTest(new BPELToProtocolTest("PurchaseGoodsProcess_Buyer", "PurchaseGoods at Buyer"));
+        suite.addTest(new BPELToProtocolTest("PurchaseGoodsProcess_CreditAgency", "PurchaseGoods at CreditAgency"));
+        suite.addTest(new BPELToProtocolTest("PurchaseGoodsProcess_Store", "PurchaseGoods at Store"));
+        
+        suite.addTest(new BPELToProtocolTest("ReqRespFaultProcess_Buyer", "ReqRespFault at Buyer"));
+        suite.addTest(new BPELToProtocolTest("ReqRespFaultProcess_Seller", "ReqRespFault at 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 at Service", "LoanApprovalService at 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 at Broker.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker at 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 at 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 at Broker.bpel (from rev 568, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker at Broker.bpel)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker at Broker.bpel	                        (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker at 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 at Buyer.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker at 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 at 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 at Buyer.bpel (from rev 568, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker at Buyer.bpel)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker at Buyer.bpel	                        (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker at 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 at CreditAgency.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker at 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 at 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 at CreditAgency.bpel (from rev 568, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker at CreditAgency.bpel)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker at CreditAgency.bpel	                        (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker at 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 at SupplierQuoteEngine.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker at 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 at 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 at SupplierQuoteEngine.bpel (from rev 568, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker at SupplierQuoteEngine.bpel)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker at SupplierQuoteEngine.bpel	                        (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker at 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 at SupplierTxnProcessor.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker at 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 at 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 at SupplierTxnProcessor.bpel (from rev 568, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker at SupplierTxnProcessor.bpel)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker at SupplierTxnProcessor.bpel	                        (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ESBBroker at 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 at Buyer.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods at 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 at 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 at Buyer.bpel (from rev 564, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods at Buyer.bpel)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/PurchaseGoods at Buyer.bpel	                        (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/PurchaseGoods at 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 at CreditAgency.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods at 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 at 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 at CreditAgency.bpel (from rev 564, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods at CreditAgency.bpel)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/PurchaseGoods at CreditAgency.bpel	                        (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/PurchaseGoods at 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 at Store.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods at 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 at 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 at Store.bpel (from rev 564, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods at Store.bpel)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/PurchaseGoods at Store.bpel	                        (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/PurchaseGoods at 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 at Buyer.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ReqRespFault at 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 at 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 at Buyer.bpel (from rev 568, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ReqRespFault at Buyer.bpel)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ReqRespFault at Buyer.bpel	                        (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ReqRespFault at 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 at Seller.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ReqRespFault at 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 at 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 at Seller.bpel (from rev 568, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ReqRespFault at Seller.bpel)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ReqRespFault at Seller.bpel	                        (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.bundles.tests/src/test/resources/bpel/generator/results/ReqRespFault at 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/@children.0"/>
-    <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/>
-  </extensions>
-  <extensions>
-    <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@variables/@children.1"/>
-    <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/>
-  </extensions>
-  <extensions>
-    <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@variables/@children.2"/>
-    <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/>
-  </extensions>
-  <extensions>
-    <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@variables/@children.3"/>
-    <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:VariableExtension"/>
-  </extensions>
-  <extensions>
-    <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@variables/@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/@activities.0"/>
-    <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/>
-  </extensions>
-  <extensions>
-    <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@activity/@activities.1"/>
-    <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/>
-  </extensions>
-  <extensions>
-    <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@activity/@activities.1/@else/@activity"/>
-    <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/>
-  </extensions>
-  <extensions>
-    <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@activity/@activities.1/@else/@activity/@activities.0"/>
-    <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/>
-  </extensions>
-  <extensions>
-    <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@activity/@activities.1/@activity"/>
-    <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/>
-  </extensions>
-  <extensions>
-    <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@activity/@activities.1/@activity/@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/@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/@activity"/>
-    <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/>
-  </extensions>
-  <extensions>
-    <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@activity/@activities.1/@activity/@activities.0/@activity"/>
-    <extensionObject xsi:type="org.eclipse.bpel.ui.uiextensionmodel:ActivityExtension"/>
-  </extensions>
-  <extensions>
-    <extendedObject href="ESBBrokerProcess_Buyer.bpel#//@activity/@activities.1/@activity/@activities.0/@activity/@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_Buyer.wsdl" namespace="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/@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/@roleTypes.0" secondRoleType="//@typeDefinitions/@roleTypes.2"/>
-    <relationshipTypes description="Relationship between Broker and Supplier" name="BrokerToSupplierRel" firstRoleType="//@typeDefinitions/@roleTypes.0" secondRoleType="//@typeDefinitions/@roleTypes.3"/>
-    <relationshipTypes description="Relationship between Buyer and Broker" name="BuyerToBrokerRel" firstRoleType="//@typeDefinitions/@roleTypes.1" secondRoleType="//@typeDefinitions/@roleTypes.0"/>
-    <participantTypes description="This is the participant type brk:Broker" name="brk:Broker" roleTypes="//@typeDefinitions/@roleTypes.0">
-      <semanticAnnotations annotation="overlord.cdl.samples.LoanBroker at Broker" name="conversationType"/>
-    </participantTypes>
-    <participantTypes description="This is the participant type byr:Buyer" name="byr:Buyer" roleTypes="//@typeDefinitions/@roleTypes.1">
-      <semanticAnnotations annotation="overlord.cdl.samples.LoanBroker at Buyer" name="conversationType"/>
-    </participantTypes>
-    <participantTypes description="This is the participant type cay:CreditAgency" name="cay:CreditAgency" roleTypes="//@typeDefinitions/@roleTypes.2">
-      <semanticAnnotations annotation="overlord.cdl.samples.Common at CreditAgency" name="conversationType"/>
-    </participantTypes>
-    <participantTypes description="This is the participant type spr:Supplier" name="spr:Supplier" roleTypes="//@typeDefinitions/@roleTypes.3">
-      <semanticAnnotations annotation="" name="conversationType"/>
-    </participantTypes>
-    <channelTypes description="This is the channel type BrokerChannelType" name="BrokerChannelType" referenceToken="//@typeDefinitions/@tokens.0" roleType="//@typeDefinitions/@roleTypes.0"/>
-    <channelTypes description="This is the channel type CreditAgencyChannelType" name="CreditAgencyChannelType" referenceToken="//@typeDefinitions/@tokens.0" roleType="//@typeDefinitions/@roleTypes.2"/>
-    <channelTypes description="This is the channel type SupplierChannelType" name="SupplierChannelType" referenceToken="//@typeDefinitions/@tokens.0" roleType="//@typeDefinitions/@roleTypes.3"/>
-  </typeDefinitions>
-  <choreographies description="Choreography flow for the ESBBroker process" name="ESBBrokerProcess" root="true">
-    <enclosedChoreographies name="CompleteTransaction">
-      <participantDefinitions name="SupplierTxnProcessor" roleTypes="//@typeDefinitions/@roleTypes.3">
-        <semanticAnnotations annotation="overlord.cdl.samples.LoanBroker at SupplierTxnProcessor" name="conversationType"/>
-      </participantDefinitions>
-      <variableDefinitions description="Channel to facilitate interaction to Broker" name="BrokerChannel" type="//@typeDefinitions/@channelTypes.0" free="true" roleTypes="//@typeDefinitions/@roleTypes.0 //@typeDefinitions/@roleTypes.1"/>
-      <variableDefinitions description="Channel to facilitate interaction to CreditAgency" name="CreditAgencyChannel" type="//@typeDefinitions/@channelTypes.1"/>
-      <variableDefinitions description="Channel to facilitate interaction to Supplier" name="SupplierChannel" type="//@typeDefinitions/@channelTypes.2"/>
-      <activities xsi:type="org.pi4soa.cdl:Interaction" name="Buy" operation="buy" channelVariable="//@choreographies.0/@enclosedChoreographies.0/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.2">
-        <exchangeDetails description="This is the exchange details for the request exchange associated with interaction Buy" name="BuyRequestExchange" type="//@typeDefinitions/@informationTypes.1"/>
-      </activities>
-      <activities xsi:type="org.pi4soa.cdl:Interaction" name="CheckCredit" operation="checkCredit" channelVariable="//@choreographies.0/@enclosedChoreographies.0/@variableDefinitions.1" relationship="//@typeDefinitions/@relationshipTypes.0">
-        <exchangeDetails description="This is the exchange details for the request exchange associated with interaction CheckCredit" name="CheckCreditRequestExchange" type="//@typeDefinitions/@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/@variableDefinitions.1" relationship="//@typeDefinitions/@relationshipTypes.0">
-            <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CheckCreditResponse" name="CheckCreditResponseRespondExchange" type="//@typeDefinitions/@informationTypes.5" action="Respond"/>
-          </activities>
-          <activities xsi:type="org.pi4soa.cdl:Interaction" name="ConfirmBooking" operation="confirm" channelVariable="//@choreographies.0/@enclosedChoreographies.0/@variableDefinitions.2" relationship="//@typeDefinitions/@relationshipTypes.1" toParticipant="//@choreographies.0/@enclosedChoreographies.0/@participantDefinitions.0">
-            <exchangeDetails description="This is the exchange details for the request exchange associated with interaction ConfirmBooking" name="ConfirmBookingRequestExchange" type="//@typeDefinitions/@informationTypes.7"/>
-            <exchangeDetails description="This is the exchange details for the request exchange associated with interaction ConfirmBooking" name="ConfirmBookingRequestExchange" type="//@typeDefinitions/@informationTypes.0" action="Respond"/>
-          </activities>
-          <activities xsi:type="org.pi4soa.cdl:Interaction" name="Buy" operation="buy" channelVariable="//@choreographies.0/@enclosedChoreographies.0/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.2">
-            <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction Buy" name="BuyRespondExchange" type="//@typeDefinitions/@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/@variableDefinitions.1" relationship="//@typeDefinitions/@relationshipTypes.0">
-            <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CheckCreditFailed" name="CheckCreditFailedRespondExchange" type="//@typeDefinitions/@informationTypes.4" action="Respond" faultName="invalidCredit"/>
-          </activities>
-          <activities xsi:type="org.pi4soa.cdl:Interaction" name="Buy" operation="buy" channelVariable="//@choreographies.0/@enclosedChoreographies.0/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.2">
-            <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction Buy" name="BuyRespondExchange" type="//@typeDefinitions/@informationTypes.8" action="Respond" faultName="rejected"/>
-          </activities>
-        </activities>
-      </activities>
-    </enclosedChoreographies>
-    <enclosedChoreographies name="RequestForQuote">
-      <participantDefinitions name="SupplierQuoteEngine" roleTypes="//@typeDefinitions/@roleTypes.3">
-        <semanticAnnotations annotation="overlord.cdl.samples.LoanBroker at SupplierQuoteEngine" name="conversationType"/>
-      </participantDefinitions>
-      <variableDefinitions description="Channel to facilitate interaction to Supplier" name="SupplierChannel" type="//@typeDefinitions/@channelTypes.2"/>
-      <activities xsi:type="org.pi4soa.cdl:Interaction" name="RFQ" operation="getQuote" channelVariable="//@choreographies.0/@enclosedChoreographies.1/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.1" toParticipant="//@choreographies.0/@enclosedChoreographies.1/@participantDefinitions.0">
-        <exchangeDetails description="This is the exchange details for the request exchange associated with interaction RFQ" name="RFQRequestExchange" type="//@typeDefinitions/@informationTypes.11"/>
-        <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction RFQ" name="RFQRespondExchange" type="//@typeDefinitions/@informationTypes.9" action="Respond"/>
-      </activities>
-    </enclosedChoreographies>
-    <variableDefinitions description="Channel to facilitate interaction to Broker" name="BrokerChannel" type="//@typeDefinitions/@channelTypes.0" roleTypes="//@typeDefinitions/@roleTypes.0 //@typeDefinitions/@roleTypes.1"/>
-    <activities xsi:type="org.pi4soa.cdl:Interaction" name="Enquiry" operation="makeEnquiry" channelVariable="//@choreographies.0/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.2">
-      <exchangeDetails description="This is the exchange details for the request exchange associated with interaction Enquiry" name="EnquiryRequestExchange" type="//@typeDefinitions/@informationTypes.6"/>
-    </activities>
-    <activities xsi:type="org.pi4soa.cdl:While" name="SendRFQToSuppliers">
-      <activities xsi:type="org.pi4soa.cdl:Perform" choreography="//@choreographies.0/@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/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.2">
-        <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction Enquiry" name="EnquiryRespondExchange" type="//@typeDefinitions/@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/@enclosedChoreographies.0" waitForCompletion="false">
-          <bindDetails name="BindBrokerChannel" thisVariable="//@choreographies.0/@variableDefinitions.0" thisRole="//@typeDefinitions/@roleTypes.1" freeVariable="//@choreographies.0/@enclosedChoreographies.0/@variableDefinitions.0" freeRole="//@typeDefinitions/@roleTypes.1"/>
-          <bindDetails name="BindBrokerChannel" thisVariable="//@choreographies.0/@variableDefinitions.0" thisRole="//@typeDefinitions/@roleTypes.0" freeVariable="//@choreographies.0/@enclosedChoreographies.0/@variableDefinitions.0" freeRole="//@typeDefinitions/@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/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.2">
-          <exchangeDetails description="This is the exchange details for the request exchange associated with interaction Cancel" name="CancelRequestExchange" type="//@typeDefinitions/@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/@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/@roleTypes.0" secondRoleType="//@typeDefinitions/@roleTypes.2"/>
+    <relationshipTypes description="Relationship between Broker and Supplier" name="BrokerToSupplierRel" firstRoleType="//@typeDefinitions/@roleTypes.0" secondRoleType="//@typeDefinitions/@roleTypes.3"/>
+    <relationshipTypes description="Relationship between Buyer and Broker" name="BuyerToBrokerRel" firstRoleType="//@typeDefinitions/@roleTypes.1" secondRoleType="//@typeDefinitions/@roleTypes.0"/>
+    <participantTypes description="This is the participant type brk:Broker" name="brk:Broker" roleTypes="//@typeDefinitions/@roleTypes.0">
+      <semanticAnnotations annotation="overlord.cdl.samples.LoanBroker at Broker" name="conversationType"/>
+    </participantTypes>
+    <participantTypes description="This is the participant type byr:Buyer" name="byr:Buyer" roleTypes="//@typeDefinitions/@roleTypes.1">
+      <semanticAnnotations annotation="overlord.cdl.samples.LoanBroker at Buyer" name="conversationType"/>
+    </participantTypes>
+    <participantTypes description="This is the participant type cay:CreditAgency" name="cay:CreditAgency" roleTypes="//@typeDefinitions/@roleTypes.2">
+      <semanticAnnotations annotation="overlord.cdl.samples.Common at CreditAgency" name="conversationType"/>
+    </participantTypes>
+    <participantTypes description="This is the participant type spr:Supplier" name="spr:Supplier" roleTypes="//@typeDefinitions/@roleTypes.3">
+      <semanticAnnotations annotation="" name="conversationType"/>
+    </participantTypes>
+    <channelTypes description="This is the channel type BrokerChannelType" name="BrokerChannelType" referenceToken="//@typeDefinitions/@tokens.0" roleType="//@typeDefinitions/@roleTypes.0"/>
+    <channelTypes description="This is the channel type CreditAgencyChannelType" name="CreditAgencyChannelType" referenceToken="//@typeDefinitions/@tokens.0" roleType="//@typeDefinitions/@roleTypes.2"/>
+    <channelTypes description="This is the channel type SupplierChannelType" name="SupplierChannelType" referenceToken="//@typeDefinitions/@tokens.0" roleType="//@typeDefinitions/@roleTypes.3"/>
+  </typeDefinitions>
+  <choreographies description="Choreography flow for the ESBBroker process" name="ESBBrokerProcess" root="true">
+    <enclosedChoreographies name="CompleteTransaction">
+      <participantDefinitions name="spr:SupplierTxnProcessor" roleTypes="//@typeDefinitions/@roleTypes.3">
+        <semanticAnnotations annotation="overlord.cdl.samples.LoanBroker at SupplierTxnProcessor" name="conversationType"/>
+      </participantDefinitions>
+      <variableDefinitions description="Channel to facilitate interaction to Broker" name="BrokerChannel" type="//@typeDefinitions/@channelTypes.0" free="true" roleTypes="//@typeDefinitions/@roleTypes.0 //@typeDefinitions/@roleTypes.1"/>
+      <variableDefinitions description="Channel to facilitate interaction to CreditAgency" name="CreditAgencyChannel" type="//@typeDefinitions/@channelTypes.1"/>
+      <variableDefinitions description="Channel to facilitate interaction to Supplier" name="SupplierChannel" type="//@typeDefinitions/@channelTypes.2"/>
+      <activities xsi:type="org.pi4soa.cdl:Interaction" name="Buy" operation="buy" channelVariable="//@choreographies.0/@enclosedChoreographies.0/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.2">
+        <exchangeDetails description="This is the exchange details for the request exchange associated with interaction Buy" name="BuyRequestExchange" type="//@typeDefinitions/@informationTypes.1"/>
+      </activities>
+      <activities xsi:type="org.pi4soa.cdl:Interaction" name="CheckCredit" operation="checkCredit" channelVariable="//@choreographies.0/@enclosedChoreographies.0/@variableDefinitions.1" relationship="//@typeDefinitions/@relationshipTypes.0">
+        <exchangeDetails description="This is the exchange details for the request exchange associated with interaction CheckCredit" name="CheckCreditRequestExchange" type="//@typeDefinitions/@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/@variableDefinitions.1" relationship="//@typeDefinitions/@relationshipTypes.0">
+            <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CheckCreditResponse" name="CheckCreditResponseRespondExchange" type="//@typeDefinitions/@informationTypes.5" action="Respond"/>
+          </activities>
+          <activities xsi:type="org.pi4soa.cdl:Interaction" name="ConfirmBooking" operation="confirm" channelVariable="//@choreographies.0/@enclosedChoreographies.0/@variableDefinitions.2" relationship="//@typeDefinitions/@relationshipTypes.1" toParticipant="//@choreographies.0/@enclosedChoreographies.0/@participantDefinitions.0">
+            <exchangeDetails description="This is the exchange details for the request exchange associated with interaction ConfirmBooking" name="ConfirmBookingRequestExchange" type="//@typeDefinitions/@informationTypes.7"/>
+            <exchangeDetails description="This is the exchange details for the request exchange associated with interaction ConfirmBooking" name="ConfirmBookingRequestExchange" type="//@typeDefinitions/@informationTypes.0" action="Respond"/>
+          </activities>
+          <activities xsi:type="org.pi4soa.cdl:Interaction" name="Buy" operation="buy" channelVariable="//@choreographies.0/@enclosedChoreographies.0/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.2">
+            <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction Buy" name="BuyRespondExchange" type="//@typeDefinitions/@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/@variableDefinitions.1" relationship="//@typeDefinitions/@relationshipTypes.0">
+            <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction CheckCreditFailed" name="CheckCreditFailedRespondExchange" type="//@typeDefinitions/@informationTypes.4" action="Respond" faultName="invalidCredit"/>
+          </activities>
+          <activities xsi:type="org.pi4soa.cdl:Interaction" name="Buy" operation="buy" channelVariable="//@choreographies.0/@enclosedChoreographies.0/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.2">
+            <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction Buy" name="BuyRespondExchange" type="//@typeDefinitions/@informationTypes.8" action="Respond" faultName="rejected"/>
+          </activities>
+        </activities>
+      </activities>
+    </enclosedChoreographies>
+    <enclosedChoreographies name="RequestForQuote">
+      <participantDefinitions name="spr:SupplierQuoteEngine" roleTypes="//@typeDefinitions/@roleTypes.3">
+        <semanticAnnotations annotation="overlord.cdl.samples.LoanBroker at SupplierQuoteEngine" name="conversationType"/>
+      </participantDefinitions>
+      <variableDefinitions description="Channel to facilitate interaction to Supplier" name="SupplierChannel" type="//@typeDefinitions/@channelTypes.2"/>
+      <activities xsi:type="org.pi4soa.cdl:Interaction" name="RFQ" operation="getQuote" channelVariable="//@choreographies.0/@enclosedChoreographies.1/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.1" toParticipant="//@choreographies.0/@enclosedChoreographies.1/@participantDefinitions.0">
+        <exchangeDetails description="This is the exchange details for the request exchange associated with interaction RFQ" name="RFQRequestExchange" type="//@typeDefinitions/@informationTypes.11"/>
+        <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction RFQ" name="RFQRespondExchange" type="//@typeDefinitions/@informationTypes.9" action="Respond"/>
+      </activities>
+    </enclosedChoreographies>
+    <variableDefinitions description="Channel to facilitate interaction to Broker" name="BrokerChannel" type="//@typeDefinitions/@channelTypes.0" roleTypes="//@typeDefinitions/@roleTypes.0 //@typeDefinitions/@roleTypes.1"/>
+    <activities xsi:type="org.pi4soa.cdl:Interaction" name="Enquiry" operation="makeEnquiry" channelVariable="//@choreographies.0/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.2">
+      <exchangeDetails description="This is the exchange details for the request exchange associated with interaction Enquiry" name="EnquiryRequestExchange" type="//@typeDefinitions/@informationTypes.6"/>
+    </activities>
+    <activities xsi:type="org.pi4soa.cdl:While" name="SendRFQToSuppliers">
+      <activities xsi:type="org.pi4soa.cdl:Perform" choreography="//@choreographies.0/@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/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.2">
+        <exchangeDetails description="This is the exchange details for the respond exchange associated with interaction Enquiry" name="EnquiryRespondExchange" type="//@typeDefinitions/@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/@enclosedChoreographies.0" waitForCompletion="false">
+          <bindDetails name="BindBrokerChannel" thisVariable="//@choreographies.0/@variableDefinitions.0" thisRole="//@typeDefinitions/@roleTypes.1" freeVariable="//@choreographies.0/@enclosedChoreographies.0/@variableDefinitions.0" freeRole="//@typeDefinitions/@roleTypes.1"/>
+          <bindDetails name="BindBrokerChannel" thisVariable="//@choreographies.0/@variableDefinitions.0" thisRole="//@typeDefinitions/@roleTypes.0" freeVariable="//@choreographies.0/@enclosedChoreographies.0/@variableDefinitions.0" freeRole="//@typeDefinitions/@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/@variableDefinitions.0" relationship="//@typeDefinitions/@relationshipTypes.2">
+          <exchangeDetails description="This is the exchange details for the request exchange associated with interaction Cancel" name="CancelRequestExchange" type="//@typeDefinitions/@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_Buyer.wsdl" namespace="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




More information about the savara-commits mailing list