savara SVN: r544 - branches/experimental/2.0.x/bundles.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-01-07 11:36:08 -0500 (Fri, 07 Jan 2011)
New Revision: 544
Added:
branches/experimental/2.0.x/bundles/org.savara.contract/
Removed:
branches/experimental/2.0.x/bundles/org.savara.contract.model/
Log:
Copied: branches/experimental/2.0.x/bundles/org.savara.contract (from rev 543, branches/experimental/2.0.x/bundles/org.savara.contract.model)
13 years, 5 months
- 1
- 0
savara SVN: r543 - in branches/experimental/2.0.x/bundles: org.savara.bpel and 2 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-01-07 11:33:41 -0500 (Fri, 07 Jan 2011)
New Revision: 543
Modified:
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/pom.xml
branches/experimental/2.0.x/bundles/org.savara.bpel/.classpath
branches/experimental/2.0.x/bundles/org.savara.bpel/META-INF/MANIFEST.MF
branches/experimental/2.0.x/bundles/org.savara.bpel/pom.xml
branches/experimental/2.0.x/bundles/pom.xml
Log:
Refactored contract bundle.
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/.classpath
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/.classpath 2011-01-07 16:32:56 UTC (rev 542)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/.classpath 2011-01-07 16:33:41 UTC (rev 543)
@@ -9,7 +9,7 @@
<classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/felix/org.apache.felix.framework/3.0.1/org.apache.felix.framework-3.0.1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.core/1.4.0/org.osgi.core-1.4.0.jar"/>
- <classpathentry kind="src" path="/org.savara.contract.model"/>
+ <classpathentry kind="src" path="/org.savara.contract"/>
<classpathentry kind="src" path="/org.savara.core"/>
<classpathentry kind="src" path="/org.savara.wsdl"/>
<classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT-sources.jar"/>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/META-INF/MANIFEST.MF 2011-01-07 16:32:56 UTC (rev 542)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/META-INF/MANIFEST.MF 2011-01-07 16:33:41 UTC (rev 543)
@@ -8,7 +8,7 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.framework;version="1.3.0"
Require-Bundle: org.apache.commons.logging,
- org.savara.contract.model,
+ org.savara.contract,
org.savara.wsdl,
org.savara.core,
org.junit,
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/pom.xml
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/pom.xml 2011-01-07 16:32:56 UTC (rev 542)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/pom.xml 2011-01-07 16:33:41 UTC (rev 543)
@@ -41,7 +41,7 @@
</dependency>
<dependency>
<groupId>org.savara.bundles</groupId>
- <artifactId>org.savara.contract.model</artifactId>
+ <artifactId>org.savara.contract</artifactId>
<version>${savara.version}</version>
</dependency>
<dependency>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/pom.xml
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/pom.xml 2011-01-07 16:32:56 UTC (rev 542)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/pom.xml 2011-01-07 16:33:41 UTC (rev 543)
@@ -56,7 +56,7 @@
</dependency>
<dependency>
<groupId>org.savara.bundles</groupId>
- <artifactId>org.savara.contract.model</artifactId>
+ <artifactId>org.savara.contract</artifactId>
<version>${savara.version}</version>
</dependency>
<dependency>
Modified: branches/experimental/2.0.x/bundles/pom.xml
===================================================================
--- branches/experimental/2.0.x/bundles/pom.xml 2011-01-07 16:32:56 UTC (rev 542)
+++ branches/experimental/2.0.x/bundles/pom.xml 2011-01-07 16:33:41 UTC (rev 543)
@@ -22,7 +22,7 @@
<modules>
<module>org.savara.bpel</module>
<module>org.savara.bpel.tests</module>
- <module>org.savara.contract.model</module>
+ <module>org.savara.contract</module>
<module>org.savara.core</module>
<module>org.savara.pi4soa.cdm</module>
<module>org.savara.wsdl</module>
13 years, 5 months
- 1
- 0
savara SVN: r542 - in branches/experimental/2.0.x: bundles/org.savara.pi4soa.cdm/META-INF and 12 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-01-07 11:32:56 -0500 (Fri, 07 Jan 2011)
New Revision: 542
Modified:
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/META-INF/MANIFEST.MF
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/pom.xml
branches/experimental/2.0.x/bundles/org.savara.wsdl/.classpath
branches/experimental/2.0.x/bundles/org.savara.wsdl/META-INF/MANIFEST.MF
branches/experimental/2.0.x/bundles/org.savara.wsdl/pom.xml
branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature/pom.xml
branches/experimental/2.0.x/tools/features/org.savara.tools.feature/feature.xml
branches/experimental/2.0.x/tools/features/org.savara.tools.feature/pom.xml
branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/META-INF/MANIFEST.MF
branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/pom.xml
branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/META-INF/MANIFEST.MF
branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/pom.xml
branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/META-INF/MANIFEST.MF
branches/experimental/2.0.x/tools/site/pom.xml
branches/experimental/2.0.x/tools/tests/org.savara.protocol.contract.tests/META-INF/MANIFEST.MF
branches/experimental/2.0.x/tools/tests/org.savara.protocol.contract.tests/pom.xml
Log:
Refactored contract bundle.
Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/META-INF/MANIFEST.MF 2011-01-07 16:03:26 UTC (rev 541)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/META-INF/MANIFEST.MF 2011-01-07 16:32:56 UTC (rev 542)
@@ -11,7 +11,7 @@
Import-Package: org.osgi.framework;version="1.3.0"
Require-Bundle: org.pi4soa.cdl,
org.pi4soa.common,
- org.savara.contract.model,
+ org.savara.contract,
org.scribble.common,
org.scribble.protocol,
org.junit,
Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/pom.xml
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/pom.xml 2011-01-07 16:03:26 UTC (rev 541)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/pom.xml 2011-01-07 16:32:56 UTC (rev 542)
@@ -41,7 +41,7 @@
</dependency>
<dependency>
<groupId>org.savara.bundles</groupId>
- <artifactId>org.savara.contract.model</artifactId>
+ <artifactId>org.savara.contract</artifactId>
<version>${savara.version}</version>
</dependency>
<dependency>
Modified: branches/experimental/2.0.x/bundles/org.savara.wsdl/.classpath
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/.classpath 2011-01-07 16:03:26 UTC (rev 541)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/.classpath 2011-01-07 16:32:56 UTC (rev 542)
@@ -6,7 +6,7 @@
<classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/felix/org.apache.felix.framework/3.0.1/org.apache.felix.framework-3.0.1.jar"/>
<classpathentry kind="var" path="M2_REPO/org/apache/felix/org.osgi.core/1.4.0/org.osgi.core-1.4.0.jar"/>
- <classpathentry kind="src" path="/org.savara.contract.model"/>
+ <classpathentry kind="src" path="/org.savara.contract"/>
<classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.common/2.0.0-SNAPSHOT/org.scribble.common-2.0.0-SNAPSHOT-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT.jar" sourcepath="M2_REPO/org/scribble/bundles/org.scribble.protocol/2.0.0-SNAPSHOT/org.scribble.protocol-2.0.0-SNAPSHOT-sources.jar"/>
<classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.6.2/wsdl4j-1.6.2.jar"/>
Modified: branches/experimental/2.0.x/bundles/org.savara.wsdl/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/META-INF/MANIFEST.MF 2011-01-07 16:03:26 UTC (rev 541)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/META-INF/MANIFEST.MF 2011-01-07 16:32:56 UTC (rev 542)
@@ -8,7 +8,7 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.framework;version="1.3.0"
Require-Bundle: javax.wsdl;visibility:=reexport,
- org.savara.contract.model,
+ org.savara.contract,
org.apache.commons.logging,
org.scribble.common,
org.scribble.protocol,
Modified: branches/experimental/2.0.x/bundles/org.savara.wsdl/pom.xml
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/pom.xml 2011-01-07 16:03:26 UTC (rev 541)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/pom.xml 2011-01-07 16:32:56 UTC (rev 542)
@@ -26,7 +26,7 @@
</dependency>
<dependency>
<groupId>org.savara.bundles</groupId>
- <artifactId>org.savara.contract.model</artifactId>
+ <artifactId>org.savara.contract</artifactId>
<version>${savara.version}</version>
</dependency>
<dependency>
Modified: branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature/pom.xml 2011-01-07 16:03:26 UTC (rev 541)
+++ branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature/pom.xml 2011-01-07 16:32:56 UTC (rev 542)
@@ -21,7 +21,7 @@
</dependency>
<dependency>
<groupId>org.savara.bundles</groupId>
- <artifactId>org.savara.contract.model</artifactId>
+ <artifactId>org.savara.contract</artifactId>
<version>${savara.version}</version>
</dependency>
<dependency>
Modified: branches/experimental/2.0.x/tools/features/org.savara.tools.feature/feature.xml
===================================================================
--- branches/experimental/2.0.x/tools/features/org.savara.tools.feature/feature.xml 2011-01-07 16:03:26 UTC (rev 541)
+++ branches/experimental/2.0.x/tools/features/org.savara.tools.feature/feature.xml 2011-01-07 16:32:56 UTC (rev 542)
@@ -180,7 +180,7 @@
</requires>
<plugin
- id="org.savara.contract.model"
+ id="org.savara.contract"
download-size="0"
install-size="0"
version="0.0.0"
Modified: branches/experimental/2.0.x/tools/features/org.savara.tools.feature/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/features/org.savara.tools.feature/pom.xml 2011-01-07 16:03:26 UTC (rev 541)
+++ branches/experimental/2.0.x/tools/features/org.savara.tools.feature/pom.xml 2011-01-07 16:32:56 UTC (rev 542)
@@ -21,7 +21,7 @@
</dependency>
<dependency>
<groupId>org.savara.bundles</groupId>
- <artifactId>org.savara.contract.model</artifactId>
+ <artifactId>org.savara.contract</artifactId>
<version>${savara.version}</version>
</dependency>
<dependency>
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/META-INF/MANIFEST.MF 2011-01-07 16:03:26 UTC (rev 541)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/META-INF/MANIFEST.MF 2011-01-07 16:32:56 UTC (rev 542)
@@ -10,6 +10,6 @@
Require-Bundle: org.scribble.common,
org.scribble.protocol,
org.savara.core,
- org.savara.contract.model
+ org.savara.contract
Export-Package: org.savara.protocol.contract,
org.savara.protocol.contract.impl;x-friends:="org.savara.protocol.contract.tests"
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/pom.xml 2011-01-07 16:03:26 UTC (rev 541)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/pom.xml 2011-01-07 16:32:56 UTC (rev 542)
@@ -26,7 +26,7 @@
</dependency>
<dependency>
<groupId>org.savara.bundles</groupId>
- <artifactId>org.savara.contract.model</artifactId>
+ <artifactId>org.savara.contract</artifactId>
<version>${savara.version}</version>
</dependency>
</dependencies>
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/META-INF/MANIFEST.MF 2011-01-07 16:03:26 UTC (rev 541)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/META-INF/MANIFEST.MF 2011-01-07 16:32:56 UTC (rev 542)
@@ -14,7 +14,7 @@
org.scribble.protocol.parser,
org.apache.commons.logging,
org.savara.pi4soa.cdm;resolution:=optional,
- org.savara.contract.model,
+ org.savara.contract,
org.savara.tools.wsdl,
org.eclipse.ui.ide,
org.eclipse.jst.common.frameworks,
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/pom.xml 2011-01-07 16:03:26 UTC (rev 541)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/pom.xml 2011-01-07 16:32:56 UTC (rev 542)
@@ -26,7 +26,7 @@
</dependency>
<dependency>
<groupId>org.savara.bundles</groupId>
- <artifactId>org.savara.contract.model</artifactId>
+ <artifactId>org.savara.contract</artifactId>
<version>${savara.version}</version>
</dependency>
<dependency>
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/META-INF/MANIFEST.MF 2011-01-07 16:03:26 UTC (rev 541)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/META-INF/MANIFEST.MF 2011-01-07 16:32:56 UTC (rev 542)
@@ -7,7 +7,7 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: www.savara.org
Require-Bundle: javax.wsdl;visibility:=reexport,
- org.savara.contract.model,
+ org.savara.contract,
org.apache.commons.logging,
org.scribble.common,
org.eclipse.core.resources,
Modified: branches/experimental/2.0.x/tools/site/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/site/pom.xml 2011-01-07 16:03:26 UTC (rev 541)
+++ branches/experimental/2.0.x/tools/site/pom.xml 2011-01-07 16:32:56 UTC (rev 542)
@@ -31,7 +31,7 @@
</dependency>
<dependency>
<groupId>org.savara.bundles</groupId>
- <artifactId>org.savara.contract.model</artifactId>
+ <artifactId>org.savara.contract</artifactId>
<version>${savara.version}</version>
</dependency>
<dependency>
Modified: branches/experimental/2.0.x/tools/tests/org.savara.protocol.contract.tests/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/tools/tests/org.savara.protocol.contract.tests/META-INF/MANIFEST.MF 2011-01-07 16:03:26 UTC (rev 541)
+++ branches/experimental/2.0.x/tools/tests/org.savara.protocol.contract.tests/META-INF/MANIFEST.MF 2011-01-07 16:32:56 UTC (rev 542)
@@ -9,7 +9,7 @@
Import-Package: org.osgi.framework;version="1.3.0"
Require-Bundle: org.scribble.common,
org.scribble.protocol,
- org.savara.contract.model,
+ org.savara.contract,
org.savara.protocol.contract,
org.junit4
Export-Package: org.savara.protocol.contract
Modified: branches/experimental/2.0.x/tools/tests/org.savara.protocol.contract.tests/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/tests/org.savara.protocol.contract.tests/pom.xml 2011-01-07 16:03:26 UTC (rev 541)
+++ branches/experimental/2.0.x/tools/tests/org.savara.protocol.contract.tests/pom.xml 2011-01-07 16:32:56 UTC (rev 542)
@@ -26,7 +26,7 @@
</dependency>
<dependency>
<groupId>org.savara.bundles</groupId>
- <artifactId>org.savara.contract.model</artifactId>
+ <artifactId>org.savara.contract</artifactId>
<version>${savara.version}</version>
</dependency>
</dependencies>
13 years, 5 months
- 1
- 0
savara SVN: r541 - in branches/experimental/2.0.x/tools/plugins: org.savara.tools.core and 1 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-01-07 11:03:26 -0500 (Fri, 07 Jan 2011)
New Revision: 541
Modified:
branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/
branches/experimental/2.0.x/tools/plugins/org.savara.tools.core/
branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/
Log:
Property changes on: branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel
___________________________________________________________________
Name: svn:ignore
- bin
.settings
+ bin
.settings
target
Property changes on: branches/experimental/2.0.x/tools/plugins/org.savara.tools.core
___________________________________________________________________
Name: svn:ignore
- bin
+ bin
target
Property changes on: branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl
___________________________________________________________________
Name: svn:ignore
- classes
+ classes
target
13 years, 5 months
- 1
- 0
savara SVN: r540 - in branches/experimental/2.0.x/tools: plugins/org.savara.tools.bpmn and 6 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-01-07 10:58:54 -0500 (Fri, 07 Jan 2011)
New Revision: 540
Modified:
branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java
branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpmn/
branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpmn/META-INF/MANIFEST.MF
branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/META-INF/MANIFEST.MF
branches/experimental/2.0.x/tools/plugins/org.savara.tools.validator/META-INF/MANIFEST.MF
branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/META-INF/MANIFEST.MF
branches/experimental/2.0.x/tools/site/site.xml
branches/experimental/2.0.x/tools/tests/org.savara.protocol.contract.tests/META-INF/MANIFEST.MF
Log:
Intermediate update.
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java 2011-01-07 15:57:52 UTC (rev 539)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java 2011-01-07 15:58:54 UTC (rev 540)
@@ -39,7 +39,7 @@
import org.savara.contract.model.Interface;
import org.savara.contract.model.Namespace;
import org.savara.core.eclipse.ScribbleServices;
-import org.savara.util.PropertyNames;
+import org.savara.model.util.PropertyNames;
import org.savara.util.XMLUtils;
import org.savara.wsdl.generator.WSDLGeneratorFactory;
import org.savara.wsdl.generator.soap.SOAPDocLitWSDLBinding;
Property changes on: branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpmn
___________________________________________________________________
Name: svn:ignore
+ target
bin
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpmn/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpmn/META-INF/MANIFEST.MF 2011-01-07 15:57:52 UTC (rev 539)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpmn/META-INF/MANIFEST.MF 2011-01-07 15:58:54 UTC (rev 540)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: SAVARA Tools BPMN Plug-in
Bundle-SymbolicName: org.savara.tools.bpmn;singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Activator: org.savara.tools.bpmn.eclipse.Activator
Bundle-Vendor: www.savara.org
Bundle-Localization: plugin
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/META-INF/MANIFEST.MF 2011-01-07 15:57:52 UTC (rev 539)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.monitor/META-INF/MANIFEST.MF 2011-01-07 15:58:54 UTC (rev 540)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: SAVARA Tools Monitor Plug-in
Bundle-SymbolicName: org.savara.tools.monitor;singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Activator: org.savara.tools.monitor.eclipse.Activator
Bundle-Vendor: www.savara.org
Require-Bundle: org.eclipse.ui,
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.validator/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tools.validator/META-INF/MANIFEST.MF 2011-01-07 15:57:52 UTC (rev 539)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.validator/META-INF/MANIFEST.MF 2011-01-07 15:58:54 UTC (rev 540)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: SAVARA Tools Validator Plug-in
Bundle-SymbolicName: org.savara.tools.validator;singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Activator: org.savara.tools.validator.osgi.Activator
Bundle-Vendor: www.savara.org
Require-Bundle: org.eclipse.ui,
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/META-INF/MANIFEST.MF 2011-01-07 15:57:52 UTC (rev 539)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/META-INF/MANIFEST.MF 2011-01-07 15:58:54 UTC (rev 540)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: SAVARA Tools WSDL Plug-in
Bundle-SymbolicName: org.savara.tools.wsdl;singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Activator: org.savara.tools.wsdl.osgi.Activator
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-Vendor: www.savara.org
Modified: branches/experimental/2.0.x/tools/site/site.xml
===================================================================
--- branches/experimental/2.0.x/tools/site/site.xml 2011-01-07 15:57:52 UTC (rev 539)
+++ branches/experimental/2.0.x/tools/site/site.xml 2011-01-07 15:58:54 UTC (rev 540)
@@ -6,9 +6,6 @@
<feature url="features/org.savara.tools.feature_0.0.0.jar" id="org.savara.tools.feature" version="0.0.0">
<category name="Savara"/>
</feature>
- <feature url="features/org.scribble.protocol.feature_0.0.0.jar" id="org.scribble.protocol.feature" version="0.0.0">
- <category name="Savara"/>
- </feature>
<category-def name="Savara" label="Savara">
<description>
Savara Tools update site
Modified: branches/experimental/2.0.x/tools/tests/org.savara.protocol.contract.tests/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/tools/tests/org.savara.protocol.contract.tests/META-INF/MANIFEST.MF 2011-01-07 15:57:52 UTC (rev 539)
+++ branches/experimental/2.0.x/tools/tests/org.savara.protocol.contract.tests/META-INF/MANIFEST.MF 2011-01-07 15:58:54 UTC (rev 540)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: SAVARA Protocol Contract Tests Plugin
Bundle-SymbolicName: org.savara.protocol.contract.tests
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Activator: org.savara.protocol.contract.tests.osgi.Activator
Bundle-Vendor: www.savara.org
Bundle-RequiredExecutionEnvironment: J2SE-1.5
13 years, 5 months
- 1
- 0
savara SVN: r539 - in branches/experimental/2.0.x: bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules and 17 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-01-07 10:57:52 -0500 (Fri, 07 Jan 2011)
New Revision: 539
Added:
branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/util/BPELInteractionUtil.java
branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/model/util/
branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/model/util/InteractionUtil.java
branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/model/util/PropertyNames.java
Removed:
branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/util/InteractionUtil.java
branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/util/PropertyNames.java
branches/experimental/2.0.x/tools/features/org.scribble.protocol.feature/
Modified:
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java
branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ChoiceModelChangeRule.java
branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionModelChangeRule.java
branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionPatterns.java
branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/InvokeParserRule.java
branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/PickParserRule.java
branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ProcessParserRule.java
branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ReceiveParserRule.java
branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ReplyParserRule.java
branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ScopeParserRule.java
branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/util/ActivityUtil.java
branches/experimental/2.0.x/bundles/org.savara.contract.model/META-INF/MANIFEST.MF
branches/experimental/2.0.x/bundles/org.savara.core/META-INF/MANIFEST.MF
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolModelConverterRuleImpl.java
branches/experimental/2.0.x/bundles/org.savara.wsdl/META-INF/MANIFEST.MF
branches/experimental/2.0.x/tools/features/org.savara.tools.feature/feature.xml
branches/experimental/2.0.x/tools/features/org.savara.tools.feature/pom.xml
branches/experimental/2.0.x/tools/features/pom.xml
branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/META-INF/MANIFEST.MF
branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/src/java/org/savara/protocol/contract/ContractGenerator.java
branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/src/java/org/savara/protocol/contract/impl/ContractGeneratorImpl.java
branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/src/java/org/savara/protocol/contract/impl/ContractIntrospector.java
branches/experimental/2.0.x/tools/plugins/org.savara.tap.eclipse/META-INF/MANIFEST.MF
branches/experimental/2.0.x/tools/plugins/org.savara.tap.model/META-INF/MANIFEST.MF
branches/experimental/2.0.x/tools/plugins/org.savara.tap.validation/META-INF/MANIFEST.MF
Log:
Intermediate update.
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ChoiceModelChangeRule.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ChoiceModelChangeRule.java 2011-01-05 23:01:21 UTC (rev 538)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/ChoiceModelChangeRule.java 2011-01-07 15:57:52 UTC (rev 539)
@@ -35,12 +35,12 @@
import org.savara.bpel.model.TScope;
import org.savara.bpel.model.TSequence;
import org.savara.bpel.model.TVariable;
-import org.savara.bpel.util.InteractionUtil;
import org.savara.bpel.util.PartnerLinkUtil;
import org.savara.bpel.util.VariableUtil;
import org.savara.contract.model.Contract;
import org.savara.contract.model.Interface;
import org.savara.model.change.ModelChangeContext;
+import org.savara.model.util.InteractionUtil;
import org.savara.wsdl.util.WSDLGeneratorUtil;
import org.scribble.protocol.model.*;
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionModelChangeRule.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionModelChangeRule.java 2011-01-05 23:01:21 UTC (rev 538)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionModelChangeRule.java 2011-01-07 15:57:52 UTC (rev 539)
@@ -31,12 +31,12 @@
import org.savara.bpel.model.TScope;
import org.savara.bpel.model.TSequence;
import org.savara.bpel.model.TVariable;
-import org.savara.bpel.util.InteractionUtil;
import org.savara.bpel.util.PartnerLinkUtil;
import org.savara.bpel.util.VariableUtil;
import org.savara.contract.model.Contract;
import org.savara.contract.model.Interface;
import org.savara.model.change.ModelChangeContext;
+import org.savara.model.util.InteractionUtil;
import org.savara.wsdl.util.WSDLGeneratorUtil;
import org.scribble.protocol.model.*;
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionPatterns.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionPatterns.java 2011-01-05 23:01:21 UTC (rev 538)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/model/change/InteractionPatterns.java 2011-01-07 15:57:52 UTC (rev 539)
@@ -17,7 +17,8 @@
*/
package org.savara.bpel.model.change;
-import org.savara.bpel.util.InteractionUtil;
+import org.savara.bpel.util.BPELInteractionUtil;
+import org.savara.model.util.InteractionUtil;
import org.scribble.protocol.model.*;
/**
@@ -46,7 +47,7 @@
// by a choice representing a normal and multiple
// fault responses
if (InteractionUtil.isRequest(interaction) &&
- getRequestLabel(interaction) != null) {
+ InteractionUtil.getRequestLabel(interaction) != null) {
if (interaction.getParent() instanceof
org.scribble.protocol.model.Block) {
@@ -111,14 +112,14 @@
When path=choice.getWhens().get(i);
if (i == 0) {
- label = getReplyToLabel(path);
+ label = InteractionUtil.getReplyToLabel(path);
if (label == null || InteractionUtil.isRequest(path)
|| InteractionUtil.isSend(path)) {
ret = false;
}
} else {
- String replyTo=getReplyToLabel(path);
+ String replyTo=InteractionUtil.getReplyToLabel(path);
if (replyTo == null ||
replyTo.equals(label) == false ||
@@ -292,7 +293,7 @@
Interaction ret=null;
if (InteractionUtil.isRequest(interaction) == false &&
- getReplyToLabel(interaction) != null) {
+ InteractionUtil.getReplyToLabel(interaction) != null) {
// Find if contained in 'if' path
if (interaction.getParent() instanceof Block &&
@@ -314,9 +315,9 @@
if (act instanceof Interaction &&
InteractionUtil.isRequest((Interaction)act) &&
- getRequestLabel((Interaction)act) != null &&
- getReplyToLabel(interaction).equals(
- getRequestLabel((Interaction)act))) {
+ InteractionUtil.getRequestLabel((Interaction)act) != null &&
+ InteractionUtil.getReplyToLabel(interaction).equals(
+ InteractionUtil.getRequestLabel((Interaction)act))) {
ret = (Interaction)act;
}
}
@@ -423,27 +424,11 @@
if (InteractionUtil.isRequest(req) &&
InteractionUtil.isResponse(resp) &&
- getReplyToLabel(resp).equals(
- getRequestLabel(req))) {
+ InteractionUtil.getReplyToLabel(resp).equals(
+ InteractionUtil.getRequestLabel(req))) {
ret = true;
}
return(ret);
}
-
- public static String getRequestLabel(Interaction interaction) {
- return((String)interaction.getProperties().get("RequestLabel"));
- }
-
- public static String getReplyToLabel(Interaction interaction) {
- return((String)interaction.getProperties().get("ReplyToLabel"));
- }
-
- public static String getRequestLabel(When interaction) {
- return((String)interaction.getProperties().get("RequestLabel"));
- }
-
- public static String getReplyToLabel(When interaction) {
- return((String)interaction.getProperties().get("ReplyToLabel"));
- }
}
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/InvokeParserRule.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/InvokeParserRule.java 2011-01-05 23:01:21 UTC (rev 538)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/InvokeParserRule.java 2011-01-07 15:57:52 UTC (rev 539)
@@ -25,7 +25,7 @@
import org.savara.bpel.model.TInvoke;
import org.savara.bpel.model.TScope;
import org.savara.bpel.model.TVariable;
-import org.savara.bpel.util.InteractionUtil;
+import org.savara.bpel.util.BPELInteractionUtil;
import org.savara.bpel.util.PartnerLinkUtil;
import org.savara.bpel.util.TypeReferenceUtil;
import org.scribble.common.logging.Journal;
@@ -126,7 +126,7 @@
TVariable var=context.getVariable(invoke.getInputVariable());
- String xmlType=InteractionUtil.getXMLType(context.getProcess(), var.getMessageType(),
+ String xmlType=BPELInteractionUtil.getXMLType(context.getProcess(), var.getMessageType(),
context.getResourceLocator());
TypeReference tref=TypeReferenceUtil.createTypeReference(xmlType, context);
@@ -159,7 +159,7 @@
TVariable var=context.getVariable(invoke.getOutputVariable());
- String xmlType=InteractionUtil.getXMLType(context.getProcess(), var.getMessageType(),
+ String xmlType=BPELInteractionUtil.getXMLType(context.getProcess(), var.getMessageType(),
context.getResourceLocator());
TypeReference tref=TypeReferenceUtil.createTypeReference(xmlType, context);
@@ -200,7 +200,7 @@
TVariable var=context.getVariable(faultVar);
if (var != null) {
- String xmlType=InteractionUtil.getXMLType(context.getProcess(), var.getMessageType(),
+ String xmlType=BPELInteractionUtil.getXMLType(context.getProcess(), var.getMessageType(),
context.getResourceLocator());
tref = TypeReferenceUtil.createTypeReference(xmlType, context);
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/PickParserRule.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/PickParserRule.java 2011-01-05 23:01:21 UTC (rev 538)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/PickParserRule.java 2011-01-07 15:57:52 UTC (rev 539)
@@ -25,7 +25,7 @@
import org.savara.bpel.model.TReply;
import org.savara.bpel.model.TVariable;
import org.savara.bpel.util.ActivityUtil;
-import org.savara.bpel.util.InteractionUtil;
+import org.savara.bpel.util.BPELInteractionUtil;
import org.savara.bpel.util.PartnerLinkUtil;
import org.savara.bpel.util.TypeReferenceUtil;
import org.scribble.common.logging.Journal;
@@ -81,7 +81,7 @@
TVariable var=context.getVariable(onMessageElem.getVariable());
- String xmlType=InteractionUtil.getXMLType(context.getProcess(), var.getMessageType(),
+ String xmlType=BPELInteractionUtil.getXMLType(context.getProcess(), var.getMessageType(),
context.getResourceLocator());
TypeReference tref=TypeReferenceUtil.createTypeReference(xmlType, context);
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ProcessParserRule.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ProcessParserRule.java 2011-01-05 23:01:21 UTC (rev 538)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ProcessParserRule.java 2011-01-07 15:57:52 UTC (rev 539)
@@ -28,7 +28,7 @@
import org.savara.bpel.model.TSequence;
import org.savara.bpel.model.TVariable;
import org.savara.bpel.util.ActivityUtil;
-import org.savara.bpel.util.InteractionUtil;
+import org.savara.bpel.util.BPELInteractionUtil;
import org.scribble.common.logging.Journal;
import org.scribble.protocol.model.*;
@@ -53,7 +53,7 @@
}
// Count number of invoke activities
- int invokeCount=InteractionUtil.countInvokes(process);
+ int invokeCount=BPELInteractionUtil.countInvokes(process);
// Check whether scope has been defined to represent
// an interaction with one or more fault responses and
@@ -66,7 +66,7 @@
process.getFaultHandlers().getCatchAll() != null) &&
(process.getEventHandlers() == null || (process.getEventHandlers().getOnEvent().size() == 0 &&
process.getEventHandlers().getOnAlarm().size() == 0)) &&
- (invoke = InteractionUtil.getInvoke(act)) != null) {
+ (invoke = BPELInteractionUtil.getInvoke(act)) != null) {
InvokeParserRule.convertRequest(invoke, activities, context);
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ReceiveParserRule.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ReceiveParserRule.java 2011-01-05 23:01:21 UTC (rev 538)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ReceiveParserRule.java 2011-01-07 15:57:52 UTC (rev 539)
@@ -21,7 +21,7 @@
import org.savara.bpel.model.TReceive;
import org.savara.bpel.model.TVariable;
-import org.savara.bpel.util.InteractionUtil;
+import org.savara.bpel.util.BPELInteractionUtil;
import org.savara.bpel.util.PartnerLinkUtil;
import org.savara.bpel.util.TypeReferenceUtil;
import org.scribble.common.logging.Journal;
@@ -50,7 +50,7 @@
TVariable var=context.getVariable(elem.getVariable());
- String xmlType=InteractionUtil.getXMLType(context.getProcess(), var.getMessageType(),
+ String xmlType=BPELInteractionUtil.getXMLType(context.getProcess(), var.getMessageType(),
context.getResourceLocator());
TypeReference tref=TypeReferenceUtil.createTypeReference(xmlType, context);
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ReplyParserRule.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ReplyParserRule.java 2011-01-05 23:01:21 UTC (rev 538)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ReplyParserRule.java 2011-01-07 15:57:52 UTC (rev 539)
@@ -21,7 +21,7 @@
import org.savara.bpel.model.TReply;
import org.savara.bpel.model.TVariable;
-import org.savara.bpel.util.InteractionUtil;
+import org.savara.bpel.util.BPELInteractionUtil;
import org.savara.bpel.util.PartnerLinkUtil;
import org.savara.bpel.util.TypeReferenceUtil;
import org.scribble.common.logging.Journal;
@@ -49,7 +49,7 @@
TVariable var=context.getVariable(reply.getVariable());
- String xmlType=InteractionUtil.getXMLType(context.getProcess(), var.getMessageType(),
+ String xmlType=BPELInteractionUtil.getXMLType(context.getProcess(), var.getMessageType(),
context.getResourceLocator());
TypeReference tref=TypeReferenceUtil.createTypeReference(xmlType, context);
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ScopeParserRule.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ScopeParserRule.java 2011-01-05 23:01:21 UTC (rev 538)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/parser/rules/ScopeParserRule.java 2011-01-07 15:57:52 UTC (rev 539)
@@ -28,7 +28,7 @@
import org.savara.bpel.model.TSequence;
import org.savara.bpel.model.TVariable;
import org.savara.bpel.util.ActivityUtil;
-import org.savara.bpel.util.InteractionUtil;
+import org.savara.bpel.util.BPELInteractionUtil;
import org.scribble.common.logging.Journal;
import org.scribble.protocol.model.*;
@@ -57,7 +57,7 @@
}
// Count number of invoke activities
- int invokeCount=InteractionUtil.countInvokes(scope);
+ int invokeCount=BPELInteractionUtil.countInvokes(scope);
// Check whether scope has been defined to represent
// an interaction with one or more fault responses and
@@ -69,7 +69,7 @@
scope.getFaultHandlers().getCatchAll() != null) &&
(scope.getEventHandlers() == null || (scope.getEventHandlers().getOnEvent().size() == 0 &&
scope.getEventHandlers().getOnAlarm().size() == 0)) &&
- (invoke = InteractionUtil.getInvoke(ActivityUtil.getActivity(scope))) != null) {
+ (invoke = BPELInteractionUtil.getInvoke(ActivityUtil.getActivity(scope))) != null) {
InvokeParserRule.convertRequest(invoke, activities, context);
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/util/ActivityUtil.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/util/ActivityUtil.java 2011-01-05 23:01:21 UTC (rev 538)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/util/ActivityUtil.java 2011-01-07 15:57:52 UTC (rev 539)
@@ -26,7 +26,7 @@
public class ActivityUtil {
- private static Log logger = LogFactory.getLog(InteractionUtil.class);
+ private static Log logger = LogFactory.getLog(BPELInteractionUtil.class);
public static TActivity getActivity(TExtensibleElements container) {
TActivity ret=null;
Copied: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/util/BPELInteractionUtil.java (from rev 521, branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/util/InteractionUtil.java)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/util/BPELInteractionUtil.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/util/BPELInteractionUtil.java 2011-01-07 15:57:52 UTC (rev 539)
@@ -0,0 +1,209 @@
+/*
+ * 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.util;
+
+import java.io.IOException;
+
+import javax.wsdl.xml.WSDLReader;
+import javax.xml.bind.JAXBContext;
+import javax.xml.bind.Marshaller;
+import javax.xml.namespace.QName;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.savara.bpel.model.TActivity;
+import org.savara.bpel.model.TExtensibleElements;
+import org.savara.bpel.model.TImport;
+import org.savara.bpel.model.TInvoke;
+import org.savara.bpel.model.TProcess;
+import org.savara.bpel.model.TScope;
+import org.savara.bpel.model.TSequence;
+import org.scribble.common.resource.ResourceLocator;
+import org.savara.util.XMLUtils;
+
+/**
+ * This class contains utility functions for dealing with Interactions.
+ */
+public class BPELInteractionUtil {
+
+ private static Log logger = LogFactory.getLog(BPELInteractionUtil.class);
+
+ /**
+ * This method determines whether the supplied activity
+ * is either an invoke, or a sequence that has an
+ * invoke as its first element.
+ *
+ * @param act The activity
+ * @return The invoke, or null if not found
+ */
+ public static TInvoke getInvoke(TActivity act) {
+ TInvoke ret=null;
+
+ if (act instanceof TInvoke) {
+ ret = (TInvoke)act;
+ } else if (act instanceof TSequence &&
+ ((TSequence)act).getActivity().size() > 0 &&
+ ((TSequence)act).getActivity().get(0) instanceof TInvoke) {
+ ret = (TInvoke)((TSequence)act).getActivity().get(0);
+ }
+
+ return(ret);
+ }
+
+ public static int countInvokes(TExtensibleElements scope) {
+ org.w3c.dom.Element elem=null;
+
+ try {
+ elem = convertScopeToDOM(scope);
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
+
+ int ret=0;
+
+ if (elem != null) {
+ ret = countInvokes(elem);
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method recursively counts the number of 'invoke' activities
+ * contained within a DOM element.
+ *
+ * @param elem The current element
+ * @return The number of invokes contained within the element
+ */
+ public static int countInvokes(org.w3c.dom.Element elem) {
+ int ret=0;
+
+ if (elem.getLocalName().equals("invoke")) {
+ ret = 1;
+ } else {
+ org.w3c.dom.NodeList nl=elem.getChildNodes();
+
+ for (int i=0; i < nl.getLength(); i++) {
+ if (nl.item(i) instanceof org.w3c.dom.Element) {
+ ret += countInvokes((org.w3c.dom.Element)nl.item(i));
+ }
+ }
+ }
+
+ return(ret);
+ }
+
+ protected static org.w3c.dom.Element convertScopeToDOM(TExtensibleElements desc) throws IOException {
+ org.w3c.dom.Element ret=null;
+
+ try {
+ org.savara.bpel.model.ObjectFactory factory=
+ new org.savara.bpel.model.ObjectFactory();
+
+ JAXBContext context = JAXBContext.newInstance(desc.getClass());
+ Marshaller marshaller = context.createMarshaller();
+ marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
+
+ java.io.ByteArrayOutputStream baos=new java.io.ByteArrayOutputStream();
+
+ if (desc instanceof TProcess) {
+ marshaller.marshal(factory.createProcess((TProcess)desc), baos);
+ } else if (desc instanceof TScope) {
+ marshaller.marshal(factory.createScope((TScope)desc), baos);
+ }
+
+ baos.close();
+
+ ret = (org.w3c.dom.Element)XMLUtils.getNode(baos.toString());
+
+ } catch(Exception e) {
+ throw new IOException("Failed to serialize scope", e);
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method searches the defined WSDL definitions to identify
+ * the underlying XML element/type associated with the supplied
+ * WSDL message type.
+ *
+ * @param wsdlMessageType The WSDL message type
+ * @param locator The resource locator
+ * @return The underlying XML element/type, or null if not found
+ */
+ public static String getXMLType(TProcess process, QName wsdlMessageType, ResourceLocator locator) {
+ String ret=null;
+
+ String namespace=wsdlMessageType.getNamespaceURI();
+
+ for (TImport imp : process.getImport()) {
+
+ // Check if import relates to the correct namespace
+ if (imp.getNamespace() != null &&
+ imp.getNamespace().equals(namespace) &&
+ imp.getLocation() != null &&
+ imp.getLocation().endsWith(".wsdl")) {
+
+ java.net.URI uri=
+ locator.getResourceURI(imp.getLocation());
+
+ if (uri != null) {
+ ret = getXMLType(wsdlMessageType, uri);
+
+ if (ret != null) {
+ break;
+ }
+ }
+ }
+ }
+
+ return(ret);
+ }
+
+ public static String getXMLType(QName wsdlMessageType, java.net.URI uri) {
+ String ret=null;
+
+ try {
+ WSDLReader reader=javax.wsdl.factory.WSDLFactory.newInstance().newWSDLReader();
+
+ javax.wsdl.Definition defn=reader.readWSDL(uri.toString());
+
+ if (defn != null) {
+ javax.wsdl.Message mesg=defn.getMessage(wsdlMessageType);
+
+ if (mesg != null && mesg.getParts().size() == 1) {
+ javax.wsdl.Part part=(javax.wsdl.Part)
+ mesg.getParts().values().iterator().next();
+
+ if (part.getElementName() != null) {
+ ret = part.getElementName().toString();
+ } else if (part.getTypeName() != null) {
+ ret = part.getTypeName().toString();
+ }
+ }
+ }
+
+ } catch(Exception e) {
+ logger.error("Failed to read WSDL", e);
+ }
+
+ return(ret);
+ }
+
+}
Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/util/InteractionUtil.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/util/InteractionUtil.java 2011-01-05 23:01:21 UTC (rev 538)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/src/main/java/org/savara/bpel/util/InteractionUtil.java 2011-01-07 15:57:52 UTC (rev 539)
@@ -1,386 +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.util;
-
-import java.io.IOException;
-
-import javax.wsdl.xml.WSDLReader;
-import javax.xml.bind.JAXBContext;
-import javax.xml.bind.Marshaller;
-import javax.xml.namespace.QName;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.savara.bpel.model.TActivity;
-import org.savara.bpel.model.TExtensibleElements;
-import org.savara.bpel.model.TImport;
-import org.savara.bpel.model.TInvoke;
-import org.savara.bpel.model.TProcess;
-import org.savara.bpel.model.TScope;
-import org.savara.bpel.model.TSequence;
-import org.savara.bpel.model.change.InteractionPatterns;
-import org.scribble.common.resource.ResourceLocator;
-import org.savara.util.XMLUtils;
-import org.scribble.protocol.model.*;
-
-/**
- * This class contains utility functions for dealing with Interactions.
- */
-public class InteractionUtil {
-
- private static Log logger = LogFactory.getLog(InteractionUtil.class);
-
- /**
- * This method returns the name associated with the interaction.
- *
- * @param interaction The interaction
- * @return The name
- */
- public static String getName(Interaction interaction) {
- String ret=null;
-
- if (isSend(interaction)) {
- ret = "Send";
- } else {
- ret = "Receive";
- }
-
- for (TypeReference ref : interaction.getMessageSignature().getTypeReferences()) {
- ret += "_"+ref.getName();
- }
-
- return(ret);
- }
-
- /**
- * This method returns the name associated with the interaction.
- *
- * @param when The when
- * @return The name
- */
- public static String getName(When when) {
- String ret=null;
-
- if (isSend(when)) {
- ret = "Send";
- } else {
- ret = "Receive";
- }
-
- for (TypeReference ref : when.getMessageSignature().getTypeReferences()) {
- ret += "_"+ref.getName();
- }
-
- return(ret);
- }
-
- /**
- * This method determines whether the supplied interaction
- * is a send.
- *
- * @param interaction The interaction
- * @return Whether the interaction is a send
- */
- public static boolean isSend(Interaction interaction) {
- boolean ret=false;
- Role role=null;
-
- if (interaction.enclosingProtocol() != null) {
- role = interaction.enclosingProtocol().getRole();
- }
-
- if (role != null && ((interaction.getFromRole() != null &&
- interaction.getFromRole().equals(
- role)) ||
- (interaction.getToRoles().size() > 0 &&
- interaction.getToRoles().contains(
- role) == false))) {
- ret = true;
- }
-
- return(ret);
- }
-
- /**
- * This method determines whether the supplied interaction
- * is a send.
- *
- * @param interaction The interaction
- * @return Whether the interaction is a send
- */
- public static boolean isSend(When when) {
- boolean ret=false;
- Role role=null;
-
- if (((Choice)when.getParent()).enclosingProtocol() != null) {
- role = ((Choice)when.getParent()).enclosingProtocol().getRole();
- }
-
- if (role != null && ((((Choice)when.getParent()).getFromRole() != null &&
- ((Choice)when.getParent()).getFromRole().equals(
- role)) ||
- (((Choice)when.getParent()).getToRole() != null &&
- ((Choice)when.getParent()).getToRole().equals(
- role) == false))) {
- ret = true;
- }
-
- return(ret);
- }
-
- /**
- * This method determines whether the supplied interaction
- * is a request.
- *
- * @param interaction The interaction
- * @return Whether the interaction is a request
- */
- public static boolean isRequest(Interaction interaction) {
- boolean ret=false;
-
- if (InteractionPatterns.getRequestLabel(interaction) != null ||
- InteractionPatterns.getReplyToLabel(interaction) == null) {
- ret = true;
- }
-
- return(ret);
- }
-
- /**
- * This method determines whether the supplied interaction
- * is a request.
- *
- * @param interaction The interaction
- * @return Whether the interaction is a request
- */
- public static boolean isRequest(When interaction) {
- boolean ret=false;
-
- if (InteractionPatterns.getRequestLabel(interaction) != null ||
- InteractionPatterns.getReplyToLabel(interaction) == null) {
- ret = true;
- }
-
- return(ret);
- }
-
- /**
- * This method determines whether the supplied interaction
- * is a response.
- *
- * @param interaction The interaction
- * @return Whether the interaction is a response
- */
- public static boolean isResponse(Interaction interaction) {
- boolean ret=false;
-
- if (InteractionPatterns.getReplyToLabel(interaction) != null) {
- ret = true;
- }
-
- return(ret);
- }
-
- /**
- * This method determines whether the supplied interaction
- * is a response.
- *
- * @param interaction The interaction
- * @return Whether the interaction is a response
- */
- public static boolean isResponse(When interaction) {
- boolean ret=false;
-
- if (InteractionPatterns.getReplyToLabel(interaction) != null) {
- ret = true;
- }
-
- return(ret);
- }
-
- /**
- * This method determines whether this is the first interaction
- * associated with the conversation.
- *
- * @param interaction The interaction
- * @return Whether the interaction is the first in the conversation
- */
- /**
- * This method determines whether the supplied activity
- * is either an invoke, or a sequence that has an
- * invoke as its first element.
- *
- * @param act The activity
- * @return The invoke, or null if not found
- */
- public static TInvoke getInvoke(TActivity act) {
- TInvoke ret=null;
-
- if (act instanceof TInvoke) {
- ret = (TInvoke)act;
- } else if (act instanceof TSequence &&
- ((TSequence)act).getActivity().size() > 0 &&
- ((TSequence)act).getActivity().get(0) instanceof TInvoke) {
- ret = (TInvoke)((TSequence)act).getActivity().get(0);
- }
-
- return(ret);
- }
-
- public static int countInvokes(TExtensibleElements scope) {
- org.w3c.dom.Element elem=null;
-
- try {
- elem = convertScopeToDOM(scope);
- } catch(Exception e) {
- e.printStackTrace();
- }
-
- int ret=0;
-
- if (elem != null) {
- ret = countInvokes(elem);
- }
-
- return(ret);
- }
-
- /**
- * This method recursively counts the number of 'invoke' activities
- * contained within a DOM element.
- *
- * @param elem The current element
- * @return The number of invokes contained within the element
- */
- public static int countInvokes(org.w3c.dom.Element elem) {
- int ret=0;
-
- if (elem.getLocalName().equals("invoke")) {
- ret = 1;
- } else {
- org.w3c.dom.NodeList nl=elem.getChildNodes();
-
- for (int i=0; i < nl.getLength(); i++) {
- if (nl.item(i) instanceof org.w3c.dom.Element) {
- ret += countInvokes((org.w3c.dom.Element)nl.item(i));
- }
- }
- }
-
- return(ret);
- }
-
- protected static org.w3c.dom.Element convertScopeToDOM(TExtensibleElements desc) throws IOException {
- org.w3c.dom.Element ret=null;
-
- try {
- org.savara.bpel.model.ObjectFactory factory=
- new org.savara.bpel.model.ObjectFactory();
-
- JAXBContext context = JAXBContext.newInstance(desc.getClass());
- Marshaller marshaller = context.createMarshaller();
- marshaller.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, Boolean.TRUE);
-
- java.io.ByteArrayOutputStream baos=new java.io.ByteArrayOutputStream();
-
- if (desc instanceof TProcess) {
- marshaller.marshal(factory.createProcess((TProcess)desc), baos);
- } else if (desc instanceof TScope) {
- marshaller.marshal(factory.createScope((TScope)desc), baos);
- }
-
- baos.close();
-
- ret = (org.w3c.dom.Element)XMLUtils.getNode(baos.toString());
-
- } catch(Exception e) {
- throw new IOException("Failed to serialize scope", e);
- }
-
- return(ret);
- }
-
- /**
- * This method searches the defined WSDL definitions to identify
- * the underlying XML element/type associated with the supplied
- * WSDL message type.
- *
- * @param wsdlMessageType The WSDL message type
- * @param locator The resource locator
- * @return The underlying XML element/type, or null if not found
- */
- public static String getXMLType(TProcess process, QName wsdlMessageType, ResourceLocator locator) {
- String ret=null;
-
- String namespace=wsdlMessageType.getNamespaceURI();
-
- for (TImport imp : process.getImport()) {
-
- // Check if import relates to the correct namespace
- if (imp.getNamespace() != null &&
- imp.getNamespace().equals(namespace) &&
- imp.getLocation() != null &&
- imp.getLocation().endsWith(".wsdl")) {
-
- java.net.URI uri=
- locator.getResourceURI(imp.getLocation());
-
- if (uri != null) {
- ret = getXMLType(wsdlMessageType, uri);
-
- if (ret != null) {
- break;
- }
- }
- }
- }
-
- return(ret);
- }
-
- public static String getXMLType(QName wsdlMessageType, java.net.URI uri) {
- String ret=null;
-
- try {
- WSDLReader reader=javax.wsdl.factory.WSDLFactory.newInstance().newWSDLReader();
-
- javax.wsdl.Definition defn=reader.readWSDL(uri.toString());
-
- if (defn != null) {
- javax.wsdl.Message mesg=defn.getMessage(wsdlMessageType);
-
- if (mesg != null && mesg.getParts().size() == 1) {
- javax.wsdl.Part part=(javax.wsdl.Part)
- mesg.getParts().values().iterator().next();
-
- if (part.getElementName() != null) {
- ret = part.getElementName().toString();
- } else if (part.getTypeName() != null) {
- ret = part.getTypeName().toString();
- }
- }
- }
-
- } catch(Exception e) {
- logger.error("Failed to read WSDL", e);
- }
-
- return(ret);
- }
-
-}
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java 2011-01-05 23:01:21 UTC (rev 538)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/generator/GeneratorTest.java 2011-01-07 15:57:52 UTC (rev 539)
@@ -22,10 +22,10 @@
import junit.framework.TestResult;
import junit.framework.TestSuite;
-import org.savara.util.PropertyNames;
import org.savara.bpel.model.TProcess;
import org.savara.bpel.util.BPELModelUtil;
import org.savara.model.generator.ModelGenerator;
+import org.savara.model.util.PropertyNames;
import org.scribble.common.logging.CachedJournal;
import org.savara.pi4soa.cdm.parser.CDMProtocolParser;
Modified: branches/experimental/2.0.x/bundles/org.savara.contract.model/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.contract.model/META-INF/MANIFEST.MF 2011-01-05 23:01:21 UTC (rev 538)
+++ branches/experimental/2.0.x/bundles/org.savara.contract.model/META-INF/MANIFEST.MF 2011-01-07 15:57:52 UTC (rev 539)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: SAVARA Contract Model
Bundle-SymbolicName: org.savara.contract.model
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Activator: org.savara.contract.model.osgi.Activator
Bundle-Vendor: www.savara.org
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: branches/experimental/2.0.x/bundles/org.savara.core/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.core/META-INF/MANIFEST.MF 2011-01-05 23:01:21 UTC (rev 538)
+++ branches/experimental/2.0.x/bundles/org.savara.core/META-INF/MANIFEST.MF 2011-01-07 15:57:52 UTC (rev 539)
@@ -11,5 +11,6 @@
org.scribble.protocol
Export-Package: org.savara.model.change,
org.savara.model.generator,
+ org.savara.model.util,
org.savara.util
Bundle-ActivationPolicy: lazy
Added: branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/model/util/InteractionUtil.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/model/util/InteractionUtil.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/model/util/InteractionUtil.java 2011-01-07 15:57:52 UTC (rev 539)
@@ -0,0 +1,215 @@
+/*
+ * 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.model.util;
+
+import java.util.logging.Logger;
+
+import org.scribble.protocol.model.*;
+
+/**
+ * This class contains utility functions for dealing with Interactions.
+ */
+public class InteractionUtil {
+
+ private static Logger logger = Logger.getLogger(InteractionUtil.class.getName());
+
+ /**
+ * This method returns the name associated with the interaction.
+ *
+ * @param interaction The interaction
+ * @return The name
+ */
+ public static String getName(Interaction interaction) {
+ String ret=null;
+
+ if (isSend(interaction)) {
+ ret = "Send";
+ } else {
+ ret = "Receive";
+ }
+
+ for (TypeReference ref : interaction.getMessageSignature().getTypeReferences()) {
+ ret += "_"+ref.getName();
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method returns the name associated with the interaction.
+ *
+ * @param when The when
+ * @return The name
+ */
+ public static String getName(When when) {
+ String ret=null;
+
+ if (isSend(when)) {
+ ret = "Send";
+ } else {
+ ret = "Receive";
+ }
+
+ for (TypeReference ref : when.getMessageSignature().getTypeReferences()) {
+ ret += "_"+ref.getName();
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method determines whether the supplied interaction
+ * is a send.
+ *
+ * @param interaction The interaction
+ * @return Whether the interaction is a send
+ */
+ public static boolean isSend(Interaction interaction) {
+ boolean ret=false;
+ Role role=null;
+
+ if (interaction.enclosingProtocol() != null) {
+ role = interaction.enclosingProtocol().getRole();
+ }
+
+ if (role != null && ((interaction.getFromRole() != null &&
+ interaction.getFromRole().equals(
+ role)) ||
+ (interaction.getToRoles().size() > 0 &&
+ interaction.getToRoles().contains(
+ role) == false))) {
+ ret = true;
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method determines whether the supplied interaction
+ * is a send.
+ *
+ * @param interaction The interaction
+ * @return Whether the interaction is a send
+ */
+ public static boolean isSend(When when) {
+ boolean ret=false;
+ Role role=null;
+
+ if (((Choice)when.getParent()).enclosingProtocol() != null) {
+ role = ((Choice)when.getParent()).enclosingProtocol().getRole();
+ }
+
+ if (role != null && ((((Choice)when.getParent()).getFromRole() != null &&
+ ((Choice)when.getParent()).getFromRole().equals(
+ role)) ||
+ (((Choice)when.getParent()).getToRole() != null &&
+ ((Choice)when.getParent()).getToRole().equals(
+ role) == false))) {
+ ret = true;
+ }
+
+ return(ret);
+ }
+
+ public static String getRequestLabel(Interaction interaction) {
+ return((String)interaction.getProperties().get("RequestLabel"));
+ }
+
+ public static String getReplyToLabel(Interaction interaction) {
+ return((String)interaction.getProperties().get("ReplyToLabel"));
+ }
+
+ public static String getRequestLabel(When interaction) {
+ return((String)interaction.getProperties().get("RequestLabel"));
+ }
+
+ public static String getReplyToLabel(When interaction) {
+ return((String)interaction.getProperties().get("ReplyToLabel"));
+ }
+
+ /**
+ * This method determines whether the supplied interaction
+ * is a request.
+ *
+ * @param interaction The interaction
+ * @return Whether the interaction is a request
+ */
+ public static boolean isRequest(Interaction interaction) {
+ boolean ret=false;
+
+ if (getRequestLabel(interaction) != null ||
+ getReplyToLabel(interaction) == null) {
+ ret = true;
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method determines whether the supplied interaction
+ * is a request.
+ *
+ * @param interaction The interaction
+ * @return Whether the interaction is a request
+ */
+ public static boolean isRequest(When interaction) {
+ boolean ret=false;
+
+ if (getRequestLabel(interaction) != null ||
+ getReplyToLabel(interaction) == null) {
+ ret = true;
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method determines whether the supplied interaction
+ * is a response.
+ *
+ * @param interaction The interaction
+ * @return Whether the interaction is a response
+ */
+ public static boolean isResponse(Interaction interaction) {
+ boolean ret=false;
+
+ if (getReplyToLabel(interaction) != null) {
+ ret = true;
+ }
+
+ return(ret);
+ }
+
+ /**
+ * This method determines whether the supplied interaction
+ * is a response.
+ *
+ * @param interaction The interaction
+ * @return Whether the interaction is a response
+ */
+ public static boolean isResponse(When interaction) {
+ boolean ret=false;
+
+ if (getReplyToLabel(interaction) != null) {
+ ret = true;
+ }
+
+ return(ret);
+ }
+
+}
Copied: branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/model/util/PropertyNames.java (from rev 520, branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/util/PropertyNames.java)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/model/util/PropertyNames.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/model/util/PropertyNames.java 2011-01-07 15:57:52 UTC (rev 539)
@@ -0,0 +1,26 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA 02110-1301, USA.
+ */
+package org.savara.model.util;
+
+public class PropertyNames {
+
+ public static final String NAMESPACE_PREFIXES="NamespacePrefixes";
+
+ public static final String SCHEMA_LOCATIONS="SchemaLocations";
+
+}
Deleted: branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/util/PropertyNames.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/util/PropertyNames.java 2011-01-05 23:01:21 UTC (rev 538)
+++ branches/experimental/2.0.x/bundles/org.savara.core/src/main/java/org/savara/util/PropertyNames.java 2011-01-07 15:57:52 UTC (rev 539)
@@ -1,26 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source
- * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated
- * by the @authors tag. All rights reserved.
- * See the copyright.txt in the distribution for a
- * full listing of individual contributors.
- * This copyrighted material is made available to anyone wishing to use,
- * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU Lesser General Public License, v. 2.1.
- * This program is distributed in the hope that it will be useful, but WITHOUT A
- * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
- * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details.
- * You should have received a copy of the GNU Lesser General Public License,
- * v.2.1 along with this distribution; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- * MA 02110-1301, USA.
- */
-package org.savara.util;
-
-public class PropertyNames {
-
- public static final String NAMESPACE_PREFIXES="NamespacePrefixes";
-
- public static final String SCHEMA_LOCATIONS="SchemaLocations";
-
-}
Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolModelConverterRuleImpl.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolModelConverterRuleImpl.java 2011-01-05 23:01:21 UTC (rev 538)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/main/java/org/savara/pi4soa/cdm/parser/rules/ProtocolModelConverterRuleImpl.java 2011-01-07 15:57:52 UTC (rev 539)
@@ -23,7 +23,7 @@
import org.pi4soa.cdl.*;
import org.pi4soa.cdl.util.CDLTypeUtil;
-import org.savara.util.PropertyNames;
+import org.savara.model.util.PropertyNames;
import org.scribble.protocol.model.*;
public class ProtocolModelConverterRuleImpl implements ConverterRule {
Modified: branches/experimental/2.0.x/bundles/org.savara.wsdl/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.wsdl/META-INF/MANIFEST.MF 2011-01-05 23:01:21 UTC (rev 538)
+++ branches/experimental/2.0.x/bundles/org.savara.wsdl/META-INF/MANIFEST.MF 2011-01-07 15:57:52 UTC (rev 539)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: SAVARA WSDL
Bundle-SymbolicName: org.savara.wsdl
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Activator: org.savara.wsdl.osgi.Activator
Bundle-Vendor: www.savara.org
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: branches/experimental/2.0.x/tools/features/org.savara.tools.feature/feature.xml
===================================================================
--- branches/experimental/2.0.x/tools/features/org.savara.tools.feature/feature.xml 2011-01-05 23:01:21 UTC (rev 538)
+++ branches/experimental/2.0.x/tools/features/org.savara.tools.feature/feature.xml 2011-01-07 15:57:52 UTC (rev 539)
@@ -277,18 +277,4 @@
version="0.0.0"
unpack="false"/>
- <plugin
- id="org.scribble.conformance"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
- <plugin
- id="org.scribble.conversation.comparator"
- download-size="0"
- install-size="0"
- version="0.0.0"
- unpack="false"/>
-
</feature>
Modified: branches/experimental/2.0.x/tools/features/org.savara.tools.feature/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/features/org.savara.tools.feature/pom.xml 2011-01-05 23:01:21 UTC (rev 538)
+++ branches/experimental/2.0.x/tools/features/org.savara.tools.feature/pom.xml 2011-01-07 15:57:52 UTC (rev 539)
@@ -35,6 +35,11 @@
<version>${savara.version}</version>
</dependency>
<dependency>
+ <groupId>org.savara.bundles</groupId>
+ <artifactId>org.savara.pi4soa.cdm</artifactId>
+ <version>${savara.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.scribble.bundles</groupId>
<artifactId>org.scribble.protocol.projection</artifactId>
<version>${scribble.version}</version>
@@ -49,6 +54,11 @@
<artifactId>org.savara.tools.wsdl</artifactId>
<version>${savara.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.savara.tools</groupId>
+ <artifactId>org.savara.protocol.contract</artifactId>
+ <version>${savara.version}</version>
+ </dependency>
</dependencies>
</project>
Modified: branches/experimental/2.0.x/tools/features/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/features/pom.xml 2011-01-05 23:01:21 UTC (rev 538)
+++ branches/experimental/2.0.x/tools/features/pom.xml 2011-01-07 15:57:52 UTC (rev 539)
@@ -14,7 +14,6 @@
</parent>
<modules>
- <module>org.scribble.protocol.feature</module>
<module>org.savara.tools.feature</module>
<module>org.jboss.savara.tools.feature</module>
</modules>
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/META-INF/MANIFEST.MF 2011-01-05 23:01:21 UTC (rev 538)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/META-INF/MANIFEST.MF 2011-01-07 15:57:52 UTC (rev 539)
@@ -2,13 +2,14 @@
Bundle-ManifestVersion: 2
Bundle-Name: SAVARA Protocol Contract Plugin
Bundle-SymbolicName: org.savara.protocol.contract
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Activator: org.savara.protocol.contract.osgi.Activator
Bundle-Vendor: www.savara.org
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.framework;version="1.3.0"
Require-Bundle: org.scribble.common,
org.scribble.protocol,
+ org.savara.core,
org.savara.contract.model
Export-Package: org.savara.protocol.contract,
org.savara.protocol.contract.impl;x-friends:="org.savara.protocol.contract.tests"
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/src/java/org/savara/protocol/contract/ContractGenerator.java
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/src/java/org/savara/protocol/contract/ContractGenerator.java 2011-01-05 23:01:21 UTC (rev 538)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/src/java/org/savara/protocol/contract/ContractGenerator.java 2011-01-07 15:57:52 UTC (rev 539)
@@ -18,7 +18,7 @@
package org.savara.protocol.contract;
import org.savara.contract.model.Contract;
-import org.scribble.conversation.model.Conversation;
+import org.scribble.protocol.model.Protocol;
/**
* This interface represents the capability that generates a contract
@@ -34,6 +34,6 @@
* @param cm The protocol
* @return The contract
*/
- public Contract generate(Conversation cm) throws IllegalArgumentException;
+ public Contract generate(Protocol cm) throws IllegalArgumentException;
}
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/src/java/org/savara/protocol/contract/impl/ContractGeneratorImpl.java
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/src/java/org/savara/protocol/contract/impl/ContractGeneratorImpl.java 2011-01-05 23:01:21 UTC (rev 538)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/src/java/org/savara/protocol/contract/impl/ContractGeneratorImpl.java 2011-01-07 15:57:52 UTC (rev 539)
@@ -21,7 +21,7 @@
import org.savara.contract.model.Contract;
import org.savara.protocol.contract.ContractGenerator;
-import org.scribble.conversation.model.Conversation;
+import org.scribble.protocol.model.Protocol;
/**
* This class generates a contract from a protocol defining the behaviour of
@@ -37,7 +37,7 @@
* @param cm The protocol
* @return The contract
*/
- public Contract generate(Conversation cm) throws IllegalArgumentException {
+ public Contract generate(Protocol cm) throws IllegalArgumentException {
// Check parameters
if (cm == null) {
@@ -46,7 +46,7 @@
"org.savara.protocol.contract.Messages").
getString("SAVARAPC-00001"), (Object)null));
- } else if (cm.getLocatedName() == null || cm.getLocatedName().getRole() == null) {
+ } else if (cm.getRole() == null) {
throw new IllegalArgumentException(MessageFormat.format(
java.util.PropertyResourceBundle.getBundle(
"org.savara.protocol.contract.Messages").
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/src/java/org/savara/protocol/contract/impl/ContractIntrospector.java
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/src/java/org/savara/protocol/contract/impl/ContractIntrospector.java 2011-01-05 23:01:21 UTC (rev 538)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/src/java/org/savara/protocol/contract/impl/ContractIntrospector.java 2011-01-07 15:57:52 UTC (rev 539)
@@ -31,24 +31,26 @@
import org.savara.contract.model.RequestResponseMEP;
import org.savara.contract.model.Type;
import org.savara.contract.model.TypeDefinition;
-import org.scribble.conversation.model.Conversation;
-import org.scribble.conversation.model.ConversationInteraction;
-import org.scribble.conversation.model.Run;
-import org.scribble.model.ModelObject;
-import org.scribble.model.Role;
-import org.scribble.model.TypeReference;
+import org.savara.model.util.InteractionUtil;
+import org.scribble.protocol.model.AbstractModelObjectVisitor;
+import org.scribble.protocol.model.Protocol;
+import org.scribble.protocol.model.Interaction;
+import org.scribble.protocol.model.Run;
+import org.scribble.protocol.model.ModelObject;
+import org.scribble.protocol.model.Role;
+import org.scribble.protocol.model.TypeReference;
/**
* This class examines a protocol to determine the contract that represents
* the static functional interface to the role's behaviour.
*
*/
-public class ContractIntrospector implements org.scribble.model.Visitor {
+public class ContractIntrospector extends AbstractModelObjectVisitor {
private Contract m_contract=new Contract();
- private java.util.Set<Conversation> m_processedProtocols=null;
+ private java.util.Set<Protocol> m_processedProtocols=null;
private Role m_role=null;
- private Conversation m_protocol=null;
+ private Protocol m_protocol=null;
private static Logger logger = Logger.getLogger(ContractIntrospector.class.getName());
@@ -57,7 +59,7 @@
*
* @param protocol The protocol to introspect
*/
- public ContractIntrospector(Conversation protocol) {
+ public ContractIntrospector(Protocol protocol) {
this(protocol, null, null);
}
@@ -68,8 +70,8 @@
* @param contract The optional contract being derived
* @param processed The optional set of protocols currently processed
*/
- public ContractIntrospector(Conversation protocol, Contract contract,
- java.util.Set<Conversation> processed) {
+ public ContractIntrospector(Protocol protocol, Contract contract,
+ java.util.Set<Protocol> processed) {
m_contract = contract;
if (m_contract == null) {
@@ -79,13 +81,13 @@
if (processed != null) {
m_processedProtocols = processed;
} else {
- m_processedProtocols = new java.util.HashSet<Conversation>();
+ m_processedProtocols = new java.util.HashSet<Protocol>();
}
m_protocol = protocol;
if (protocol != null) {
- m_role = protocol.getLocatedName().getRole();
+ m_role = protocol.getRole();
}
}
@@ -122,7 +124,7 @@
*
* @return The processed protocols
*/
- public java.util.Set<Conversation> getProcessedProtocols() {
+ public java.util.Set<Protocol> getProcessedProtocols() {
return(m_processedProtocols);
}
@@ -145,10 +147,10 @@
m_protocol.visit(this);
}
- public boolean visit(ModelObject obj) {
+ public boolean process(ModelObject obj) {
boolean f_visitChildren=true;
- if (obj.getClass() == Conversation.class) {
+ if (obj.getClass() == Protocol.class) {
// Only visit children if same protocol that is being visited
f_visitChildren = (obj == m_protocol);
@@ -156,7 +158,7 @@
} else if (obj.getClass() == Run.class) {
Run run=(Run)obj;
- Conversation toProtocol=run.getDefinition();
+ Protocol toProtocol=run.getProtocol();
// Check if protocol already processed to avoid stack overflow
if (m_processedProtocols.contains(toProtocol) == false) {
@@ -167,10 +169,10 @@
ci.process();
} else {
- logger.fine("Invoked definition not found for "+run.getReference());
+ logger.fine("Invoked definition not found for "+run.getProtocolReference());
}
- } else if (obj.getClass() == ConversationInteraction.class) {
- visitInteraction((ConversationInteraction)obj);
+ } else if (obj.getClass() == Interaction.class) {
+ accept((Interaction)obj);
}
return(f_visitChildren);
@@ -182,7 +184,7 @@
*
* @param interaction The interaction
*/
- public void visitInteraction(ConversationInteraction interaction) {
+ public void accept(Interaction interaction) {
// Check if the interacton is being received
if (interaction.getFromRole() != null &&
@@ -190,8 +192,8 @@
// Received by the role, but need to check if its replyTo
// has been set, indicating it is receiving a response
- if (interaction.getReplyToLabel() == null ||
- interaction.getReplyToLabel().trim().length() == 0) {
+ if (InteractionUtil.getReplyToLabel(interaction) == null ||
+ InteractionUtil.getReplyToLabel(interaction).trim().length() == 0) {
// Receiving a request - so record this in the contract
Interface intf=getInterface();
@@ -204,7 +206,7 @@
if (mep == null) {
// Create new MEP
- if (interaction.getRequestLabel() != null) {
+ if (InteractionUtil.getRequestLabel(interaction) != null) {
mep = new RequestResponseMEP();
} else {
mep = new OneWayRequestMEP();
@@ -212,8 +214,8 @@
mep.setOperation(interaction.getMessageSignature().getOperation());
- for (int i=0; i < interaction.getMessageSignature().getTypes().size(); i++) {
- mep.getTypes().add(convertType(interaction.getMessageSignature().getTypes().get(i)));
+ for (int i=0; i < interaction.getMessageSignature().getTypeReferences().size(); i++) {
+ mep.getTypes().add(convertType(interaction.getMessageSignature().getTypeReferences().get(i)));
}
intf.getMessageExchangePatterns().add(mep);
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tap.eclipse/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tap.eclipse/META-INF/MANIFEST.MF 2011-01-05 23:01:21 UTC (rev 538)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tap.eclipse/META-INF/MANIFEST.MF 2011-01-07 15:57:52 UTC (rev 539)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: SAVARA TAP Eclipse integration
Bundle-SymbolicName: org.savara.tap.eclipse; singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Activator: org.savara.tap.eclipse.Activator
Bundle-Vendor: www.savara.org
Service-Component: OSGI-INF/eclipse-resource-loader.xml
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tap.model/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tap.model/META-INF/MANIFEST.MF 2011-01-05 23:01:21 UTC (rev 538)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tap.model/META-INF/MANIFEST.MF 2011-01-07 15:57:52 UTC (rev 539)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: SAVARA TAP Model
Bundle-SymbolicName: org.savara.tap.model
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Activator: org.savara.tap.model.osgi.Activator
Bundle-Vendor: www.savara.org
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tap.validation/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tap.validation/META-INF/MANIFEST.MF 2011-01-05 23:01:21 UTC (rev 538)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tap.validation/META-INF/MANIFEST.MF 2011-01-07 15:57:52 UTC (rev 539)
@@ -2,7 +2,7 @@
Bundle-ManifestVersion: 2
Bundle-Name: SAVARA TAP Validation
Bundle-SymbolicName: org.savara.tap.validation;singleton:=true
-Bundle-Version: 1.2.0.qualifier
+Bundle-Version: 2.0.0.qualifier
Bundle-Activator: org.savara.tap.validation.osgi.Activator
Bundle-Vendor: www.savara.org
Service-Component: OSGI-INF/bpel-cdm-relationship-validator.xml,
13 years, 5 months
- 1
- 0
savara SVN: r538 - in branches/experimental/2.0.x/tools: features/org.savara.tools.feature and 7 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-01-05 18:01:21 -0500 (Wed, 05 Jan 2011)
New Revision: 538
Modified:
branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature/feature.xml
branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature/pom.xml
branches/experimental/2.0.x/tools/features/org.savara.tools.feature/feature.xml
branches/experimental/2.0.x/tools/features/org.savara.tools.feature/pom.xml
branches/experimental/2.0.x/tools/features/org.scribble.protocol.feature/feature.xml
branches/experimental/2.0.x/tools/features/org.scribble.protocol.feature/pom.xml
branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract/
branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/pom.xml
branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java
branches/experimental/2.0.x/tools/plugins/org.savara.tools.core/pom.xml
branches/experimental/2.0.x/tools/plugins/pom.xml
branches/experimental/2.0.x/tools/site/pom.xml
Log:
Started sorting Eclipse tools build, but still failing - more work to do.
Modified: branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature/feature.xml
===================================================================
--- branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature/feature.xml 2011-01-05 22:13:01 UTC (rev 537)
+++ branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature/feature.xml 2011-01-05 23:01:21 UTC (rev 538)
@@ -2,7 +2,7 @@
<feature
id="org.jboss.savara.tools.feature"
label="JBoss SAVARA Tools Feature"
- version="1.2.0.qualifier"
+ version="2.0.0.qualifier"
provider-name="www.jboss.org">
<description>
Modified: branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature/pom.xml 2011-01-05 22:13:01 UTC (rev 537)
+++ branches/experimental/2.0.x/tools/features/org.jboss.savara.tools.feature/pom.xml 2011-01-05 23:01:21 UTC (rev 538)
@@ -41,25 +41,10 @@
</dependency>
<dependency>
<groupId>org.scribble.bundles</groupId>
- <artifactId>org.scribble.protocol.comparator</artifactId>
+ <artifactId>org.scribble.protocol.projection</artifactId>
<version>${scribble.version}</version>
</dependency>
<dependency>
- <groupId>org.scribble.bundles</groupId>
- <artifactId>org.scribble.protocol.projector</artifactId>
- <version>${scribble.version}</version>
- </dependency>
- <dependency>
- <groupId>org.scribble.bundles</groupId>
- <artifactId>org.scribble.protocol.export.text</artifactId>
- <version>${scribble.version}</version>
- </dependency>
- <dependency>
- <groupId>org.scribble.bundles</groupId>
- <artifactId>org.scribble.protocol.validation</artifactId>
- <version>${scribble.version}</version>
- </dependency>
- <dependency>
<groupId>org.savara.tools</groupId>
<artifactId>org.savara.tools.bpel</artifactId>
<version>${savara.version}</version>
Modified: branches/experimental/2.0.x/tools/features/org.savara.tools.feature/feature.xml
===================================================================
--- branches/experimental/2.0.x/tools/features/org.savara.tools.feature/feature.xml 2011-01-05 22:13:01 UTC (rev 537)
+++ branches/experimental/2.0.x/tools/features/org.savara.tools.feature/feature.xml 2011-01-05 23:01:21 UTC (rev 538)
@@ -2,7 +2,7 @@
<feature
id="org.savara.tools.feature"
label="SAVARA Tools Feature"
- version="1.2.0.qualifier"
+ version="2.0.0.qualifier"
provider-name="www.savara.org">
<description>
Modified: branches/experimental/2.0.x/tools/features/org.savara.tools.feature/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/features/org.savara.tools.feature/pom.xml 2011-01-05 22:13:01 UTC (rev 537)
+++ branches/experimental/2.0.x/tools/features/org.savara.tools.feature/pom.xml 2011-01-05 23:01:21 UTC (rev 538)
@@ -36,30 +36,10 @@
</dependency>
<dependency>
<groupId>org.scribble.bundles</groupId>
- <artifactId>org.scribble.conformance</artifactId>
+ <artifactId>org.scribble.protocol.projection</artifactId>
<version>${scribble.version}</version>
</dependency>
<dependency>
- <groupId>org.scribble.bundles</groupId>
- <artifactId>org.scribble.protocol.comparator</artifactId>
- <version>${scribble.version}</version>
- </dependency>
- <dependency>
- <groupId>org.scribble.bundles</groupId>
- <artifactId>org.scribble.protocol.projector</artifactId>
- <version>${scribble.version}</version>
- </dependency>
- <dependency>
- <groupId>org.scribble.bundles</groupId>
- <artifactId>org.scribble.protocol.export.text</artifactId>
- <version>${scribble.version}</version>
- </dependency>
- <dependency>
- <groupId>org.scribble.bundles</groupId>
- <artifactId>org.scribble.protocol.validation</artifactId>
- <version>${scribble.version}</version>
- </dependency>
- <dependency>
<groupId>org.savara.tools</groupId>
<artifactId>org.savara.tools.bpel</artifactId>
<version>${savara.version}</version>
Modified: branches/experimental/2.0.x/tools/features/org.scribble.protocol.feature/feature.xml
===================================================================
--- branches/experimental/2.0.x/tools/features/org.scribble.protocol.feature/feature.xml 2011-01-05 22:13:01 UTC (rev 537)
+++ branches/experimental/2.0.x/tools/features/org.scribble.protocol.feature/feature.xml 2011-01-05 23:01:21 UTC (rev 538)
@@ -2,7 +2,7 @@
<feature
id="org.scribble.protocol.feature"
label="Scribble Protocol Feature"
- version="1.2.0.qualifier"
+ version="2.0.0.qualifier"
provider-name="www.jboss.org">
<description>
@@ -10,17 +10,17 @@
</description>
<copyright>
- *
+ *
* Copyright 2010 www.scribble.org
*
- * Licensed under the Apache License, Version 2.0 (the "License");
+ * Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
+ * distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
@@ -28,7 +28,7 @@
</copyright>
<license url="http://www.apache.org/licenses/LICENSE-2.0">
- Apache License
+ Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/
@@ -36,38 +36,38 @@
1. Definitions.
- "License" shall mean the terms and conditions for use, reproduction,
+ "License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.
- "Licensor" shall mean the copyright owner or entity authorized by
+ "Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.
- "Legal Entity" shall mean the union of the acting entity and all
+ "Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
+ "control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.
- "You" (or "Your") shall mean an individual or Legal Entity
+ "You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.
- "Source" form shall mean the preferred form for making modifications,
+ "Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.
- "Object" form shall mean any form resulting from mechanical
+ "Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.
- "Work" shall mean the work of authorship, whether in Source or
+ "Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).
- "Derivative Works" shall mean any work, whether in Source or Object
+ "Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
@@ -75,21 +75,21 @@
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.
- "Contribution" shall mean any work of authorship, including
+ "Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
+ the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
+ designated in writing by the copyright owner as "Not a Contribution."
- "Contributor" shall mean Licensor and any individual or Legal Entity
+ "Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.
@@ -133,7 +133,7 @@
excluding those notices that do not pertain to any part of
the Derivative Works; and
- (d) If the Work includes a "NOTICE" text file as part of its
+ (d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
@@ -172,7 +172,7 @@
7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
+ Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
Modified: branches/experimental/2.0.x/tools/features/org.scribble.protocol.feature/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/features/org.scribble.protocol.feature/pom.xml 2011-01-05 22:13:01 UTC (rev 537)
+++ branches/experimental/2.0.x/tools/features/org.scribble.protocol.feature/pom.xml 2011-01-05 23:01:21 UTC (rev 538)
@@ -31,19 +31,9 @@
</dependency>
<dependency>
<groupId>org.scribble.bundles</groupId>
- <artifactId>org.scribble.protocol.projector</artifactId>
+ <artifactId>org.scribble.protocol.projection</artifactId>
<version>${scribble.version}</version>
</dependency>
- <dependency>
- <groupId>org.scribble.bundles</groupId>
- <artifactId>org.scribble.protocol.validation</artifactId>
- <version>${scribble.version}</version>
- </dependency>
- <dependency>
- <groupId>org.scribble.bundles</groupId>
- <artifactId>org.scribble.protocol.export.text</artifactId>
- <version>${scribble.version}</version>
- </dependency>
</dependencies>
</project>
Property changes on: branches/experimental/2.0.x/tools/plugins/org.savara.protocol.contract
___________________________________________________________________
Name: svn:ignore
+ bin
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/pom.xml 2011-01-05 22:13:01 UTC (rev 537)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/pom.xml 2011-01-05 23:01:21 UTC (rev 538)
@@ -39,6 +39,11 @@
<artifactId>org.savara.bpel</artifactId>
<version>${savara.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.savara.tools</groupId>
+ <artifactId>org.savara.tools.core</artifactId>
+ <version>${savara.version}</version>
+ </dependency>
</dependencies>
</project>
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java 2011-01-05 22:13:01 UTC (rev 537)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/src/java/org/savara/tools/bpel/generator/Generator.java 2011-01-05 23:01:21 UTC (rev 538)
@@ -39,6 +39,7 @@
import org.savara.contract.model.Interface;
import org.savara.contract.model.Namespace;
import org.savara.core.eclipse.ScribbleServices;
+import org.savara.util.PropertyNames;
import org.savara.util.XMLUtils;
import org.savara.wsdl.generator.WSDLGeneratorFactory;
import org.savara.wsdl.generator.soap.SOAPDocLitWSDLBinding;
@@ -252,9 +253,13 @@
bpelFile.create(null, true,
new org.eclipse.core.runtime.NullProgressMonitor());
+ java.util.Map<String, String> prefixes=
+ (java.util.Map<String, String>)
+ localcm.getProperties().get(PropertyNames.NAMESPACE_PREFIXES);
+
//String bpelText=XMLUtils.toText(bpelProcess.getDOMElement());
ByteArrayOutputStream os=new ByteArrayOutputStream();
- BPELModelUtil.serialize(bpelProcess, os);
+ BPELModelUtil.serialize(bpelProcess, os, prefixes);
os.close();
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.core/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tools.core/pom.xml 2011-01-05 22:13:01 UTC (rev 537)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.core/pom.xml 2011-01-05 23:01:21 UTC (rev 538)
@@ -19,6 +19,21 @@
<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.parser</artifactId>
+ <version>${scribble.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.scribble.bundles</groupId>
+ <artifactId>org.scribble.protocol.monitor</artifactId>
+ <version>${scribble.version}</version>
+ </dependency>
</dependencies>
</project>
Modified: branches/experimental/2.0.x/tools/plugins/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/plugins/pom.xml 2011-01-05 22:13:01 UTC (rev 537)
+++ branches/experimental/2.0.x/tools/plugins/pom.xml 2011-01-05 23:01:21 UTC (rev 538)
@@ -15,10 +15,12 @@
</parent>
<modules>
+ <!--
<module>org.savara.protocol.contract</module>
<module>org.savara.tap.eclipse</module>
<module>org.savara.tap.model</module>
<module>org.savara.tap.validation</module>
+ -->
<module>org.savara.tools.bpel</module>
<module>org.savara.tools.bpmn</module>
<module>org.savara.tools.core</module>
Modified: branches/experimental/2.0.x/tools/site/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/site/pom.xml 2011-01-05 22:13:01 UTC (rev 537)
+++ branches/experimental/2.0.x/tools/site/pom.xml 2011-01-05 23:01:21 UTC (rev 538)
@@ -56,24 +56,9 @@
</dependency>
<dependency>
<groupId>org.scribble.bundles</groupId>
- <artifactId>org.scribble.protocol.projector</artifactId>
+ <artifactId>org.scribble.protocol.projection</artifactId>
<version>${scribble.version}</version>
</dependency>
- <dependency>
- <groupId>org.scribble.bundles</groupId>
- <artifactId>org.scribble.protocol.comparator</artifactId>
- <version>${scribble.version}</version>
- </dependency>
- <dependency>
- <groupId>org.scribble.bundles</groupId>
- <artifactId>org.scribble.protocol.validation</artifactId>
- <version>${scribble.version}</version>
- </dependency>
- <dependency>
- <groupId>org.scribble.bundles</groupId>
- <artifactId>org.scribble.protocol.export.text</artifactId>
- <version>1${scribble.version}</version>
- </dependency>
</dependencies>
</project>
13 years, 5 months
- 1
- 0
savara SVN: r537 - in branches/experimental/2.0.x: bundles and 13 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-01-05 17:13:01 -0500 (Wed, 05 Jan 2011)
New Revision: 537
Added:
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/pom.xml
branches/experimental/2.0.x/bundles/org.savara.bpel/lib/jaxb-api-2.1.jar
branches/experimental/2.0.x/bundles/org.savara.bpel/lib/jaxb-impl-2.1.jar
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/TestJournal.java
Removed:
branches/experimental/2.0.x/bundles/org.savara.bpel/lib/jaxb-api.jar
branches/experimental/2.0.x/bundles/org.savara.bpel/lib/jaxb-impl.jar
Modified:
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/parser/ParserTest.java
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)Broker.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)Buyer.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)CreditAgency.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)Buyer.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)CreditAgency.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)Store.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ReqRespFault(a)Buyer.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ReqRespFault(a)Seller.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel/.classpath
branches/experimental/2.0.x/bundles/org.savara.core/META-INF/MANIFEST.MF
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/pom.xml
branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/CDMProtocolParserTest.java
branches/experimental/2.0.x/bundles/pom.xml
branches/experimental/2.0.x/pom.xml
branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/pom.xml
branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/pom.xml
branches/experimental/2.0.x/tools/plugins/pom.xml
branches/experimental/2.0.x/tools/pom.xml
branches/experimental/2.0.x/tools/tests/org.savara.protocol.contract.tests/pom.xml
Log:
Update to get the maven build working.
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel/.classpath
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel/.classpath 2011-01-05 17:36:26 UTC (rev 536)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel/.classpath 2011-01-05 22:13:01 UTC (rev 537)
@@ -18,7 +18,7 @@
<classpathentry kind="var" path="M2_REPO/org/antlr/stringtemplate/3.2/stringtemplate-3.2.jar"/>
<classpathentry kind="var" path="M2_REPO/wsdl4j/wsdl4j/1.6.2/wsdl4j-1.6.2.jar"/>
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
- <classpathentry kind="lib" path="lib/jaxb-api.jar"/>
- <classpathentry kind="lib" path="lib/jaxb-impl.jar"/>
+ <classpathentry kind="lib" path="lib/jaxb-api-2.1.jar"/>
+ <classpathentry kind="lib" path="lib/jaxb-impl-2.1.jar"/>
<classpathentry kind="output" path="target/classes"/>
</classpath>
Added: branches/experimental/2.0.x/bundles/org.savara.bpel/lib/jaxb-api-2.1.jar
===================================================================
(Binary files differ)
Property changes on: branches/experimental/2.0.x/bundles/org.savara.bpel/lib/jaxb-api-2.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel/lib/jaxb-api.jar
===================================================================
(Binary files differ)
Added: branches/experimental/2.0.x/bundles/org.savara.bpel/lib/jaxb-impl-2.1.jar
===================================================================
(Binary files differ)
Property changes on: branches/experimental/2.0.x/bundles/org.savara.bpel/lib/jaxb-impl-2.1.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel/lib/jaxb-impl.jar
===================================================================
(Binary files differ)
Property changes on: branches/experimental/2.0.x/bundles/org.savara.bpel.tests
___________________________________________________________________
Name: svn:ignore
- .settings
.classpath
.project
bin
+ .settings
.classpath
.project
bin
target
Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/pom.xml
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/pom.xml (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/pom.xml 2011-01-05 22:13:01 UTC (rev 537)
@@ -0,0 +1,109 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.savara.bundles</groupId>
+ <artifactId>org.savara.bpel.tests</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ <packaging>jar</packaging>
+ <name>Savara::Bundles::BPELTests</name>
+
+ <parent>
+ <groupId>org.savara</groupId>
+ <artifactId>bundles</artifactId>
+ <version>2.0.0-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.scribble.bundles</groupId>
+ <artifactId>org.scribble.common</artifactId>
+ <version>${scribble.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.scribble.bundles</groupId>
+ <artifactId>org.scribble.protocol</artifactId>
+ <version>${scribble.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.scribble.bundles</groupId>
+ <artifactId>org.scribble.protocol.projection</artifactId>
+ <version>${scribble.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.scribble.bundles</groupId>
+ <artifactId>org.scribble.protocol.parser</artifactId>
+ <version>${scribble.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.savara.bundles</groupId>
+ <artifactId>org.savara.core</artifactId>
+ <version>${savara.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.savara.bundles</groupId>
+ <artifactId>org.savara.bpel</artifactId>
+ <version>${savara.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.savara.bundles</groupId>
+ <artifactId>org.savara.wsdl</artifactId>
+ <version>${savara.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.savara.bundles</groupId>
+ <artifactId>org.savara.pi4soa.cdm</artifactId>
+ <version>${savara.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.savara.bundles</groupId>
+ <artifactId>org.savara.contract.model</artifactId>
+ <version>${savara.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <version>${osgi.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml</groupId>
+ <artifactId>jaxb-api</artifactId>
+ <version>${jaxb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <version>${jaxb.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.pi4soa</groupId>
+ <artifactId>org.pi4soa.common</artifactId>
+ <version>${pi4soa.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.pi4soa</groupId>
+ <artifactId>org.pi4soa.cdl</artifactId>
+ <version>${pi4soa.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.savara.dependencies.eclipse</groupId>
+ <artifactId>emf-common</artifactId>
+ <version>${emfcommon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.savara.dependencies.eclipse</groupId>
+ <artifactId>emf-ecore</artifactId>
+ <version>${emfecore.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.savara.dependencies.eclipse</groupId>
+ <artifactId>emf-ecore-xmi</artifactId>
+ <version>${emfecore.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
+ </dependencies>
+</project>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/parser/ParserTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/parser/ParserTest.java 2011-01-05 17:36:26 UTC (rev 536)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/parser/ParserTest.java 2011-01-05 22:13:01 UTC (rev 537)
@@ -19,7 +19,6 @@
import java.net.URI;
-import org.savara.util.ScribbleServices;
import org.scribble.common.logging.CachedJournal;
import org.scribble.common.resource.ResourceLocator;
import org.scribble.protocol.model.ProtocolModel;
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)Broker.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)Broker.bpel 2011-01-05 17:36:26 UTC (rev 536)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)Broker.bpel 2011-01-05 22:13:01 UTC (rev 537)
@@ -1,61 +1,61 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" name="ESBBrokerProcess_Broker" targetNamespace="http://www.pi4soa.org/ESBBroker/Broker">
- <import namespace="http://www.pi4soa.org/ESBBroker/Broker" location="ESBBrokerProcess_Broker.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import namespace="http://www.pi4soa.org/ESBBroker/CreditAgency" location="ESBBrokerProcess_CreditAgency.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import namespace="http://www.pi4soa.org/ESBBroker/Supplier" location="ESBBrokerProcess_Supplier.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import namespace="http://www.pi4soa.org/ESBBroker/Broker" location="ESBBrokerProcess_BrokerArtifacts.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" targetNamespace="http://www.pi4soa.org/ESBBroker/Broker" name="ESBBrokerProcess_Broker">
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Broker.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Broker"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_BrokerArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Broker"/>
<partnerLinks>
- <partnerLink name="BuyerToBroker" partnerLinkType="brk:BuyerToBrokerServiceLT" myRole="BrokerBehavior"/>
- <partnerLink name="BrokerToSupplierQuoteEngine" partnerLinkType="brk:BrokerToSupplierQuoteEngineLT" partnerRole="SupplierQuoteEngineRequester"/>
- <partnerLink name="BrokerToCreditAgency" partnerLinkType="brk:BrokerToCreditAgencyLT" partnerRole="CreditAgencyRequester"/>
- <partnerLink name="BrokerToSupplierTxnProcessor" partnerLinkType="brk:BrokerToSupplierTxnProcessorLT" partnerRole="SupplierTxnProcessorRequester"/>
+ <partnerLink myRole="BrokerBehavior" partnerLinkType="brk:BuyerToBrokerServiceLT" name="BuyerToBroker"/>
+ <partnerLink partnerRole="SupplierQuoteEngineRequester" partnerLinkType="brk:BrokerToSupplierQuoteEngineLT" name="BrokerToSupplierQuoteEngine"/>
+ <partnerLink partnerRole="CreditAgencyRequester" partnerLinkType="brk:BrokerToCreditAgencyLT" name="BrokerToCreditAgency"/>
+ <partnerLink partnerRole="SupplierTxnProcessorRequester" partnerLinkType="brk:BrokerToSupplierTxnProcessorLT" name="BrokerToSupplierTxnProcessor"/>
</partnerLinks>
<variables>
- <variable name="makeEnquiryRequestVar" messageType="brk:makeEnquiryRequest"/>
- <variable name="getQuoteRequestVar" messageType="spr:getQuoteRequest"/>
- <variable name="getQuoteResponseVar" messageType="spr:getQuoteResponse"/>
- <variable name="makeEnquiryResponseVar" messageType="brk:makeEnquiryResponse"/>
- <variable name="checkCreditRequestVar" messageType="cay:checkCreditRequest"/>
- <variable name="checkCreditResponseVar" messageType="cay:checkCreditResponse"/>
- <variable name="confirmRequestVar" messageType="spr:confirmRequest"/>
- <variable name="confirmResponseVar" messageType="spr:confirmResponse"/>
- <variable name="buyResponseVar" messageType="brk:buyResponse"/>
- <variable name="rejectedFaultVar" messageType="brk:rejectedFault"/>
- <variable name="buyRequestVar" messageType="brk:buyRequest"/>
- <variable name="cancelRequestVar" messageType="brk:cancelRequest"/>
+ <variable messageType="brk:makeEnquiryRequest" name="makeEnquiryRequestVar"/>
+ <variable messageType="spr:getQuoteRequest" name="getQuoteRequestVar"/>
+ <variable messageType="spr:getQuoteResponse" name="getQuoteResponseVar"/>
+ <variable messageType="brk:makeEnquiryResponse" name="makeEnquiryResponseVar"/>
+ <variable messageType="cay:checkCreditRequest" name="checkCreditRequestVar"/>
+ <variable messageType="cay:checkCreditResponse" name="checkCreditResponseVar"/>
+ <variable messageType="spr:confirmRequest" name="confirmRequestVar"/>
+ <variable messageType="spr:confirmResponse" name="confirmResponseVar"/>
+ <variable messageType="brk:buyResponse" name="buyResponseVar"/>
+ <variable messageType="brk:rejectedFault" name="rejectedFaultVar"/>
+ <variable messageType="brk:buyRequest" name="buyRequestVar"/>
+ <variable messageType="brk:cancelRequest" name="cancelRequestVar"/>
</variables>
<sequence>
- <receive partnerLink="BuyerToBroker" portType="brk:BrokerBehavior" operation="makeEnquiry" variable="makeEnquiryRequestVar" createInstance="yes" name="Receive_enquiry"/>
+ <receive createInstance="yes" variable="makeEnquiryRequestVar" operation="makeEnquiry" portType="brk:BrokerBehavior" partnerLink="BuyerToBroker" name="Receive_enquiry"/>
<while>
<sequence>
<scope>
<sequence>
- <invoke partnerLink="BrokerToSupplierQuoteEngine" portType="spr:SupplierBehavior" operation="getQuote" inputVariable="getQuoteRequestVar" outputVariable="getQuoteResponseVar" name="Send_requestForQuote"/>
+ <invoke outputVariable="getQuoteResponseVar" inputVariable="getQuoteRequestVar" operation="getQuote" portType="spr:SupplierBehavior" partnerLink="BrokerToSupplierQuoteEngine" name="Send_requestForQuote"/>
</sequence>
</scope>
</sequence>
</while>
- <reply partnerLink="BuyerToBroker" portType="brk:BrokerBehavior" operation="makeEnquiry" variable="makeEnquiryResponseVar" name="Send_quoteList"/>
+ <reply variable="makeEnquiryResponseVar" operation="makeEnquiry" portType="brk:BrokerBehavior" partnerLink="BuyerToBroker" name="Send_quoteList"/>
<pick>
- <onMessage partnerLink="BuyerToBroker" portType="brk:BrokerBehavior" operation="buy" variable="buyRequestVar">
+ <onMessage variable="buyRequestVar" operation="buy" portType="brk:BrokerBehavior" partnerLink="BuyerToBroker">
<sequence>
<scope>
<faultHandlers>
- <catch faultName="cay:invalidCredit" faultVariable="invalidCreditFaultVar" faultMessageType="cay:invalidCreditFault">
+ <catch faultMessageType="cay:invalidCreditFault" faultVariable="invalidCreditFaultVar" faultName="cay:invalidCredit">
<sequence>
- <reply partnerLink="BuyerToBroker" portType="brk:BrokerBehavior" operation="buy" variable="rejectedFaultVar" faultName="brk:rejected" name="Send_orderRejected"/>
+ <reply faultName="brk:rejected" variable="rejectedFaultVar" operation="buy" portType="brk:BrokerBehavior" partnerLink="BuyerToBroker" name="Send_orderRejected"/>
</sequence>
</catch>
</faultHandlers>
<sequence>
- <invoke partnerLink="BrokerToCreditAgency" portType="cay:CreditAgencyBehavior" operation="checkCredit" inputVariable="checkCreditRequestVar" outputVariable="checkCreditResponseVar" name="Send_CreditCheckRequest"/>
- <invoke partnerLink="BrokerToSupplierTxnProcessor" portType="spr:SupplierBehavior" operation="confirm" inputVariable="confirmRequestVar" outputVariable="confirmResponseVar" name="Send_orderConfirmed"/>
- <reply partnerLink="BuyerToBroker" portType="brk:BrokerBehavior" operation="buy" variable="buyResponseVar" name="Send_bookingReference"/>
+ <invoke outputVariable="checkCreditResponseVar" inputVariable="checkCreditRequestVar" operation="checkCredit" portType="cay:CreditAgencyBehavior" partnerLink="BrokerToCreditAgency" name="Send_CreditCheckRequest"/>
+ <invoke outputVariable="confirmResponseVar" inputVariable="confirmRequestVar" operation="confirm" portType="spr:SupplierBehavior" partnerLink="BrokerToSupplierTxnProcessor" name="Send_orderConfirmed"/>
+ <reply variable="buyResponseVar" operation="buy" portType="brk:BrokerBehavior" partnerLink="BuyerToBroker" name="Send_bookingReference"/>
</sequence>
</scope>
</sequence>
</onMessage>
- <onMessage partnerLink="BuyerToBroker" portType="brk:BrokerBehavior" operation="cancel" variable="cancelRequestVar">
+ <onMessage variable="cancelRequestVar" operation="cancel" portType="brk:BrokerBehavior" partnerLink="BuyerToBroker">
<sequence/>
</onMessage>
</pick>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)Buyer.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)Buyer.bpel 2011-01-05 17:36:26 UTC (rev 536)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)Buyer.bpel 2011-01-05 22:13:01 UTC (rev 537)
@@ -1,37 +1,37 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" name="ESBBrokerProcess_Buyer" targetNamespace="http://www.pi4soa.org/ESBBroker/Buyer">
- <import namespace="http://www.pi4soa.org/ESBBroker/Broker" location="ESBBrokerProcess_Broker.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import namespace="http://www.pi4soa.org/ESBBroker/CreditAgency" location="ESBBrokerProcess_CreditAgency.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import namespace="http://www.pi4soa.org/ESBBroker/Supplier" location="ESBBrokerProcess_Supplier.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import namespace="http://www.pi4soa.org/ESBBroker/Buyer" location="ESBBrokerProcess_BuyerArtifacts.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" targetNamespace="http://www.pi4soa.org/ESBBroker/Buyer" name="ESBBrokerProcess_Buyer">
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Broker.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Broker"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_BuyerArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Buyer"/>
<partnerLinks>
- <partnerLink name="BuyerToBroker" partnerLinkType="byr:BuyerToBrokerLT" partnerRole="BrokerRequester"/>
+ <partnerLink partnerRole="BrokerRequester" partnerLinkType="byr:BuyerToBrokerLT" name="BuyerToBroker"/>
</partnerLinks>
<variables>
- <variable name="makeEnquiryRequestVar" messageType="brk:makeEnquiryRequest"/>
- <variable name="makeEnquiryResponseVar" messageType="brk:makeEnquiryResponse"/>
- <variable name="buyRequestVar" messageType="byr:buyRequest"/>
- <variable name="buyResponseVar" messageType="brk:buyResponse"/>
- <variable name="cancelRequestVar" messageType="byr:cancelRequest"/>
+ <variable messageType="brk:makeEnquiryRequest" name="makeEnquiryRequestVar"/>
+ <variable messageType="brk:makeEnquiryResponse" name="makeEnquiryResponseVar"/>
+ <variable messageType="byr:buyRequest" name="buyRequestVar"/>
+ <variable messageType="brk:buyResponse" name="buyResponseVar"/>
+ <variable messageType="byr:cancelRequest" name="cancelRequestVar"/>
</variables>
<sequence>
- <invoke partnerLink="BuyerToBroker" portType="brk:BrokerBehavior" operation="makeEnquiry" inputVariable="makeEnquiryRequestVar" outputVariable="makeEnquiryResponseVar" name="Send_enquiry"/>
+ <invoke outputVariable="makeEnquiryResponseVar" inputVariable="makeEnquiryRequestVar" operation="makeEnquiry" portType="brk:BrokerBehavior" partnerLink="BuyerToBroker" name="Send_enquiry"/>
<if>
<sequence>
<scope>
<faultHandlers>
- <catch faultName="brk:rejected" faultVariable="rejectedFaultVar" faultMessageType="brk:rejectedFault">
+ <catch faultMessageType="brk:rejectedFault" faultVariable="rejectedFaultVar" faultName="brk:rejected">
<sequence/>
</catch>
</faultHandlers>
<sequence>
- <invoke partnerLink="BuyerToBroker" portType="byr:BuyerBehavior" operation="buy" inputVariable="buyRequestVar" outputVariable="buyResponseVar" name="Send_buy"/>
+ <invoke outputVariable="buyResponseVar" inputVariable="buyRequestVar" operation="buy" portType="byr:BuyerBehavior" partnerLink="BuyerToBroker" name="Send_buy"/>
</sequence>
</scope>
</sequence>
<else>
<sequence>
- <invoke partnerLink="BuyerToBroker" portType="byr:BuyerBehavior" operation="cancel" inputVariable="cancelRequestVar" name="Send_cancel"/>
+ <invoke inputVariable="cancelRequestVar" operation="cancel" portType="byr:BuyerBehavior" partnerLink="BuyerToBroker" name="Send_cancel"/>
</sequence>
</else>
</if>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)CreditAgency.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)CreditAgency.bpel 2011-01-05 17:36:26 UTC (rev 536)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)CreditAgency.bpel 2011-01-05 22:13:01 UTC (rev 537)
@@ -1,27 +1,27 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" name="ESBBrokerProcess_CreditAgency" targetNamespace="http://www.pi4soa.org/ESBBroker/CreditAgency">
- <import namespace="http://www.pi4soa.org/ESBBroker/CreditAgency" location="ESBBrokerProcess_CreditAgency.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import namespace="http://www.pi4soa.org/ESBBroker/Broker" location="ESBBrokerProcess_Broker.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import namespace="http://www.pi4soa.org/ESBBroker/Supplier" location="ESBBrokerProcess_Supplier.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import namespace="http://www.pi4soa.org/ESBBroker/Supplier" location="ESBBrokerProcess_SupplierTxnProcessor.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import namespace="http://www.pi4soa.org/ESBBroker/CreditAgency" location="ESBBrokerProcess_CreditAgencyArtifacts.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" targetNamespace="http://www.pi4soa.org/ESBBroker/CreditAgency" name="ESBBrokerProcess_CreditAgency">
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_CreditAgency.wsdl" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Broker.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Broker"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_Supplier.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_SupplierTxnProcessor.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="ESBBrokerProcess_CreditAgencyArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/>
<partnerLinks>
- <partnerLink name="BrokerToCreditAgency" partnerLinkType="cay:BrokerToCreditAgencyServiceLT" myRole="CreditAgency"/>
+ <partnerLink myRole="CreditAgency" partnerLinkType="cay:BrokerToCreditAgencyServiceLT" name="BrokerToCreditAgency"/>
</partnerLinks>
<variables>
- <variable name="checkCreditRequestVar" messageType="cay:checkCreditRequest"/>
- <variable name="checkCreditResponseVar" messageType="cay:checkCreditResponse"/>
- <variable name="invalidCreditFaultVar" messageType="cay:invalidCreditFault"/>
+ <variable messageType="cay:checkCreditRequest" name="checkCreditRequestVar"/>
+ <variable messageType="cay:checkCreditResponse" name="checkCreditResponseVar"/>
+ <variable messageType="cay:invalidCreditFault" name="invalidCreditFaultVar"/>
</variables>
<sequence>
- <receive partnerLink="BrokerToCreditAgency" portType="cay:CreditAgencyBehavior" operation="checkCredit" variable="checkCreditRequestVar" createInstance="yes" name="Receive_CreditCheckRequest"/>
+ <receive createInstance="yes" variable="checkCreditRequestVar" operation="checkCredit" portType="cay:CreditAgencyBehavior" partnerLink="BrokerToCreditAgency" name="Receive_CreditCheckRequest"/>
<if>
<sequence>
- <reply partnerLink="BrokerToCreditAgency" portType="cay:CreditAgencyBehavior" operation="checkCredit" variable="checkCreditResponseVar" name="Send_CreditCheckOk"/>
+ <reply variable="checkCreditResponseVar" operation="checkCredit" portType="cay:CreditAgencyBehavior" partnerLink="BrokerToCreditAgency" name="Send_CreditCheckOk"/>
</sequence>
<else>
<sequence>
- <reply partnerLink="BrokerToCreditAgency" portType="cay:CreditAgencyBehavior" operation="checkCredit" variable="invalidCreditFaultVar" faultName="cay:invalidCredit" name="Send_CreditCheckInvalid"/>
+ <reply faultName="cay:invalidCredit" variable="invalidCreditFaultVar" operation="checkCredit" portType="cay:CreditAgencyBehavior" partnerLink="BrokerToCreditAgency" name="Send_CreditCheckInvalid"/>
</sequence>
</else>
</if>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel 2011-01-05 17:36:26 UTC (rev 536)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel 2011-01-05 22:13:01 UTC (rev 537)
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" name="RequestForQuote_SupplierQuoteEngine" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier">
- <import namespace="http://www.pi4soa.org/ESBBroker/Supplier" location="RequestForQuote_SupplierQuoteEngine.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import namespace="http://www.pi4soa.org/ESBBroker/Supplier" location="RequestForQuote_SupplierQuoteEngineArtifacts.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier" name="RequestForQuote_SupplierQuoteEngine">
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="RequestForQuote_SupplierQuoteEngine.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="RequestForQuote_SupplierQuoteEngineArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/>
<partnerLinks>
- <partnerLink name="BrokerToSupplierQuoteEngine" partnerLinkType="spr:BrokerToSupplierQuoteEngineServiceLT" myRole="SupplierBehavior"/>
+ <partnerLink myRole="SupplierBehavior" partnerLinkType="spr:BrokerToSupplierQuoteEngineServiceLT" name="BrokerToSupplierQuoteEngine"/>
</partnerLinks>
<variables>
- <variable name="getQuoteRequestVar" messageType="spr:getQuoteRequest"/>
- <variable name="getQuoteResponseVar" messageType="spr:getQuoteResponse"/>
+ <variable messageType="spr:getQuoteRequest" name="getQuoteRequestVar"/>
+ <variable messageType="spr:getQuoteResponse" name="getQuoteResponseVar"/>
</variables>
<sequence>
- <receive partnerLink="BrokerToSupplierQuoteEngine" portType="spr:SupplierBehavior" operation="getQuote" variable="getQuoteRequestVar" createInstance="yes" name="Receive_requestForQuote"/>
- <reply partnerLink="BrokerToSupplierQuoteEngine" portType="spr:SupplierBehavior" operation="getQuote" variable="getQuoteResponseVar" name="Send_quote"/>
+ <receive createInstance="yes" variable="getQuoteRequestVar" operation="getQuote" portType="spr:SupplierBehavior" partnerLink="BrokerToSupplierQuoteEngine" name="Receive_requestForQuote"/>
+ <reply variable="getQuoteResponseVar" operation="getQuote" portType="spr:SupplierBehavior" partnerLink="BrokerToSupplierQuoteEngine" name="Send_quote"/>
</sequence>
</process>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel 2011-01-05 17:36:26 UTC (rev 536)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel 2011-01-05 22:13:01 UTC (rev 537)
@@ -1,16 +1,16 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" name="CompleteTransaction_SupplierTxnProcessor" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier">
- <import namespace="http://www.pi4soa.org/ESBBroker/Supplier" location="CompleteTransaction_SupplierTxnProcessor.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import namespace="http://www.pi4soa.org/ESBBroker/Supplier" location="CompleteTransaction_SupplierTxnProcessorArtifacts.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:cay="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns:byr="http://www.pi4soa.org/ESBBroker/Buyer" xmlns:brk="http://www.pi4soa.org/ESBBroker/Broker" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier" name="CompleteTransaction_SupplierTxnProcessor">
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="CompleteTransaction_SupplierTxnProcessor.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="CompleteTransaction_SupplierTxnProcessorArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/Supplier"/>
<partnerLinks>
- <partnerLink name="BrokerToSupplierTxnProcessor" partnerLinkType="spr:BrokerToSupplierTxnProcessorServiceLT" myRole="SupplierTxnProcessor"/>
+ <partnerLink myRole="SupplierTxnProcessor" partnerLinkType="spr:BrokerToSupplierTxnProcessorServiceLT" name="BrokerToSupplierTxnProcessor"/>
</partnerLinks>
<variables>
- <variable name="confirmRequestVar" messageType="spr:confirmRequest"/>
- <variable name="confirmResponseVar" messageType="spr:confirmResponse"/>
+ <variable messageType="spr:confirmRequest" name="confirmRequestVar"/>
+ <variable messageType="spr:confirmResponse" name="confirmResponseVar"/>
</variables>
<sequence>
- <receive partnerLink="BrokerToSupplierTxnProcessor" portType="spr:SupplierBehavior" operation="confirm" variable="confirmRequestVar" createInstance="yes" name="Receive_orderConfirmed"/>
- <reply partnerLink="BrokerToSupplierTxnProcessor" portType="spr:SupplierBehavior" operation="confirm" variable="confirmResponseVar" name="Send_bookingReference"/>
+ <receive createInstance="yes" variable="confirmRequestVar" operation="confirm" portType="spr:SupplierBehavior" partnerLink="BrokerToSupplierTxnProcessor" name="Receive_orderConfirmed"/>
+ <reply variable="confirmResponseVar" operation="confirm" portType="spr:SupplierBehavior" partnerLink="BrokerToSupplierTxnProcessor" name="Send_bookingReference"/>
</sequence>
</process>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)Buyer.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)Buyer.bpel 2011-01-05 17:36:26 UTC (rev 536)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)Buyer.bpel 2011-01-05 22:13:01 UTC (rev 537)
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:tns="http://www.jboss.org/savara/examples" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:sto="http://www.jboss.org/examples/store" xmlns:pur="java:org.jboss.savara.examples.purchasing" name="PurchaseGoodsProcess_Buyer" targetNamespace="http://www.jboss.org/savara/examples">
- <import namespace="java:org.jboss.savara.examples.purchasing" location="PurchaseGoodsProcess_CreditAgency.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import namespace="http://www.jboss.org/examples/store" location="PurchaseGoodsProcess_Store.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import namespace="http://www.jboss.org/savara/examples" location="PurchaseGoodsProcess_BuyerArtifacts.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:tns="http://www.jboss.org/savara/examples" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:sto="http://www.jboss.org/examples/store" xmlns:pur="java:org.jboss.savara.examples.purchasing" targetNamespace="http://www.jboss.org/savara/examples" name="PurchaseGoodsProcess_Buyer">
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_CreditAgency.wsdl" namespace="java:org.jboss.savara.examples.purchasing"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_Store.wsdl" namespace="http://www.jboss.org/examples/store"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_BuyerArtifacts.wsdl" namespace="http://www.jboss.org/savara/examples"/>
<partnerLinks>
- <partnerLink name="BuyerToStore" partnerLinkType="tns:BuyerToStoreLT" partnerRole="StoreRequester"/>
+ <partnerLink partnerRole="StoreRequester" partnerLinkType="tns:BuyerToStoreLT" name="BuyerToStore"/>
</partnerLinks>
<variables>
- <variable name="buyRequestVar" messageType="sto:buyRequest"/>
- <variable name="buyResponseVar" messageType="sto:buyResponse"/>
+ <variable messageType="sto:buyRequest" name="buyRequestVar"/>
+ <variable messageType="sto:buyResponse" name="buyResponseVar"/>
</variables>
<sequence>
<scope>
<faultHandlers>
- <catch faultName="sto:BuyFailed" faultVariable="BuyFailedFaultVar" faultMessageType="sto:BuyFailedFault">
+ <catch faultMessageType="sto:BuyFailedFault" faultVariable="BuyFailedFaultVar" faultName="sto:BuyFailed">
<sequence/>
</catch>
</faultHandlers>
<sequence>
- <invoke partnerLink="BuyerToStore" portType="sto:StoreInterface" operation="buy" inputVariable="buyRequestVar" outputVariable="buyResponseVar" name="Send_BuyRequest"/>
+ <invoke outputVariable="buyResponseVar" inputVariable="buyRequestVar" operation="buy" portType="sto:StoreInterface" partnerLink="BuyerToStore" name="Send_BuyRequest"/>
</sequence>
</scope>
</sequence>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)CreditAgency.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)CreditAgency.bpel 2011-01-05 17:36:26 UTC (rev 536)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)CreditAgency.bpel 2011-01-05 22:13:01 UTC (rev 537)
@@ -1,25 +1,25 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:tns="http://www.jboss.org/savara/examples" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:sto="http://www.jboss.org/examples/store" xmlns:pur="java:org.jboss.savara.examples.purchasing" name="PurchaseGoodsProcess_CreditAgency" targetNamespace="java:org.jboss.savara.examples.purchasing">
- <import namespace="java:org.jboss.savara.examples.purchasing" location="PurchaseGoodsProcess_CreditAgency.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import namespace="http://www.jboss.org/examples/store" location="PurchaseGoodsProcess_Store.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import namespace="java:org.jboss.savara.examples.purchasing" location="PurchaseGoodsProcess_CreditAgencyArtifacts.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:tns="http://www.jboss.org/savara/examples" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:sto="http://www.jboss.org/examples/store" xmlns:pur="java:org.jboss.savara.examples.purchasing" targetNamespace="java:org.jboss.savara.examples.purchasing" name="PurchaseGoodsProcess_CreditAgency">
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_CreditAgency.wsdl" namespace="java:org.jboss.savara.examples.purchasing"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_Store.wsdl" namespace="http://www.jboss.org/examples/store"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_CreditAgencyArtifacts.wsdl" namespace="java:org.jboss.savara.examples.purchasing"/>
<partnerLinks>
- <partnerLink name="StoreToCreditAgency" partnerLinkType="pur:StoreToCreditAgencyServiceLT" myRole="CreditAgencyInterface"/>
+ <partnerLink myRole="CreditAgencyInterface" partnerLinkType="pur:StoreToCreditAgencyServiceLT" name="StoreToCreditAgency"/>
</partnerLinks>
<variables>
- <variable name="checkCreditRequestVar" messageType="pur:checkCreditRequest"/>
- <variable name="checkCreditResponseVar" messageType="pur:checkCreditResponse"/>
- <variable name="CreditCheckFailedFaultVar" messageType="pur:CreditCheckFailedFault"/>
+ <variable messageType="pur:checkCreditRequest" name="checkCreditRequestVar"/>
+ <variable messageType="pur:checkCreditResponse" name="checkCreditResponseVar"/>
+ <variable messageType="pur:CreditCheckFailedFault" name="CreditCheckFailedFaultVar"/>
</variables>
<sequence>
- <receive partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" operation="checkCredit" variable="checkCreditRequestVar" createInstance="yes" name="Receive_CreditCheckRequest"/>
+ <receive createInstance="yes" variable="checkCreditRequestVar" operation="checkCredit" portType="pur:CreditAgencyInterface" partnerLink="StoreToCreditAgency" name="Receive_CreditCheckRequest"/>
<if>
<sequence>
- <reply partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" operation="checkCredit" variable="checkCreditResponseVar" name="Send_CreditCheckOk"/>
+ <reply variable="checkCreditResponseVar" operation="checkCredit" portType="pur:CreditAgencyInterface" partnerLink="StoreToCreditAgency" name="Send_CreditCheckOk"/>
</sequence>
<else>
<sequence>
- <reply partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" operation="checkCredit" variable="CreditCheckFailedFaultVar" faultName="pur:CreditCheckFailed" name="Send_CreditCheckInvalid"/>
+ <reply faultName="pur:CreditCheckFailed" variable="CreditCheckFailedFaultVar" operation="checkCredit" portType="pur:CreditAgencyInterface" partnerLink="StoreToCreditAgency" name="Send_CreditCheckInvalid"/>
</sequence>
</else>
</if>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)Store.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)Store.bpel 2011-01-05 17:36:26 UTC (rev 536)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/PurchaseGoods(a)Store.bpel 2011-01-05 22:13:01 UTC (rev 537)
@@ -1,32 +1,32 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:tns="http://www.jboss.org/savara/examples" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:sto="http://www.jboss.org/examples/store" xmlns:pur="java:org.jboss.savara.examples.purchasing" name="PurchaseGoodsProcess_Store" targetNamespace="http://www.jboss.org/examples/store">
- <import namespace="http://www.jboss.org/examples/store" location="PurchaseGoodsProcess_Store.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import namespace="java:org.jboss.savara.examples.purchasing" location="PurchaseGoodsProcess_CreditAgency.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import namespace="http://www.jboss.org/examples/store" location="PurchaseGoodsProcess_StoreArtifacts.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:tns="http://www.jboss.org/savara/examples" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:sto="http://www.jboss.org/examples/store" xmlns:pur="java:org.jboss.savara.examples.purchasing" targetNamespace="http://www.jboss.org/examples/store" name="PurchaseGoodsProcess_Store">
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_Store.wsdl" namespace="http://www.jboss.org/examples/store"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_CreditAgency.wsdl" namespace="java:org.jboss.savara.examples.purchasing"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_StoreArtifacts.wsdl" namespace="http://www.jboss.org/examples/store"/>
<partnerLinks>
- <partnerLink name="BuyerToStore" partnerLinkType="sto:BuyerToStoreServiceLT" myRole="StoreInterface"/>
- <partnerLink name="StoreToCreditAgency" partnerLinkType="sto:StoreToCreditAgencyLT" partnerRole="CreditAgencyRequester"/>
+ <partnerLink myRole="StoreInterface" partnerLinkType="sto:BuyerToStoreServiceLT" name="BuyerToStore"/>
+ <partnerLink partnerRole="CreditAgencyRequester" partnerLinkType="sto:StoreToCreditAgencyLT" name="StoreToCreditAgency"/>
</partnerLinks>
<variables>
- <variable name="buyRequestVar" messageType="sto:buyRequest"/>
- <variable name="checkCreditRequestVar" messageType="pur:checkCreditRequest"/>
- <variable name="checkCreditResponseVar" messageType="pur:checkCreditResponse"/>
- <variable name="buyResponseVar" messageType="sto:buyResponse"/>
- <variable name="BuyFailedFaultVar" messageType="sto:BuyFailedFault"/>
+ <variable messageType="sto:buyRequest" name="buyRequestVar"/>
+ <variable messageType="pur:checkCreditRequest" name="checkCreditRequestVar"/>
+ <variable messageType="pur:checkCreditResponse" name="checkCreditResponseVar"/>
+ <variable messageType="sto:buyResponse" name="buyResponseVar"/>
+ <variable messageType="sto:BuyFailedFault" name="BuyFailedFaultVar"/>
</variables>
<sequence>
- <receive partnerLink="BuyerToStore" portType="sto:StoreInterface" operation="buy" variable="buyRequestVar" createInstance="yes" name="Receive_BuyRequest"/>
+ <receive createInstance="yes" variable="buyRequestVar" operation="buy" portType="sto:StoreInterface" partnerLink="BuyerToStore" name="Receive_BuyRequest"/>
<scope>
<faultHandlers>
- <catch faultName="pur:CreditCheckFailed" faultVariable="CreditCheckFailedFaultVar" faultMessageType="pur:CreditCheckFailedFault">
+ <catch faultMessageType="pur:CreditCheckFailedFault" faultVariable="CreditCheckFailedFaultVar" faultName="pur:CreditCheckFailed">
<sequence>
- <reply partnerLink="BuyerToStore" portType="sto:StoreInterface" operation="buy" variable="BuyFailedFaultVar" faultName="sto:BuyFailed" name="Send_BuyFailed"/>
+ <reply faultName="sto:BuyFailed" variable="BuyFailedFaultVar" operation="buy" portType="sto:StoreInterface" partnerLink="BuyerToStore" name="Send_BuyFailed"/>
</sequence>
</catch>
</faultHandlers>
<sequence>
- <invoke partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" operation="checkCredit" inputVariable="checkCreditRequestVar" outputVariable="checkCreditResponseVar" name="Send_CreditCheckRequest"/>
- <reply partnerLink="BuyerToStore" portType="sto:StoreInterface" operation="buy" variable="buyResponseVar" name="Send_BuyConfirmed"/>
+ <invoke outputVariable="checkCreditResponseVar" inputVariable="checkCreditRequestVar" operation="checkCredit" portType="pur:CreditAgencyInterface" partnerLink="StoreToCreditAgency" name="Send_CreditCheckRequest"/>
+ <reply variable="buyResponseVar" operation="buy" portType="sto:StoreInterface" partnerLink="BuyerToStore" name="Send_BuyConfirmed"/>
</sequence>
</scope>
</sequence>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ReqRespFault(a)Buyer.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ReqRespFault(a)Buyer.bpel 2011-01-05 17:36:26 UTC (rev 536)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ReqRespFault(a)Buyer.bpel 2011-01-05 22:13:01 UTC (rev 537)
@@ -1,23 +1,23 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:tns="http://www.pi4soa.org/ReqRespFault" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:byr="http://www.pi4soa.org/ReqRespFault/Buyer" xmlns:slr="http://www.pi4soa.org/ReqRespFault/Seller" name="ReqRespFaultProcess_Buyer" targetNamespace="http://www.pi4soa.org/ReqRespFault/Buyer">
- <import namespace="http://www.pi4soa.org/ReqRespFault/Seller" location="ReqRespFaultProcess_Seller.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import namespace="http://www.pi4soa.org/ReqRespFault/Buyer" location="ReqRespFaultProcess_BuyerArtifacts.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:tns="http://www.pi4soa.org/ReqRespFault" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:byr="http://www.pi4soa.org/ReqRespFault/Buyer" xmlns:slr="http://www.pi4soa.org/ReqRespFault/Seller" targetNamespace="http://www.pi4soa.org/ReqRespFault/Buyer" name="ReqRespFaultProcess_Buyer">
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="ReqRespFaultProcess_Seller.wsdl" namespace="http://www.pi4soa.org/ReqRespFault/Seller"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="ReqRespFaultProcess_BuyerArtifacts.wsdl" namespace="http://www.pi4soa.org/ReqRespFault/Buyer"/>
<partnerLinks>
- <partnerLink name="BuyerToSeller" partnerLinkType="byr:BuyerToSellerLT" partnerRole="SellerRequester"/>
+ <partnerLink partnerRole="SellerRequester" partnerLinkType="byr:BuyerToSellerLT" name="BuyerToSeller"/>
</partnerLinks>
<variables>
- <variable name="checkCreditRequestVar" messageType="slr:checkCreditRequest"/>
- <variable name="checkCreditResponseVar" messageType="slr:checkCreditResponse"/>
+ <variable messageType="slr:checkCreditRequest" name="checkCreditRequestVar"/>
+ <variable messageType="slr:checkCreditResponse" name="checkCreditResponseVar"/>
</variables>
<sequence>
<scope>
<faultHandlers>
- <catch faultName="slr:insufficientCredit" faultVariable="insufficientCreditFaultVar" faultMessageType="slr:insufficientCreditFault">
+ <catch faultMessageType="slr:insufficientCreditFault" faultVariable="insufficientCreditFaultVar" faultName="slr:insufficientCredit">
<sequence/>
</catch>
</faultHandlers>
<sequence>
- <invoke partnerLink="BuyerToSeller" portType="slr:SellerBehavior" operation="checkCredit" inputVariable="checkCreditRequestVar" outputVariable="checkCreditResponseVar" name="Send_CreditCheckRequest"/>
+ <invoke outputVariable="checkCreditResponseVar" inputVariable="checkCreditRequestVar" operation="checkCredit" portType="slr:SellerBehavior" partnerLink="BuyerToSeller" name="Send_CreditCheckRequest"/>
</sequence>
</scope>
</sequence>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ReqRespFault(a)Seller.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ReqRespFault(a)Seller.bpel 2011-01-05 17:36:26 UTC (rev 536)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/generator/results/ReqRespFault(a)Seller.bpel 2011-01-05 22:13:01 UTC (rev 537)
@@ -1,24 +1,24 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:tns="http://www.pi4soa.org/ReqRespFault" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:byr="http://www.pi4soa.org/ReqRespFault/Buyer" xmlns:slr="http://www.pi4soa.org/ReqRespFault/Seller" name="ReqRespFaultProcess_Seller" targetNamespace="http://www.pi4soa.org/ReqRespFault/Seller">
- <import namespace="http://www.pi4soa.org/ReqRespFault/Seller" location="ReqRespFaultProcess_Seller.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
- <import namespace="http://www.pi4soa.org/ReqRespFault/Seller" location="ReqRespFaultProcess_SellerArtifacts.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:tns="http://www.pi4soa.org/ReqRespFault" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:byr="http://www.pi4soa.org/ReqRespFault/Buyer" xmlns:slr="http://www.pi4soa.org/ReqRespFault/Seller" targetNamespace="http://www.pi4soa.org/ReqRespFault/Seller" name="ReqRespFaultProcess_Seller">
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="ReqRespFaultProcess_Seller.wsdl" namespace="http://www.pi4soa.org/ReqRespFault/Seller"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="ReqRespFaultProcess_SellerArtifacts.wsdl" namespace="http://www.pi4soa.org/ReqRespFault/Seller"/>
<partnerLinks>
- <partnerLink name="BuyerToSeller" partnerLinkType="slr:BuyerToSellerServiceLT" myRole="SellerBehavior"/>
+ <partnerLink myRole="SellerBehavior" partnerLinkType="slr:BuyerToSellerServiceLT" name="BuyerToSeller"/>
</partnerLinks>
<variables>
- <variable name="checkCreditRequestVar" messageType="slr:checkCreditRequest"/>
- <variable name="checkCreditResponseVar" messageType="slr:checkCreditResponse"/>
- <variable name="insufficientCreditFaultVar" messageType="slr:insufficientCreditFault"/>
+ <variable messageType="slr:checkCreditRequest" name="checkCreditRequestVar"/>
+ <variable messageType="slr:checkCreditResponse" name="checkCreditResponseVar"/>
+ <variable messageType="slr:insufficientCreditFault" name="insufficientCreditFaultVar"/>
</variables>
<sequence>
- <receive partnerLink="BuyerToSeller" portType="slr:SellerBehavior" operation="checkCredit" variable="checkCreditRequestVar" createInstance="yes" name="Receive_CreditCheckRequest"/>
+ <receive createInstance="yes" variable="checkCreditRequestVar" operation="checkCredit" portType="slr:SellerBehavior" partnerLink="BuyerToSeller" name="Receive_CreditCheckRequest"/>
<if>
<sequence>
- <reply partnerLink="BuyerToSeller" portType="slr:SellerBehavior" operation="checkCredit" variable="checkCreditResponseVar" name="Send_CreditCheckOk"/>
+ <reply variable="checkCreditResponseVar" operation="checkCredit" portType="slr:SellerBehavior" partnerLink="BuyerToSeller" name="Send_CreditCheckOk"/>
</sequence>
<else>
<sequence>
- <reply partnerLink="BuyerToSeller" portType="slr:SellerBehavior" operation="checkCredit" variable="insufficientCreditFaultVar" faultName="slr:insufficientCredit" name="Send_CreditCheckInvalid"/>
+ <reply faultName="slr:insufficientCredit" variable="insufficientCreditFaultVar" operation="checkCredit" portType="slr:SellerBehavior" partnerLink="BuyerToSeller" name="Send_CreditCheckInvalid"/>
</sequence>
</else>
</if>
Modified: branches/experimental/2.0.x/bundles/org.savara.core/META-INF/MANIFEST.MF
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.core/META-INF/MANIFEST.MF 2011-01-05 17:36:26 UTC (rev 536)
+++ branches/experimental/2.0.x/bundles/org.savara.core/META-INF/MANIFEST.MF 2011-01-05 22:13:01 UTC (rev 537)
@@ -8,8 +8,7 @@
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Import-Package: org.osgi.framework;version="1.3.0"
Require-Bundle: org.scribble.common,
- org.scribble.protocol,
- org.scribble.protocol.monitor
+ org.scribble.protocol
Export-Package: org.savara.model.change,
org.savara.model.generator,
org.savara.util
Property changes on: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm
___________________________________________________________________
Name: svn:ignore
- bin
+ bin
target
Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/pom.xml
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/pom.xml 2011-01-05 17:36:26 UTC (rev 536)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/pom.xml 2011-01-05 22:13:01 UTC (rev 537)
@@ -1,15 +1,15 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.savara.tools</groupId>
+ <groupId>org.savara.bundles</groupId>
<artifactId>org.savara.pi4soa.cdm</artifactId>
<version>2.0.0-SNAPSHOT</version>
- <packaging>eclipse-plugin</packaging>
- <name>Savara::Tools::Plugins::Pi4SOACDM</name>
+ <packaging>jar</packaging>
+ <name>Savara::Bundles::Pi4SOACDM</name>
<parent>
- <groupId>org.savara.tools</groupId>
- <artifactId>plugins</artifactId>
+ <groupId>org.savara</groupId>
+ <artifactId>bundles</artifactId>
<version>2.0.0-SNAPSHOT</version>
</parent>
@@ -44,6 +44,37 @@
<artifactId>org.savara.contract.model</artifactId>
<version>${savara.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.pi4soa</groupId>
+ <artifactId>org.pi4soa.common</artifactId>
+ <version>${pi4soa.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.pi4soa</groupId>
+ <artifactId>org.pi4soa.cdl</artifactId>
+ <version>${pi4soa.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.savara.dependencies.eclipse</groupId>
+ <artifactId>emf-common</artifactId>
+ <version>${emfcommon.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.savara.dependencies.eclipse</groupId>
+ <artifactId>emf-ecore</artifactId>
+ <version>${emfecore.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.savara.dependencies.eclipse</groupId>
+ <artifactId>emf-ecore-xmi</artifactId>
+ <version>${emfecore.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>${junit.version}</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<!--
Modified: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/CDMProtocolParserTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/CDMProtocolParserTest.java 2011-01-05 17:36:26 UTC (rev 536)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/CDMProtocolParserTest.java 2011-01-05 22:13:01 UTC (rev 537)
@@ -3,7 +3,6 @@
import static org.junit.Assert.*;
import org.scribble.common.logging.Journal;
-import org.scribble.common.logging.TestJournal;
import org.scribble.protocol.model.ProtocolModel;
public class CDMProtocolParserTest {
Added: branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/TestJournal.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/TestJournal.java (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.pi4soa.cdm/src/test/java/org/savara/pi4soa/cdm/parser/TestJournal.java 2011-01-05 22:13:01 UTC (rev 537)
@@ -0,0 +1,68 @@
+/*
+ * Copyright 2009 www.scribble.org
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.savara.pi4soa.cdm.parser;
+
+import java.util.Map;
+
+import org.scribble.common.logging.Journal;
+
+//import static org.junit.Assert.*;
+
+(a)org.junit.Ignore
+public class TestJournal implements Journal {
+
+ public void debug(String issue, Map<String, Object> props) {
+ }
+
+ public void error(String issue, Map<String, Object> props) {
+ m_errors.add(issue);
+ }
+
+ public int getErrorCount() {
+ return(m_errors.size());
+ }
+
+ public void verifyErrors(String[] errors) {
+ java.util.List<String> logged=new java.util.Vector<String>(m_errors);
+
+ for (int i=0; i < errors.length; i++) {
+ int ind=logged.indexOf(errors[i]);
+
+ if (ind == -1) {
+ //fail("Expected message '"+errors[i]+"' did not occur");
+ throw new RuntimeException("Expected message '"+errors[i]+"' did not occur");
+ } else {
+ logged.remove(ind);
+ }
+ }
+
+ if (logged.size() > 0) {
+ //fail("Unexpected errors occurred: "+logged);
+ throw new RuntimeException("Unexpected errors occurred: "+logged);
+ }
+ }
+
+ public void info(String issue, Map<String, Object> props) {
+ }
+
+ public void trace(String issue, Map<String, Object> props) {
+ }
+
+ public void warning(String issue, Map<String, Object> props) {
+ }
+
+ private java.util.List<String> m_errors=new java.util.Vector<String>();
+}
Modified: branches/experimental/2.0.x/bundles/pom.xml
===================================================================
--- branches/experimental/2.0.x/bundles/pom.xml 2011-01-05 17:36:26 UTC (rev 536)
+++ branches/experimental/2.0.x/bundles/pom.xml 2011-01-05 22:13:01 UTC (rev 537)
@@ -20,10 +20,12 @@
</properties>
<modules>
+ <module>org.savara.bpel</module>
+ <module>org.savara.bpel.tests</module>
+ <module>org.savara.contract.model</module>
<module>org.savara.core</module>
- <module>org.savara.contract.model</module>
+ <module>org.savara.pi4soa.cdm</module>
<module>org.savara.wsdl</module>
- <module>org.savara.bpel</module>
</modules>
<build>
Modified: branches/experimental/2.0.x/pom.xml
===================================================================
--- branches/experimental/2.0.x/pom.xml 2011-01-05 17:36:26 UTC (rev 536)
+++ branches/experimental/2.0.x/pom.xml 2011-01-05 22:13:01 UTC (rev 537)
@@ -48,6 +48,8 @@
<jaxb.version>2.1</jaxb.version>
<jboss.version>5.1.0.GA</jboss.version>
<jbossws.version>3.2.2.GA</jbossws.version>
+ <emfcommon.version>2.3.0</emfcommon.version>
+ <emfecore.version>2.3.1</emfecore.version>
</properties>
<modules>
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/pom.xml 2011-01-05 17:36:26 UTC (rev 536)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.bpel/pom.xml 2011-01-05 22:13:01 UTC (rev 537)
@@ -16,11 +16,11 @@
<dependencies>
<dependency>
<groupId>org.scribble.bundles</groupId>
- <artifactId>org.scribble.parser</artifactId>
+ <artifactId>org.scribble.protocol</artifactId>
<version>${scribble.version}</version>
</dependency>
<dependency>
- <groupId>org.savara.bundles</groupId>
+ <groupId>org.scribble.bundles</groupId>
<artifactId>org.scribble.protocol.parser</artifactId>
<version>${scribble.version}</version>
</dependency>
Modified: branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/pom.xml 2011-01-05 17:36:26 UTC (rev 536)
+++ branches/experimental/2.0.x/tools/plugins/org.savara.tools.wsdl/pom.xml 2011-01-05 22:13:01 UTC (rev 537)
@@ -16,7 +16,7 @@
<dependencies>
<dependency>
<groupId>org.scribble.bundles</groupId>
- <artifactId>org.scribble.parser</artifactId>
+ <artifactId>org.scribble.protocol</artifactId>
<version>${scribble.version}</version>
</dependency>
<dependency>
Modified: branches/experimental/2.0.x/tools/plugins/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/plugins/pom.xml 2011-01-05 17:36:26 UTC (rev 536)
+++ branches/experimental/2.0.x/tools/plugins/pom.xml 2011-01-05 22:13:01 UTC (rev 537)
@@ -5,27 +5,26 @@
<groupId>org.savara.tools</groupId>
<artifactId>plugins</artifactId>
<packaging>pom</packaging>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
<name>Savara::Tools::Plugins</name>
<parent>
<groupId>org.savara</groupId>
<artifactId>tools</artifactId>
- <version>1.2.0-SNAPSHOT</version>
+ <version>2.0.0-SNAPSHOT</version>
</parent>
<modules>
- <module>org.savara.pi4soa.cdm</module>
<module>org.savara.protocol.contract</module>
+ <module>org.savara.tap.eclipse</module>
<module>org.savara.tap.model</module>
<module>org.savara.tap.validation</module>
- <module>org.savara.tap.eclipse</module>
- <module>org.savara.tools.wsdl</module>
<module>org.savara.tools.bpel</module>
- <module>org.savara.tools.validator</module>
<module>org.savara.tools.bpmn</module>
+ <module>org.savara.tools.core</module>
<module>org.savara.tools.monitor</module>
- <module>org.scribble.eclipse</module>
+ <module>org.savara.tools.validator</module>
+ <module>org.savara.tools.wsdl</module>
</modules>
</project>
Modified: branches/experimental/2.0.x/tools/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/pom.xml 2011-01-05 17:36:26 UTC (rev 536)
+++ branches/experimental/2.0.x/tools/pom.xml 2011-01-05 22:13:01 UTC (rev 537)
@@ -27,6 +27,8 @@
</parent> -->
<properties>
+ <savara.version>2.0.0-SNAPSHOT</savara.version>
+ <scribble.version>2.0.0-SNAPSHOT</scribble.version>
<jaxb.version>2.1</jaxb.version>
<tycho-version>0.10.0</tycho-version>
</properties>
Modified: branches/experimental/2.0.x/tools/tests/org.savara.protocol.contract.tests/pom.xml
===================================================================
--- branches/experimental/2.0.x/tools/tests/org.savara.protocol.contract.tests/pom.xml 2011-01-05 17:36:26 UTC (rev 536)
+++ branches/experimental/2.0.x/tools/tests/org.savara.protocol.contract.tests/pom.xml 2011-01-05 22:13:01 UTC (rev 537)
@@ -21,7 +21,7 @@
</dependency>
<dependency>
<groupId>org.scribble.bundles</groupId>
- <artifactId>org.scribble.parser</artifactId>
+ <artifactId>org.scribble.protocol</artifactId>
<version>${scribble.version}</version>
</dependency>
<dependency>
13 years, 5 months
- 1
- 0
savara SVN: r536 - branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-01-05 12:36:26 -0500 (Wed, 05 Jan 2011)
New Revision: 536
Removed:
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/CompleteTransaction_SupplierTxnProcessor.bpelOLD
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Broker.bpelOLD
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Buyer.bpelOLD
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_CreditAgency.bpelOLD
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Buyer.bpelOLD
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgency.bpelOLD
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Store.bpelOLD
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Buyer.bpelOLD
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Seller.bpelOLD
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngine.bpelOLD
Log:
Remove old bpel files.
Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/CompleteTransaction_SupplierTxnProcessor.bpelOLD
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/CompleteTransaction_SupplierTxnProcessor.bpelOLD 2011-01-05 17:29:14 UTC (rev 535)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/CompleteTransaction_SupplierTxnProcessor.bpelOLD 2011-01-05 17:36:26 UTC (rev 536)
@@ -1,20 +0,0 @@
-<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" 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:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.LoanBroker@SupplierTxnProcessor" name="CompleteTransaction_SupplierTxnProcessor" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
- <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="SupplierTxnProcessorService" name="BrokerToSupplierTxnProcessor" partnerLinkType="spr:BrokerToSupplierTxnProcessorServiceLT"/>
- </partnerLinks>
- <variables>
- <variable messageType="spr:confirmRequest" name="confirmRequestVar"/>
- <variable messageType="spr:confirmResponse" name="confirmResponseVar"/>
- </variables>
- <sequence>
- <pick createInstance="yes">
- <onMessage operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="spr:SupplierBehavior" variable="confirmRequestVar">
- <sequence>
- <reply name="Send_bookingReference" operation="confirm" partnerLink="BrokerToSupplierTxnProcessor" portType="spr:SupplierBehavior" variable="confirmResponseVar"/>
- </sequence>
- </onMessage>
- </pick>
- </sequence>
-</process>
Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Broker.bpelOLD
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Broker.bpelOLD 2011-01-05 17:29:14 UTC (rev 535)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Broker.bpelOLD 2011-01-05 17:36:26 UTC (rev 536)
@@ -1,66 +0,0 @@
-<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" 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:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.LoanBroker@Broker" name="ESBBrokerProcess_Broker" targetNamespace="http://www.pi4soa.org/ESBBroker/Broker" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
- <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" name="BuyerToBroker" partnerLinkType="brk:BuyerToBrokerServiceLT"/>
- <partnerLink name="BrokerToSupplierQuoteEngine" partnerLinkType="brk:BrokerToSupplierQuoteEngineLT" partnerRole="SupplierQuoteEngineRequester"/>
- <partnerLink name="BrokerToCreditAgency" partnerLinkType="brk:BrokerToCreditAgencyLT" partnerRole="CreditAgencyRequester"/>
- <partnerLink name="BrokerToSupplierTxnProcessor" partnerLinkType="brk:BrokerToSupplierTxnProcessorLT" partnerRole="SupplierTxnProcessorRequester"/>
- </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="brk:buyRequest" name="buyRequestVar"/>
- <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:cancelRequest" name="cancelRequestVar"/>
- </variables>
- <sequence>
- <receive createInstance="yes" name="Receive_enquiry" operation="makeEnquiry" partnerLink="BuyerToBroker" portType="brk:BrokerBehavior" variable="makeEnquiryRequestVar"/>
- <while>
- <sequence>
- <scope>
- <sequence>
- <invoke inputVariable="getQuoteRequestVar" name="Send_requestForQuote" operation="getQuote" outputVariable="getQuoteResponseVar" partnerLink="BrokerToSupplierQuoteEngine" portType="spr:SupplierBehavior"/>
- </sequence>
- </scope>
- </sequence>
- </while>
- <reply name="Send_quoteList" operation="makeEnquiry" partnerLink="BuyerToBroker" portType="brk:BrokerBehavior" variable="makeEnquiryResponseVar"/>
- <pick>
- <onMessage operation="buy" partnerLink="BuyerToBroker" portType="brk:BrokerBehavior" variable="buyRequestVar">
- <sequence>
- <scope>
- <sequence>
- <scope>
- <faultHandlers>
- <catch faultMessageType="cay:invalidCreditFault" faultName="cay:invalidCredit" faultVariable="invalidCreditFaultVar">
- <sequence>
- <reply faultName="brk:rejected" name="Send_orderRejected" operation="buy" partnerLink="BuyerToBroker" portType="brk:BrokerBehavior" variable="rejectedFaultVar"/>
- </sequence>
- </catch>
- </faultHandlers>
- <sequence>
- <invoke inputVariable="checkCreditRequestVar" name="Send_CreditCheckRequest" operation="checkCredit" outputVariable="checkCreditResponseVar" partnerLink="BrokerToCreditAgency" portType="cay:CreditAgencyBehavior"/>
- <invoke inputVariable="confirmRequestVar" name="Send_orderConfirmed" operation="confirm" outputVariable="confirmResponseVar" partnerLink="BrokerToSupplierTxnProcessor" portType="spr:SupplierBehavior"/>
- <reply name="Send_bookingReference" operation="buy" partnerLink="BuyerToBroker" portType="brk:BrokerBehavior" variable="buyResponseVar"/>
- </sequence>
- </scope>
- </sequence>
- </scope>
- </sequence>
- </onMessage>
- <onMessage operation="cancel" partnerLink="BuyerToBroker" portType="brk:BrokerBehavior" variable="cancelRequestVar">
- <sequence/>
- </onMessage>
- </pick>
- </sequence>
-</process>
Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Buyer.bpelOLD
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Buyer.bpelOLD 2011-01-05 17:29:14 UTC (rev 535)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_Buyer.bpelOLD 2011-01-05 17:36:26 UTC (rev 536)
@@ -1,43 +0,0 @@
-<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" 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:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.LoanBroker@Buyer" name="ESBBrokerProcess_Buyer" targetNamespace="http://www.pi4soa.org/ESBBroker/Buyer" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
- <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 myRole="BrokerBehavior" name="BuyerToBroker" partnerLinkType="byr:BuyerToBrokerLT" partnerRole="BrokerRequester"/>
- </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 inputVariable="makeEnquiryRequestVar" name="Send_enquiry" operation="makeEnquiry" partnerLink="BuyerToBroker" portType="brk:BrokerBehavior"/>
- <receive name="Receive_quoteList" operation="makeEnquiry" partnerLink="BuyerToBroker" portType="brk:BrokerBehavior" variable="makeEnquiryResponseVar"/>
- <if>
- <sequence>
- <scope>
- <sequence>
- <scope>
- <faultHandlers>
- <catch faultMessageType="brk:rejectedFault" faultName="brk:rejected" faultVariable="rejectedFaultVar">
- <sequence/>
- </catch>
- </faultHandlers>
- <sequence>
- <invoke inputVariable="buyRequestVar" name="Send_buy" operation="buy" outputVariable="buyResponseVar" partnerLink="BuyerToBroker" portType="brk:BrokerBehavior"/>
- </sequence>
- </scope>
- </sequence>
- </scope>
- </sequence>
- <else>
- <sequence>
- <invoke inputVariable="cancelRequestVar" name="Send_cancel" operation="cancel" partnerLink="BuyerToBroker" portType="brk:BrokerBehavior"/>
- </sequence>
- </else>
- </if>
- </sequence>
-</process>
Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_CreditAgency.bpelOLD
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_CreditAgency.bpelOLD 2011-01-05 17:29:14 UTC (rev 535)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ESBBrokerProcess_CreditAgency.bpelOLD 2011-01-05 17:36:26 UTC (rev 536)
@@ -1,36 +0,0 @@
-<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" 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:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.Common@CreditAgency" name="ESBBrokerProcess_CreditAgency" targetNamespace="http://www.pi4soa.org/ESBBroker/CreditAgency" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
- <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_CreditAgencyArtifacts.wsdl" namespace="http://www.pi4soa.org/ESBBroker/CreditAgency"/>
- <partnerLinks>
- <partnerLink myRole="CreditAgencyService" name="BrokerToCreditAgency" partnerLinkType="cay:BrokerToCreditAgencyServiceLT"/>
- </partnerLinks>
- <variables>
- <variable messageType="cay:checkCreditRequest" name="checkCreditRequestVar"/>
- <variable messageType="cay:checkCreditResponse" name="checkCreditResponseVar"/>
- <variable messageType="cay:invalidCreditFault" name="invalidCreditFaultVar"/>
- </variables>
- <sequence>
- <pick>
- <onMessage operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="cay:CreditAgencyBehavior" variable="checkCreditRequestVar">
- <sequence>
- <scope>
- <sequence>
- <if>
- <sequence>
- <reply name="Send_CreditCheckOk" operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="cay:CreditAgencyBehavior" variable="checkCreditResponseVar"/>
- </sequence>
- <else>
- <sequence>
- <reply faultName="cay:invalidCredit" name="Send_CreditCheckInvalid" operation="checkCredit" partnerLink="BrokerToCreditAgency" portType="cay:CreditAgencyBehavior" variable="invalidCreditFaultVar"/>
- </sequence>
- </else>
- </if>
- </sequence>
- </scope>
- </sequence>
- </onMessage>
- </pick>
- </sequence>
-</process>
Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Buyer.bpelOLD
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Buyer.bpelOLD 2011-01-05 17:29:14 UTC (rev 535)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Buyer.bpelOLD 2011-01-05 17:36:26 UTC (rev 536)
@@ -1,24 +0,0 @@
-<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:pur="java:org.jboss.savara.examples.purchasing" xmlns:sto="http://www.jboss.org/examples/store" xmlns:tns="http://www.jboss.org/savara/examples" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="savara.samples.Purchasing@Buyer" name="PurchaseGoodsProcess_Buyer" targetNamespace="http://www.jboss.org/savara/examples" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
- <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_CreditAgency.wsdl" namespace="java:org.jboss.savara.examples.purchasing"/>
- <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_Store.wsdl" namespace="http://www.jboss.org/examples/store"/>
- <import importType="http://schemas.xmlsoap.org/wsdl/" location="PurchaseGoodsProcess_BuyerArtifacts.wsdl" namespace="http://www.jboss.org/savara/examples"/>
- <partnerLinks>
- <partnerLink name="BuyerToStore" partnerLinkType="tns:BuyerToStoreLT" partnerRole="StoreRequester"/>
- </partnerLinks>
- <variables>
- <variable messageType="sto:buyRequest" name="buyRequestVar"/>
- <variable messageType="sto:buyResponse" name="buyResponseVar"/>
- </variables>
- <sequence>
- <scope>
- <faultHandlers>
- <catch faultMessageType="sto:BuyFailedFault" faultName="sto:BuyFailed" faultVariable="BuyFailedFaultVar">
- <sequence/>
- </catch>
- </faultHandlers>
- <sequence>
- <invoke inputVariable="buyRequestVar" name="Send_BuyRequest" operation="buy" outputVariable="buyResponseVar" partnerLink="BuyerToStore" portType="sto:StoreInterface"/>
- </sequence>
- </scope>
- </sequence>
-</process>
Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgency.bpelOLD
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgency.bpelOLD 2011-01-05 17:29:14 UTC (rev 535)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_CreditAgency.bpelOLD 2011-01-05 17:36:26 UTC (rev 536)
@@ -1,26 +0,0 @@
-<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:pur="java:org.jboss.savara.examples.purchasing" xmlns:sto="http://www.jboss.org/examples/store" xmlns:tns="http://www.jboss.org/savara/examples" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="savara.samples.Common@CreditAgency" name="PurchaseGoodsProcess_CreditAgency" targetNamespace="java:org.jboss.savara.examples.purchasing" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
- <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" name="StoreToCreditAgency" partnerLinkType="pur:StoreToCreditAgencyServiceLT"/>
- </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" name="Receive_CreditCheckRequest" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" variable="checkCreditRequestVar"/>
- <if>
- <sequence>
- <reply name="Send_CreditCheckOk" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" variable="checkCreditResponseVar"/>
- </sequence>
- <else>
- <sequence>
- <reply faultName="pur:CreditCheckFailed" name="Send_CreditCheckInvalid" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" variable="CreditCheckFailedFaultVar"/>
- </sequence>
- </else>
- </if>
- </sequence>
-</process>
Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Store.bpelOLD
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Store.bpelOLD 2011-01-05 17:29:14 UTC (rev 535)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Store.bpelOLD 2011-01-05 17:36:26 UTC (rev 536)
@@ -1,32 +0,0 @@
-<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:pur="java:org.jboss.savara.examples.purchasing" xmlns:sto="http://www.jboss.org/examples/store" xmlns:tns="http://www.jboss.org/savara/examples" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="savara.samples.Purchasing@Store" name="PurchaseGoodsProcess_Store" targetNamespace="http://www.jboss.org/examples/store" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
- <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" name="BuyerToStore" partnerLinkType="sto:BuyerToStoreServiceLT"/>
- <partnerLink name="StoreToCreditAgency" partnerLinkType="sto:StoreToCreditAgencyLT" partnerRole="CreditAgencyRequester"/>
- </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" name="Receive_BuyRequest" operation="buy" partnerLink="BuyerToStore" portType="sto:StoreInterface" variable="buyRequestVar"/>
- <scope>
- <faultHandlers>
- <catch faultMessageType="pur:CreditCheckFailedFault" faultName="pur:CreditCheckFailed" faultVariable="CreditCheckFailedFaultVar">
- <sequence>
- <reply faultName="sto:BuyFailed" name="Send_BuyFailed" operation="buy" partnerLink="BuyerToStore" portType="sto:StoreInterface" variable="BuyFailedFaultVar"/>
- </sequence>
- </catch>
- </faultHandlers>
- <sequence>
- <invoke inputVariable="checkCreditRequestVar" name="Send_CreditCheckRequest" operation="checkCredit" outputVariable="checkCreditResponseVar" partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface"/>
- <reply name="Send_BuyConfirmed" operation="buy" partnerLink="BuyerToStore" portType="sto:StoreInterface" variable="buyResponseVar"/>
- </sequence>
- </scope>
- </sequence>
-</process>
Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Buyer.bpelOLD
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Buyer.bpelOLD 2011-01-05 17:29:14 UTC (rev 535)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Buyer.bpelOLD 2011-01-05 17:36:26 UTC (rev 536)
@@ -1,23 +0,0 @@
-<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:byr="http://www.pi4soa.org/ReqRespFault/Buyer" xmlns:slr="http://www.pi4soa.org/ReqRespFault/Seller" xmlns:tns="http://www.pi4soa.org/ReqRespFault" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.LoanBroker@Buyer" name="ReqRespFaultProcess_Buyer" targetNamespace="http://www.pi4soa.org/ReqRespFault/Buyer" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
- <import importType="http://schemas.xmlsoap.org/wsdl/" location="ReqRespFaultProcess_Seller.wsdl" namespace="http://www.pi4soa.org/ReqRespFault/Seller"/>
- <import importType="http://schemas.xmlsoap.org/wsdl/" location="ReqRespFaultProcess_BuyerArtifacts.wsdl" namespace="http://www.pi4soa.org/ReqRespFault/Buyer"/>
- <partnerLinks>
- <partnerLink name="BuyerToSeller" partnerLinkType="byr:BuyerToSellerLT" partnerRole="SellerRequester"/>
- </partnerLinks>
- <variables>
- <variable messageType="slr:checkCreditRequest" name="checkCreditRequestVar"/>
- <variable messageType="slr:checkCreditResponse" name="checkCreditResponseVar"/>
- </variables>
- <sequence>
- <scope>
- <faultHandlers>
- <catch faultMessageType="slr:insufficientCreditFault" faultName="slr:insufficientCredit" faultVariable="insufficientCreditFaultVar">
- <sequence/>
- </catch>
- </faultHandlers>
- <sequence>
- <invoke inputVariable="checkCreditRequestVar" name="Send_CreditCheckRequest" operation="checkCredit" outputVariable="checkCreditResponseVar" partnerLink="BuyerToSeller" portType="slr:SellerBehavior"/>
- </sequence>
- </scope>
- </sequence>
-</process>
Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Seller.bpelOLD
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Seller.bpelOLD 2011-01-05 17:29:14 UTC (rev 535)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Seller.bpelOLD 2011-01-05 17:36:26 UTC (rev 536)
@@ -1,25 +0,0 @@
-<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:byr="http://www.pi4soa.org/ReqRespFault/Buyer" xmlns:slr="http://www.pi4soa.org/ReqRespFault/Seller" xmlns:tns="http://www.pi4soa.org/ReqRespFault" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="org.pi4soa.reqrespfault.reqrespfault.ReqRespFaultProcess@Seller" name="ReqRespFaultProcess_Seller" targetNamespace="http://www.pi4soa.org/ReqRespFault/Seller" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
- <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" name="BuyerToSeller" partnerLinkType="slr:BuyerToSellerServiceLT"/>
- </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" name="Receive_CreditCheckRequest" operation="checkCredit" partnerLink="BuyerToSeller" portType="slr:SellerBehavior" variable="checkCreditRequestVar"/>
- <if>
- <sequence>
- <reply name="Send_CreditCheckOk" operation="checkCredit" partnerLink="BuyerToSeller" portType="slr:SellerBehavior" variable="checkCreditResponseVar"/>
- </sequence>
- <else>
- <sequence>
- <reply faultName="slr:insufficientCredit" name="Send_CreditCheckInvalid" operation="checkCredit" partnerLink="BuyerToSeller" portType="slr:SellerBehavior" variable="insufficientCreditFaultVar"/>
- </sequence>
- </else>
- </if>
- </sequence>
-</process>
Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngine.bpelOLD
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngine.bpelOLD 2011-01-05 17:29:14 UTC (rev 535)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/RequestForQuote_SupplierQuoteEngine.bpelOLD 2011-01-05 17:36:26 UTC (rev 536)
@@ -1,15 +0,0 @@
-<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" 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:spr="http://www.pi4soa.org/ESBBroker/Supplier" xmlns:tns="http://www.pi4soa.org/ESBBroker" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.LoanBroker@SupplierQuoteEngine" name="RequestForQuote_SupplierQuoteEngine" targetNamespace="http://www.pi4soa.org/ESBBroker/Supplier" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
- <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" name="BrokerToSupplierQuoteEngine" partnerLinkType="spr:BrokerToSupplierQuoteEngineServiceLT"/>
- </partnerLinks>
- <variables>
- <variable messageType="spr:getQuoteRequest" name="getQuoteRequestVar"/>
- <variable messageType="spr:getQuoteResponse" name="getQuoteResponseVar"/>
- </variables>
- <sequence>
- <receive createInstance="yes" name="Receive_requestForQuote" operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="spr:SupplierBehavior" variable="getQuoteRequestVar"/>
- <reply name="Send_quote" operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="spr:SupplierBehavior" variable="getQuoteResponseVar"/>
- </sequence>
-</process>
13 years, 5 months
- 1
- 0
savara SVN: r535 - in branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test: resources/parser/results and 1 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2011-01-05 12:29:14 -0500 (Wed, 05 Jan 2011)
New Revision: 535
Added:
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)Store.spr
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ReqRespFault(a)Buyer.spr
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ReqRespFault(a)Seller.spr
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Store.bpelOLD
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Buyer.bpelOLD
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Seller.bpelOLD
Removed:
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)Store.scv
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ReqRespFault(a)Buyer.scv
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ReqRespFault(a)Seller.scv
Modified:
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/parser/ParserTest.java
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Store.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Buyer.bpel
branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Seller.bpel
Log:
All parser tests now working.
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/parser/ParserTest.java
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/parser/ParserTest.java 2011-01-05 17:12:54 UTC (rev 534)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/java/org/savara/bpel/parser/ParserTest.java 2011-01-05 17:29:14 UTC (rev 535)
@@ -42,12 +42,10 @@
suite.addTest(new BPELToProtocolTest("PurchaseGoodsProcess_Buyer", "PurchaseGoods@Buyer"));
suite.addTest(new BPELToProtocolTest("PurchaseGoodsProcess_CreditAgency", "PurchaseGoods@CreditAgency"));
-
- /*
suite.addTest(new BPELToProtocolTest("PurchaseGoodsProcess_Store", "PurchaseGoods@Store"));
+
suite.addTest(new BPELToProtocolTest("ReqRespFaultProcess_Buyer", "ReqRespFault@Buyer"));
suite.addTest(new BPELToProtocolTest("ReqRespFaultProcess_Seller", "ReqRespFault@Seller"));
- */
/**
* TODO: (SAVARA-150) Commenting out this test for now, as we now need the accompanying WSDL to be able to
Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)Store.scv
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)Store.scv 2011-01-05 17:12:54 UTC (rev 534)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)Store.scv 2011-01-05 17:29:14 UTC (rev 535)
@@ -1,13 +0,0 @@
-namespace null;
-
-conversation PurchaseGoodsProcess_Store@Store implements Purchasing@Store {
- buy(BuyRequest) from Buyer to Store;
- checkCredit(CreditCheckRequest) from Store to CreditAgency;
- if {
- checkCredit(CreditCheckOk) from CreditAgency to Store;
- buy(BuyConfirmed) from Store to Buyer;
- } else if {
- checkCredit(CreditCheckInvalid) from CreditAgency to Store;
- buy(BuyFailed) from Store to Buyer;
- }
-}
\ No newline at end of file
Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)Store.spr
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)Store.spr (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/PurchaseGoods(a)Store.spr 2011-01-05 17:29:14 UTC (rev 535)
@@ -0,0 +1,12 @@
+protocol PurchaseGoodsProcess_Store @ StoreInterface {
+ buy(BuyRequest) from Buyer;
+ checkCredit(CreditCheckRequest) to CreditAgency;
+ choice from CreditAgency {
+ checkCredit(CreditCheckOk):
+ buy(BuyConfirmed) to Buyer;
+
+ checkCredit(CreditCheckInvalid):
+ buy(BuyFailed) to Buyer;
+
+ }
+}
Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ReqRespFault(a)Buyer.scv
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ReqRespFault(a)Buyer.scv 2011-01-05 17:12:54 UTC (rev 534)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ReqRespFault(a)Buyer.scv 2011-01-05 17:29:14 UTC (rev 535)
@@ -1,10 +0,0 @@
-namespace null;
-
-conversation ReqRespFaultProcess_Buyer@Buyer implements LoanBroker@Buyer {
- checkCredit(CreditCheckRequest) from Buyer to Seller;
- if {
- checkCredit(CreditCheckOk) from Seller to Buyer;
- } else if {
- checkCredit(CreditCheckInvalid) from Seller to Buyer;
- }
-}
\ No newline at end of file
Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ReqRespFault(a)Buyer.spr
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ReqRespFault(a)Buyer.spr (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ReqRespFault(a)Buyer.spr 2011-01-05 17:29:14 UTC (rev 535)
@@ -0,0 +1,9 @@
+protocol ReqRespFaultProcess_Buyer {
+ checkCredit(CreditCheckRequest) to Seller;
+ choice from Seller {
+ checkCredit(CreditCheckOk):
+
+ checkCredit(CreditCheckInvalid):
+
+ }
+}
Deleted: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ReqRespFault(a)Seller.scv
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ReqRespFault(a)Seller.scv 2011-01-05 17:12:54 UTC (rev 534)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ReqRespFault(a)Seller.scv 2011-01-05 17:29:14 UTC (rev 535)
@@ -1,10 +0,0 @@
-namespace null;
-
-conversation ReqRespFaultProcess_Seller@Seller implements ReqRespFaultProcess@Seller {
- checkCredit(CreditCheckRequest) from Buyer to Seller;
- if {
- checkCredit(CreditCheckOk) from Seller to Buyer;
- } else if {
- checkCredit(CreditCheckInvalid) from Seller to Buyer;
- }
-}
\ No newline at end of file
Added: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ReqRespFault(a)Seller.spr
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ReqRespFault(a)Seller.spr (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/results/ReqRespFault(a)Seller.spr 2011-01-05 17:29:14 UTC (rev 535)
@@ -0,0 +1,9 @@
+protocol ReqRespFaultProcess_Seller @ SellerBehavior {
+ checkCredit(CreditCheckRequest) from Buyer;
+ choice to Buyer {
+ checkCredit(CreditCheckOk):
+
+ checkCredit(CreditCheckInvalid):
+
+ }
+}
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Store.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Store.bpel 2011-01-05 17:12:54 UTC (rev 534)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Store.bpel 2011-01-05 17:29:14 UTC (rev 535)
@@ -1,32 +1,33 @@
-<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:pur="java:org.jboss.savara.examples.purchasing" xmlns:sto="http://www.jboss.org/examples/store" xmlns:tns="http://www.jboss.org/savara/examples" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="savara.samples.Purchasing@Store" name="PurchaseGoodsProcess_Store" targetNamespace="http://www.jboss.org/examples/store" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
- <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" name="BuyerToStore" partnerLinkType="sto:BuyerToStoreServiceLT"/>
- <partnerLink name="StoreToCreditAgency" partnerLinkType="sto:StoreToCreditAgencyLT" partnerRole="CreditAgencyRequester"/>
- </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" name="Receive_BuyRequest" operation="buy" partnerLink="BuyerToStore" portType="sto:StoreInterface" variable="buyRequestVar"/>
- <scope>
- <faultHandlers>
- <catch faultMessageType="pur:CreditCheckFailedFault" faultName="pur:CreditCheckFailed" faultVariable="CreditCheckFailedFaultVar">
- <sequence>
- <reply faultName="sto:BuyFailed" name="Send_BuyFailed" operation="buy" partnerLink="BuyerToStore" portType="sto:StoreInterface" variable="BuyFailedFaultVar"/>
- </sequence>
- </catch>
- </faultHandlers>
- <sequence>
- <invoke inputVariable="checkCreditRequestVar" name="Send_CreditCheckRequest" operation="checkCredit" outputVariable="checkCreditResponseVar" partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface"/>
- <reply name="Send_BuyConfirmed" operation="buy" partnerLink="BuyerToStore" portType="sto:StoreInterface" variable="buyResponseVar"/>
- </sequence>
- </scope>
- </sequence>
-</process>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:tns="http://www.jboss.org/savara/examples" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:sto="http://www.jboss.org/examples/store" xmlns:pur="java:org.jboss.savara.examples.purchasing" name="PurchaseGoodsProcess_Store" targetNamespace="http://www.jboss.org/examples/store">
+ <import namespace="http://www.jboss.org/examples/store" location="PurchaseGoodsProcess_Store.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+ <import namespace="java:org.jboss.savara.examples.purchasing" location="PurchaseGoodsProcess_CreditAgency.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+ <import namespace="http://www.jboss.org/examples/store" location="PurchaseGoodsProcess_StoreArtifacts.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+ <partnerLinks>
+ <partnerLink name="BuyerToStore" partnerLinkType="sto:BuyerToStoreServiceLT" myRole="StoreInterface"/>
+ <partnerLink name="StoreToCreditAgency" partnerLinkType="sto:StoreToCreditAgencyLT" partnerRole="CreditAgencyRequester"/>
+ </partnerLinks>
+ <variables>
+ <variable name="buyRequestVar" messageType="sto:buyRequest"/>
+ <variable name="checkCreditRequestVar" messageType="pur:checkCreditRequest"/>
+ <variable name="checkCreditResponseVar" messageType="pur:checkCreditResponse"/>
+ <variable name="buyResponseVar" messageType="sto:buyResponse"/>
+ <variable name="BuyFailedFaultVar" messageType="sto:BuyFailedFault"/>
+ </variables>
+ <sequence>
+ <receive partnerLink="BuyerToStore" portType="sto:StoreInterface" operation="buy" variable="buyRequestVar" createInstance="yes" name="Receive_BuyRequest"/>
+ <scope>
+ <faultHandlers>
+ <catch faultName="pur:CreditCheckFailed" faultVariable="CreditCheckFailedFaultVar" faultMessageType="pur:CreditCheckFailedFault">
+ <sequence>
+ <reply partnerLink="BuyerToStore" portType="sto:StoreInterface" operation="buy" variable="BuyFailedFaultVar" faultName="sto:BuyFailed" name="Send_BuyFailed"/>
+ </sequence>
+ </catch>
+ </faultHandlers>
+ <sequence>
+ <invoke partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" operation="checkCredit" inputVariable="checkCreditRequestVar" outputVariable="checkCreditResponseVar" name="Send_CreditCheckRequest"/>
+ <reply partnerLink="BuyerToStore" portType="sto:StoreInterface" operation="buy" variable="buyResponseVar" name="Send_BuyConfirmed"/>
+ </sequence>
+ </scope>
+ </sequence>
+</process>
Copied: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Store.bpelOLD (from rev 531, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Store.bpel)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Store.bpelOLD (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/PurchaseGoodsProcess_Store.bpelOLD 2011-01-05 17:29:14 UTC (rev 535)
@@ -0,0 +1,32 @@
+<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:pur="java:org.jboss.savara.examples.purchasing" xmlns:sto="http://www.jboss.org/examples/store" xmlns:tns="http://www.jboss.org/savara/examples" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="savara.samples.Purchasing@Store" name="PurchaseGoodsProcess_Store" targetNamespace="http://www.jboss.org/examples/store" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+ <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" name="BuyerToStore" partnerLinkType="sto:BuyerToStoreServiceLT"/>
+ <partnerLink name="StoreToCreditAgency" partnerLinkType="sto:StoreToCreditAgencyLT" partnerRole="CreditAgencyRequester"/>
+ </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" name="Receive_BuyRequest" operation="buy" partnerLink="BuyerToStore" portType="sto:StoreInterface" variable="buyRequestVar"/>
+ <scope>
+ <faultHandlers>
+ <catch faultMessageType="pur:CreditCheckFailedFault" faultName="pur:CreditCheckFailed" faultVariable="CreditCheckFailedFaultVar">
+ <sequence>
+ <reply faultName="sto:BuyFailed" name="Send_BuyFailed" operation="buy" partnerLink="BuyerToStore" portType="sto:StoreInterface" variable="BuyFailedFaultVar"/>
+ </sequence>
+ </catch>
+ </faultHandlers>
+ <sequence>
+ <invoke inputVariable="checkCreditRequestVar" name="Send_CreditCheckRequest" operation="checkCredit" outputVariable="checkCreditResponseVar" partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface"/>
+ <reply name="Send_BuyConfirmed" operation="buy" partnerLink="BuyerToStore" portType="sto:StoreInterface" variable="buyResponseVar"/>
+ </sequence>
+ </scope>
+ </sequence>
+</process>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Buyer.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Buyer.bpel 2011-01-05 17:12:54 UTC (rev 534)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Buyer.bpel 2011-01-05 17:29:14 UTC (rev 535)
@@ -1,23 +1,24 @@
-<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:byr="http://www.pi4soa.org/ReqRespFault/Buyer" xmlns:slr="http://www.pi4soa.org/ReqRespFault/Seller" xmlns:tns="http://www.pi4soa.org/ReqRespFault" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.LoanBroker@Buyer" name="ReqRespFaultProcess_Buyer" targetNamespace="http://www.pi4soa.org/ReqRespFault/Buyer" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
- <import importType="http://schemas.xmlsoap.org/wsdl/" location="ReqRespFaultProcess_Seller.wsdl" namespace="http://www.pi4soa.org/ReqRespFault/Seller"/>
- <import importType="http://schemas.xmlsoap.org/wsdl/" location="ReqRespFaultProcess_BuyerArtifacts.wsdl" namespace="http://www.pi4soa.org/ReqRespFault/Buyer"/>
- <partnerLinks>
- <partnerLink name="BuyerToSeller" partnerLinkType="byr:BuyerToSellerLT" partnerRole="SellerRequester"/>
- </partnerLinks>
- <variables>
- <variable messageType="slr:checkCreditRequest" name="checkCreditRequestVar"/>
- <variable messageType="slr:checkCreditResponse" name="checkCreditResponseVar"/>
- </variables>
- <sequence>
- <scope>
- <faultHandlers>
- <catch faultMessageType="slr:insufficientCreditFault" faultName="slr:insufficientCredit" faultVariable="insufficientCreditFaultVar">
- <sequence/>
- </catch>
- </faultHandlers>
- <sequence>
- <invoke inputVariable="checkCreditRequestVar" name="Send_CreditCheckRequest" operation="checkCredit" outputVariable="checkCreditResponseVar" partnerLink="BuyerToSeller" portType="slr:SellerBehavior"/>
- </sequence>
- </scope>
- </sequence>
-</process>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:tns="http://www.pi4soa.org/ReqRespFault" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:byr="http://www.pi4soa.org/ReqRespFault/Buyer" xmlns:slr="http://www.pi4soa.org/ReqRespFault/Seller" name="ReqRespFaultProcess_Buyer" targetNamespace="http://www.pi4soa.org/ReqRespFault/Buyer">
+ <import namespace="http://www.pi4soa.org/ReqRespFault/Seller" location="ReqRespFaultProcess_Seller.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+ <import namespace="http://www.pi4soa.org/ReqRespFault/Buyer" location="ReqRespFaultProcess_BuyerArtifacts.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+ <partnerLinks>
+ <partnerLink name="BuyerToSeller" partnerLinkType="byr:BuyerToSellerLT" partnerRole="SellerRequester"/>
+ </partnerLinks>
+ <variables>
+ <variable name="checkCreditRequestVar" messageType="slr:checkCreditRequest"/>
+ <variable name="checkCreditResponseVar" messageType="slr:checkCreditResponse"/>
+ </variables>
+ <sequence>
+ <scope>
+ <faultHandlers>
+ <catch faultName="slr:insufficientCredit" faultVariable="insufficientCreditFaultVar" faultMessageType="slr:insufficientCreditFault">
+ <sequence/>
+ </catch>
+ </faultHandlers>
+ <sequence>
+ <invoke partnerLink="BuyerToSeller" portType="slr:SellerBehavior" operation="checkCredit" inputVariable="checkCreditRequestVar" outputVariable="checkCreditResponseVar" name="Send_CreditCheckRequest"/>
+ </sequence>
+ </scope>
+ </sequence>
+</process>
Copied: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Buyer.bpelOLD (from rev 531, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Buyer.bpel)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Buyer.bpelOLD (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Buyer.bpelOLD 2011-01-05 17:29:14 UTC (rev 535)
@@ -0,0 +1,23 @@
+<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:byr="http://www.pi4soa.org/ReqRespFault/Buyer" xmlns:slr="http://www.pi4soa.org/ReqRespFault/Seller" xmlns:tns="http://www.pi4soa.org/ReqRespFault" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="overlord.cdl.samples.LoanBroker@Buyer" name="ReqRespFaultProcess_Buyer" targetNamespace="http://www.pi4soa.org/ReqRespFault/Buyer" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="ReqRespFaultProcess_Seller.wsdl" namespace="http://www.pi4soa.org/ReqRespFault/Seller"/>
+ <import importType="http://schemas.xmlsoap.org/wsdl/" location="ReqRespFaultProcess_BuyerArtifacts.wsdl" namespace="http://www.pi4soa.org/ReqRespFault/Buyer"/>
+ <partnerLinks>
+ <partnerLink name="BuyerToSeller" partnerLinkType="byr:BuyerToSellerLT" partnerRole="SellerRequester"/>
+ </partnerLinks>
+ <variables>
+ <variable messageType="slr:checkCreditRequest" name="checkCreditRequestVar"/>
+ <variable messageType="slr:checkCreditResponse" name="checkCreditResponseVar"/>
+ </variables>
+ <sequence>
+ <scope>
+ <faultHandlers>
+ <catch faultMessageType="slr:insufficientCreditFault" faultName="slr:insufficientCredit" faultVariable="insufficientCreditFaultVar">
+ <sequence/>
+ </catch>
+ </faultHandlers>
+ <sequence>
+ <invoke inputVariable="checkCreditRequestVar" name="Send_CreditCheckRequest" operation="checkCredit" outputVariable="checkCreditResponseVar" partnerLink="BuyerToSeller" portType="slr:SellerBehavior"/>
+ </sequence>
+ </scope>
+ </sequence>
+</process>
Modified: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Seller.bpel
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Seller.bpel 2011-01-05 17:12:54 UTC (rev 534)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Seller.bpel 2011-01-05 17:29:14 UTC (rev 535)
@@ -1,25 +1,26 @@
-<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:byr="http://www.pi4soa.org/ReqRespFault/Buyer" xmlns:slr="http://www.pi4soa.org/ReqRespFault/Seller" xmlns:tns="http://www.pi4soa.org/ReqRespFault" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="org.pi4soa.reqrespfault.reqrespfault.ReqRespFaultProcess@Seller" name="ReqRespFaultProcess_Seller" targetNamespace="http://www.pi4soa.org/ReqRespFault/Seller" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
- <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" name="BuyerToSeller" partnerLinkType="slr:BuyerToSellerServiceLT"/>
- </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" name="Receive_CreditCheckRequest" operation="checkCredit" partnerLink="BuyerToSeller" portType="slr:SellerBehavior" variable="checkCreditRequestVar"/>
- <if>
- <sequence>
- <reply name="Send_CreditCheckOk" operation="checkCredit" partnerLink="BuyerToSeller" portType="slr:SellerBehavior" variable="checkCreditResponseVar"/>
- </sequence>
- <else>
- <sequence>
- <reply faultName="slr:insufficientCredit" name="Send_CreditCheckInvalid" operation="checkCredit" partnerLink="BuyerToSeller" portType="slr:SellerBehavior" variable="insufficientCreditFaultVar"/>
- </sequence>
- </else>
- </if>
- </sequence>
-</process>
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:tns="http://www.pi4soa.org/ReqRespFault" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:byr="http://www.pi4soa.org/ReqRespFault/Buyer" xmlns:slr="http://www.pi4soa.org/ReqRespFault/Seller" name="ReqRespFaultProcess_Seller" targetNamespace="http://www.pi4soa.org/ReqRespFault/Seller">
+ <import namespace="http://www.pi4soa.org/ReqRespFault/Seller" location="ReqRespFaultProcess_Seller.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+ <import namespace="http://www.pi4soa.org/ReqRespFault/Seller" location="ReqRespFaultProcess_SellerArtifacts.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"/>
+ <partnerLinks>
+ <partnerLink name="BuyerToSeller" partnerLinkType="slr:BuyerToSellerServiceLT" myRole="SellerBehavior"/>
+ </partnerLinks>
+ <variables>
+ <variable name="checkCreditRequestVar" messageType="slr:checkCreditRequest"/>
+ <variable name="checkCreditResponseVar" messageType="slr:checkCreditResponse"/>
+ <variable name="insufficientCreditFaultVar" messageType="slr:insufficientCreditFault"/>
+ </variables>
+ <sequence>
+ <receive partnerLink="BuyerToSeller" portType="slr:SellerBehavior" operation="checkCredit" variable="checkCreditRequestVar" createInstance="yes" name="Receive_CreditCheckRequest"/>
+ <if>
+ <sequence>
+ <reply partnerLink="BuyerToSeller" portType="slr:SellerBehavior" operation="checkCredit" variable="checkCreditResponseVar" name="Send_CreditCheckOk"/>
+ </sequence>
+ <else>
+ <sequence>
+ <reply partnerLink="BuyerToSeller" portType="slr:SellerBehavior" operation="checkCredit" variable="insufficientCreditFaultVar" faultName="slr:insufficientCredit" name="Send_CreditCheckInvalid"/>
+ </sequence>
+ </else>
+ </if>
+ </sequence>
+</process>
Copied: branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Seller.bpelOLD (from rev 531, branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Seller.bpel)
===================================================================
--- branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Seller.bpelOLD (rev 0)
+++ branches/experimental/2.0.x/bundles/org.savara.bpel.tests/src/test/resources/parser/testmodels/ReqRespFaultProcess_Seller.bpelOLD 2011-01-05 17:29:14 UTC (rev 535)
@@ -0,0 +1,25 @@
+<process xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable" xmlns:byr="http://www.pi4soa.org/ReqRespFault/Buyer" xmlns:slr="http://www.pi4soa.org/ReqRespFault/Seller" xmlns:tns="http://www.pi4soa.org/ReqRespFault" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:ns0="http://www.scribble.org/conversation" ns0:conversationType="org.pi4soa.reqrespfault.reqrespfault.ReqRespFaultProcess@Seller" name="ReqRespFaultProcess_Seller" targetNamespace="http://www.pi4soa.org/ReqRespFault/Seller" xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
+ <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" name="BuyerToSeller" partnerLinkType="slr:BuyerToSellerServiceLT"/>
+ </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" name="Receive_CreditCheckRequest" operation="checkCredit" partnerLink="BuyerToSeller" portType="slr:SellerBehavior" variable="checkCreditRequestVar"/>
+ <if>
+ <sequence>
+ <reply name="Send_CreditCheckOk" operation="checkCredit" partnerLink="BuyerToSeller" portType="slr:SellerBehavior" variable="checkCreditResponseVar"/>
+ </sequence>
+ <else>
+ <sequence>
+ <reply faultName="slr:insufficientCredit" name="Send_CreditCheckInvalid" operation="checkCredit" partnerLink="BuyerToSeller" portType="slr:SellerBehavior" variable="insufficientCreditFaultVar"/>
+ </sequence>
+ </else>
+ </if>
+ </sequence>
+</process>
13 years, 5 months
- 1
- 0