savara SVN: r294 - tags.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2010-07-02 16:29:50 -0400 (Fri, 02 Jul 2010)
New Revision: 294
Added:
tags/1.0.0.CR2/
Log:
Tag for version 1.0.0.CR2.
Copied: tags/1.0.0.CR2 (from rev 293, branches/1.0.x)
13 years, 10 months
- 1
- 0
savara SVN: r293 - branches/1.0.x/distribution and 16 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2010-07-02 16:04:14 -0400 (Fri, 02 Jul 2010)
New Revision: 293
Modified:
branches/1.0.x/distribution/pom.xml
branches/1.0.x/distribution/src/main/release/ReleaseNotes.txt
branches/1.0.x/distribution/src/main/release/install/deployment.properties
branches/1.0.x/docs/gettingstartedguide/pom.xml
branches/1.0.x/docs/gettingstartedguide/src/main/master.xml
branches/1.0.x/docs/gettingstartedguide/src/main/module/installation.xml
branches/1.0.x/docs/pom.xml
branches/1.0.x/docs/samplesguide/pom.xml
branches/1.0.x/docs/samplesguide/src/main/master.xml
branches/1.0.x/docs/userguide/pom.xml
branches/1.0.x/docs/userguide/src/main/master.xml
branches/1.0.x/pom.xml
branches/1.0.x/tools/pom.xml
branches/1.0.x/validators/jbossesb/pom.xml
branches/1.0.x/validators/pom.xml
trunk/distribution/src/main/release/ReleaseNotes.txt
trunk/distribution/src/main/release/install/deployment.properties
trunk/docs/gettingstartedguide/src/main/module/installation.xml
Log:
Update version and added release notes.
Modified: branches/1.0.x/distribution/pom.xml
===================================================================
--- branches/1.0.x/distribution/pom.xml 2010-07-02 19:14:49 UTC (rev 292)
+++ branches/1.0.x/distribution/pom.xml 2010-07-02 20:04:14 UTC (rev 293)
@@ -23,13 +23,13 @@
<artifactId>distribution</artifactId>
<packaging>pom</packaging>
<name>Savara::Distribution</name>
- <version>1.0.0.CR1</version>
+ <version>1.0.0.CR2</version>
<url>http://www.jboss.org/savara</url>
<parent>
<groupId>org.jboss</groupId>
<artifactId>savara</artifactId>
- <version>1.0.0.CR1</version>
+ <version>1.0.0.CR2</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: branches/1.0.x/distribution/src/main/release/ReleaseNotes.txt
===================================================================
--- branches/1.0.x/distribution/src/main/release/ReleaseNotes.txt 2010-07-02 19:14:49 UTC (rev 292)
+++ branches/1.0.x/distribution/src/main/release/ReleaseNotes.txt 2010-07-02 20:04:14 UTC (rev 293)
@@ -1,3 +1,15 @@
+SAVARA 1.0.0.CR2
+================
+
+This is the second Candidate Release of version 1.0.0 of SAVARA.
+
+This release is primarily a bug fix release, with a number of issues being resolved
+with the BPEL and WSDL generation.
+
+The detailed release notes can be found at:
+https://jira.jboss.org/secure/ReleaseNote.jspa?projectId=12310870&version=12314160
+
+
SAVARA 1.0.0.CR1
================
Modified: branches/1.0.x/distribution/src/main/release/install/deployment.properties
===================================================================
--- branches/1.0.x/distribution/src/main/release/install/deployment.properties 2010-07-02 19:14:49 UTC (rev 292)
+++ branches/1.0.x/distribution/src/main/release/install/deployment.properties 2010-07-02 20:04:14 UTC (rev 293)
@@ -12,5 +12,5 @@
org.jboss.as.config=default
# The directory for JBossESB home.
-# (e.g. /local/deploy/jbossesb-4.7)
-org.jboss.esb.home=/local/deploy/jbossesb-4.7
+# (e.g. /local/deploy/jbossesb-4.8)
+org.jboss.esb.home=/local/deploy/jbossesb-4.8
Modified: branches/1.0.x/docs/gettingstartedguide/pom.xml
===================================================================
--- branches/1.0.x/docs/gettingstartedguide/pom.xml 2010-07-02 19:14:49 UTC (rev 292)
+++ branches/1.0.x/docs/gettingstartedguide/pom.xml 2010-07-02 20:04:14 UTC (rev 293)
@@ -8,12 +8,12 @@
<artifactId>gettingstartedguide</artifactId>
<packaging>jdocbook</packaging>
<name>Savara::Docs::GettingStartedGuide</name>
- <version>1.0.0.CR1</version>
+ <version>1.0.0.CR2</version>
<parent>
<groupId>org.jboss.savara</groupId>
<artifactId>docs</artifactId>
- <version>1.0.0.CR1</version>
+ <version>1.0.0.CR2</version>
</parent>
Modified: branches/1.0.x/docs/gettingstartedguide/src/main/master.xml
===================================================================
--- branches/1.0.x/docs/gettingstartedguide/src/main/master.xml 2010-07-02 19:14:49 UTC (rev 292)
+++ branches/1.0.x/docs/gettingstartedguide/src/main/master.xml 2010-07-02 20:04:14 UTC (rev 293)
@@ -5,7 +5,7 @@
<book lang="en">
<bookinfo>
- <title>SAVARA 1.0.0.CR1</title>
+ <title>SAVARA 1.0.0.CR2</title>
<subtitle>Getting Started Guide</subtitle>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module/author_group.xml"/>
</bookinfo>
Modified: branches/1.0.x/docs/gettingstartedguide/src/main/module/installation.xml
===================================================================
--- branches/1.0.x/docs/gettingstartedguide/src/main/module/installation.xml 2010-07-02 19:14:49 UTC (rev 292)
+++ branches/1.0.x/docs/gettingstartedguide/src/main/module/installation.xml 2010-07-02 20:04:14 UTC (rev 293)
@@ -15,7 +15,7 @@
</para>
<orderedlist>
<listitem>Eclipse JEE (3.5 or higher) <ulink url="http://www.eclipse.org">http://www.eclipse.org</ulink></listitem>
- <listitem>SAVARA (version 1.0.0.CR1 or higher), available from <ulink url="http://www.jboss.org/savara/downloads">http://www.jboss.org/savara/downloads</ulink></listitem>
+ <listitem>SAVARA (version 1.0.0.CR2 or higher), available from <ulink url="http://www.jboss.org/savara/downloads">http://www.jboss.org/savara/downloads</ulink></listitem>
<listitem>JBoss Tools (3.1 or higher) <ulink url="http://www.jboss.org/tools">http://www.jboss.org/tools</ulink>
available from an update site</listitem>
</orderedlist>
@@ -25,8 +25,8 @@
</para>
<orderedlist>
<listitem>JBossAS (5.1.0.GA or higher) <ulink url="http://www.jboss.org/jbossas">http://www.jboss.org/jbossas</ulink></listitem>
- <listitem>JBossAS (4.7 or higher) <ulink url="http://www.jboss.org/jbossesb">http://www.jboss.org/jbossesb</ulink></listitem>
- <listitem>SAVARA (version 1.0.0.CR1 or higher), available from <ulink url="http://www.jboss.org/savara/downloads">http://www.jboss.org/savara/downloads</ulink></listitem>
+ <listitem>JBossAS (4.8 or higher) <ulink url="http://www.jboss.org/jbossesb">http://www.jboss.org/jbossesb</ulink></listitem>
+ <listitem>SAVARA (version 1.0.0.CR2 or higher), available from <ulink url="http://www.jboss.org/savara/downloads">http://www.jboss.org/savara/downloads</ulink></listitem>
</orderedlist>
</section>
@@ -48,7 +48,7 @@
<para>
When Eclipse has been lauched, go to the <emphasis>Help->Install New Software..</emphasis>
menu item. Select the Eclipse update site
- for the version of Eclipse (e.g. Galileo). Within the SOA Development
+ for the version of Eclipse (e.g. Galileo or Helios). Within the SOA Development
category, select the BPMN Project Feature. Follow the instructions to accept
the license and then restart Eclipse after the plugins have been
installed.
@@ -75,7 +75,7 @@
</para>
<para>
NOTE: If you don't install the BPEL Editor, then you will have to install
- GMF. This can be found on the Galileo update site, under the <emphasis>Modeling</emphasis>
+ GMF. This can be found on the Galileo/Helios update site, under the <emphasis>Modeling</emphasis>
category. Select the <emphasis>Graphical Modeling Framework</emphasis> entry, and
following the instructions to install.
</para>
Modified: branches/1.0.x/docs/pom.xml
===================================================================
--- branches/1.0.x/docs/pom.xml 2010-07-02 19:14:49 UTC (rev 292)
+++ branches/1.0.x/docs/pom.xml 2010-07-02 20:04:14 UTC (rev 293)
@@ -8,12 +8,12 @@
<artifactId>docs</artifactId>
<packaging>pom</packaging>
<name>Savara::Docs</name>
- <version>1.0.0.CR1</version>
+ <version>1.0.0.CR2</version>
<parent>
<groupId>org.jboss</groupId>
<artifactId>savara</artifactId>
- <version>1.0.0.CR1</version>
+ <version>1.0.0.CR2</version>
</parent>
<modules>
Modified: branches/1.0.x/docs/samplesguide/pom.xml
===================================================================
--- branches/1.0.x/docs/samplesguide/pom.xml 2010-07-02 19:14:49 UTC (rev 292)
+++ branches/1.0.x/docs/samplesguide/pom.xml 2010-07-02 20:04:14 UTC (rev 293)
@@ -8,12 +8,12 @@
<artifactId>samplesguide</artifactId>
<packaging>jdocbook</packaging>
<name>Savara::Docs::SamplesGuide</name>
- <version>1.0.0.CR1</version>
+ <version>1.0.0.CR2</version>
<parent>
<groupId>org.jboss.savara</groupId>
<artifactId>docs</artifactId>
- <version>1.0.0.CR1</version>
+ <version>1.0.0.CR2</version>
</parent>
Modified: branches/1.0.x/docs/samplesguide/src/main/master.xml
===================================================================
--- branches/1.0.x/docs/samplesguide/src/main/master.xml 2010-07-02 19:14:49 UTC (rev 292)
+++ branches/1.0.x/docs/samplesguide/src/main/master.xml 2010-07-02 20:04:14 UTC (rev 293)
@@ -5,7 +5,7 @@
<book lang="en">
<bookinfo>
- <title>SAVARA 1.0.0.CR1</title>
+ <title>SAVARA 1.0.0.CR2</title>
<subtitle>Samples Guide</subtitle>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module/author_group.xml"/>
</bookinfo>
Modified: branches/1.0.x/docs/userguide/pom.xml
===================================================================
--- branches/1.0.x/docs/userguide/pom.xml 2010-07-02 19:14:49 UTC (rev 292)
+++ branches/1.0.x/docs/userguide/pom.xml 2010-07-02 20:04:14 UTC (rev 293)
@@ -8,12 +8,12 @@
<artifactId>userguide</artifactId>
<packaging>jdocbook</packaging>
<name>Savara::Docs::UserGuide</name>
- <version>1.0.0.CR1</version>
+ <version>1.0.0.CR2</version>
<parent>
<groupId>org.jboss.savara</groupId>
<artifactId>docs</artifactId>
- <version>1.0.0.CR1</version>
+ <version>1.0.0.CR2</version>
</parent>
Modified: branches/1.0.x/docs/userguide/src/main/master.xml
===================================================================
--- branches/1.0.x/docs/userguide/src/main/master.xml 2010-07-02 19:14:49 UTC (rev 292)
+++ branches/1.0.x/docs/userguide/src/main/master.xml 2010-07-02 20:04:14 UTC (rev 293)
@@ -5,7 +5,7 @@
<book lang="en">
<bookinfo>
- <title>SAVARA 1.0.0.CR1</title>
+ <title>SAVARA 1.0.0.CR2</title>
<subtitle>User Guide</subtitle>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module/author_group.xml"/>
</bookinfo>
Modified: branches/1.0.x/pom.xml
===================================================================
--- branches/1.0.x/pom.xml 2010-07-02 19:14:49 UTC (rev 292)
+++ branches/1.0.x/pom.xml 2010-07-02 20:04:14 UTC (rev 293)
@@ -4,7 +4,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss</groupId>
<artifactId>savara</artifactId>
- <version>1.0.0.CR1</version>
+ <version>1.0.0.CR2</version>
<packaging>pom</packaging>
<name>Savara</name>
<url>http://www.jboss.org/savara</url>
@@ -103,7 +103,7 @@
</build>
<properties>
- <savara-version>1.0.0.CR1</savara-version>
+ <savara-version>1.0.0.CR2</savara-version>
<junit.version>4.4</junit.version>
<rosetta.version>4.5</rosetta.version>
<log4j.version>1.2.14</log4j.version>
Modified: branches/1.0.x/tools/pom.xml
===================================================================
--- branches/1.0.x/tools/pom.xml 2010-07-02 19:14:49 UTC (rev 292)
+++ branches/1.0.x/tools/pom.xml 2010-07-02 20:04:14 UTC (rev 293)
@@ -8,12 +8,12 @@
<artifactId>tools</artifactId>
<packaging>pom</packaging>
<name>Savara::Tools</name>
- <version>1.0.0.CR1</version>
+ <version>1.0.0.CR2</version>
<parent>
<groupId>org.jboss</groupId>
<artifactId>savara</artifactId>
- <version>1.0.0.CR1</version>
+ <version>1.0.0.CR2</version>
</parent>
<modules>
Modified: branches/1.0.x/validators/jbossesb/pom.xml
===================================================================
--- branches/1.0.x/validators/jbossesb/pom.xml 2010-07-02 19:14:49 UTC (rev 292)
+++ branches/1.0.x/validators/jbossesb/pom.xml 2010-07-02 20:04:14 UTC (rev 293)
@@ -4,14 +4,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.savara.validators</groupId>
<artifactId>savara-validator-jbossesb</artifactId>
- <version>1.0.0.CR1</version>
+ <version>1.0.0.CR2</version>
<packaging>jar</packaging>
<name>Savara::Validators::JBossESB</name>
<parent>
<groupId>org.jboss.savara</groupId>
<artifactId>validators</artifactId>
- <version>1.0.0.CR1</version>
+ <version>1.0.0.CR2</version>
</parent>
<dependencies>
Modified: branches/1.0.x/validators/pom.xml
===================================================================
--- branches/1.0.x/validators/pom.xml 2010-07-02 19:14:49 UTC (rev 292)
+++ branches/1.0.x/validators/pom.xml 2010-07-02 20:04:14 UTC (rev 293)
@@ -8,12 +8,12 @@
<artifactId>validators</artifactId>
<packaging>pom</packaging>
<name>Savara::Validators</name>
- <version>1.0.0.CR1</version>
+ <version>1.0.0.CR2</version>
<parent>
<groupId>org.jboss</groupId>
<artifactId>savara</artifactId>
- <version>1.0.0.CR1</version>
+ <version>1.0.0.CR2</version>
</parent>
<modules>
Modified: trunk/distribution/src/main/release/ReleaseNotes.txt
===================================================================
--- trunk/distribution/src/main/release/ReleaseNotes.txt 2010-07-02 19:14:49 UTC (rev 292)
+++ trunk/distribution/src/main/release/ReleaseNotes.txt 2010-07-02 20:04:14 UTC (rev 293)
@@ -1,3 +1,15 @@
+SAVARA 1.0.0.CR2
+================
+
+This is the second Candidate Release of version 1.0.0 of SAVARA.
+
+This release is primarily a bug fix release, with a number of issues being resolved
+with the BPEL and WSDL generation.
+
+The detailed release notes can be found at:
+https://jira.jboss.org/secure/ReleaseNote.jspa?projectId=12310870&version=12314160
+
+
SAVARA 1.0.0.CR1
================
Modified: trunk/distribution/src/main/release/install/deployment.properties
===================================================================
--- trunk/distribution/src/main/release/install/deployment.properties 2010-07-02 19:14:49 UTC (rev 292)
+++ trunk/distribution/src/main/release/install/deployment.properties 2010-07-02 20:04:14 UTC (rev 293)
@@ -12,5 +12,5 @@
org.jboss.as.config=default
# The directory for JBossESB home.
-# (e.g. /local/deploy/jbossesb-4.7)
-org.jboss.esb.home=/local/deploy/jbossesb-4.7
+# (e.g. /local/deploy/jbossesb-4.8)
+org.jboss.esb.home=/local/deploy/jbossesb-4.8
Modified: trunk/docs/gettingstartedguide/src/main/module/installation.xml
===================================================================
--- trunk/docs/gettingstartedguide/src/main/module/installation.xml 2010-07-02 19:14:49 UTC (rev 292)
+++ trunk/docs/gettingstartedguide/src/main/module/installation.xml 2010-07-02 20:04:14 UTC (rev 293)
@@ -15,7 +15,7 @@
</para>
<orderedlist>
<listitem>Eclipse JEE (3.5 or higher) <ulink url="http://www.eclipse.org">http://www.eclipse.org</ulink></listitem>
- <listitem>SAVARA (version 1.0.0.CR1 or higher), available from <ulink url="http://www.jboss.org/savara/downloads">http://www.jboss.org/savara/downloads</ulink></listitem>
+ <listitem>SAVARA (version 1.0.0.CR2 or higher), available from <ulink url="http://www.jboss.org/savara/downloads">http://www.jboss.org/savara/downloads</ulink></listitem>
<listitem>JBoss Tools (3.1 or higher) <ulink url="http://www.jboss.org/tools">http://www.jboss.org/tools</ulink>
available from an update site</listitem>
</orderedlist>
@@ -25,8 +25,8 @@
</para>
<orderedlist>
<listitem>JBossAS (5.1.0.GA or higher) <ulink url="http://www.jboss.org/jbossas">http://www.jboss.org/jbossas</ulink></listitem>
- <listitem>JBossAS (4.7 or higher) <ulink url="http://www.jboss.org/jbossesb">http://www.jboss.org/jbossesb</ulink></listitem>
- <listitem>SAVARA (version 1.0.0.CR1 or higher), available from <ulink url="http://www.jboss.org/savara/downloads">http://www.jboss.org/savara/downloads</ulink></listitem>
+ <listitem>JBossAS (4.8 or higher) <ulink url="http://www.jboss.org/jbossesb">http://www.jboss.org/jbossesb</ulink></listitem>
+ <listitem>SAVARA (version 1.0.0.CR2 or higher), available from <ulink url="http://www.jboss.org/savara/downloads">http://www.jboss.org/savara/downloads</ulink></listitem>
</orderedlist>
</section>
@@ -48,7 +48,7 @@
<para>
When Eclipse has been lauched, go to the <emphasis>Help->Install New Software..</emphasis>
menu item. Select the Eclipse update site
- for the version of Eclipse (e.g. Galileo). Within the SOA Development
+ for the version of Eclipse (e.g. Galileo or Helios). Within the SOA Development
category, select the BPMN Project Feature. Follow the instructions to accept
the license and then restart Eclipse after the plugins have been
installed.
@@ -75,7 +75,7 @@
</para>
<para>
NOTE: If you don't install the BPEL Editor, then you will have to install
- GMF. This can be found on the Galileo update site, under the <emphasis>Modeling</emphasis>
+ GMF. This can be found on the Galileo/Helios update site, under the <emphasis>Modeling</emphasis>
category. Select the <emphasis>Graphical Modeling Framework</emphasis> entry, and
following the instructions to install.
</para>
13 years, 10 months
- 1
- 0
savara SVN: r292 - branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results and 4 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2010-07-02 15:14:49 -0400 (Fri, 02 Jul 2010)
New Revision: 292
Modified:
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Broker.bpel
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Buyer.bpel
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)CreditAgency.bpel
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Buyer.bpel
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)CreditAgency.bpel
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Store.bpel
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Buyer.bpel
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Seller.bpel
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker(a)Broker.scv
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Broker.bpel
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Buyer.bpel
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)CreditAgency.bpel
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Buyer.bpel
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)CreditAgency.bpel
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Store.bpel
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Buyer.bpel
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Seller.bpel
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker(a)Broker.scv
Log:
Fixed remaining fault message types and updated expected test results.
Modified: branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java
===================================================================
--- branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java 2010-07-01 19:42:28 UTC (rev 291)
+++ branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java 2010-07-02 19:14:49 UTC (rev 292)
@@ -350,6 +350,9 @@
if (InteractionUtil.isRequest(interaction)) {
qname = WSDLGeneratorUtil.getRequestMessageType(contract.getNamespace(),
interaction.getMessageSignature().getOperation());
+ } else if (InteractionPatterns.isFaultResponse(interaction)) {
+ qname = WSDLGeneratorUtil.getFaultMessageType(contract.getNamespace(),
+ InteractionPatterns.getFaultName(interaction));
} else {
qname = WSDLGeneratorUtil.getResponseMessageType(contract.getNamespace(),
interaction.getMessageSignature().getOperation());
Modified: branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Broker.bpel
===================================================================
--- branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Broker.bpel 2010-07-01 19:42:28 UTC (rev 291)
+++ branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Broker.bpel 2010-07-02 19:14:49 UTC (rev 292)
@@ -10,17 +10,17 @@
<partnerLink name="BrokerToSupplierTxnProcessor" partnerLinkType="tns:BrokerToSupplierTxnProcessorLT" partnerRole="SupplierTxnProcessorRequester"/>
</partnerLinks>
<variables>
- <variable messageType="enquiry" name="enquiryVar"/>
- <variable messageType="requestForQuote" name="requestForQuoteVar"/>
- <variable messageType="quote" name="quoteVar"/>
- <variable messageType="quoteList" name="quoteListVar"/>
- <variable messageType="buy" name="buyVar"/>
- <variable messageType="CreditCheckRequest" name="creditCheckRequestVar"/>
- <variable messageType="CreditCheckOk" name="creditCheckOkVar"/>
- <variable messageType="orderConfirmed" name="orderConfirmedVar"/>
- <variable messageType="bookingReference" name="bookingReferenceVar"/>
- <variable messageType="orderRejected" name="orderRejectedVar"/>
- <variable messageType="cancel" name="cancelVar"/>
+ <variable messageType="tns:makeEnquiryRequest" name="enquiryVar"/>
+ <variable messageType="ns1:getQuoteRequest" name="requestForQuoteVar"/>
+ <variable messageType="ns1:getQuoteResponse" name="quoteVar"/>
+ <variable messageType="tns:makeEnquiryResponse" name="quoteListVar"/>
+ <variable messageType="tns:buyRequest" name="buyVar"/>
+ <variable messageType="tns:checkCreditRequest" name="creditCheckRequestVar"/>
+ <variable messageType="tns:checkCreditResponse" name="creditCheckOkVar"/>
+ <variable messageType="ns1:confirmRequest" name="orderConfirmedVar"/>
+ <variable messageType="ns1:confirmResponse" name="bookingReferenceVar"/>
+ <variable messageType="tns:rejectedFault" name="orderRejectedVar"/>
+ <variable messageType="tns:cancelRequest" name="cancelVar"/>
</variables>
<sequence>
<receive createInstance="yes" name="Receive_enquiry" operation="makeEnquiry" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior" variable="enquiryVar"/>
@@ -41,7 +41,7 @@
<sequence>
<scope>
<faultHandlers>
- <catch faultMessageType="CreditCheckInvalid" faultName="invalidCredit" faultVariable="creditCheckInvalidVar">
+ <catch faultMessageType="tns:invalidCreditFault" faultName="tns:invalidCredit" faultVariable="creditCheckInvalidVar">
<sequence>
<reply faultName="tns:rejected" name="Send_orderRejected" operation="buy" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior" variable="orderRejectedVar"/>
</sequence>
Modified: branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Buyer.bpel
===================================================================
--- branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Buyer.bpel 2010-07-01 19:42:28 UTC (rev 291)
+++ branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Buyer.bpel 2010-07-02 19:14:49 UTC (rev 292)
@@ -7,11 +7,11 @@
<partnerLink myRole="BuyerRequester" name="BuyerToBroker" partnerLinkType="tns:BuyerToBrokerLT" partnerRole="BrokerRequester"/>
</partnerLinks>
<variables>
- <variable messageType="enquiry" name="enquiryVar"/>
- <variable messageType="quoteList" name="quoteListVar"/>
- <variable messageType="buy" name="buyVar"/>
- <variable messageType="bookingReference" name="bookingReferenceVar"/>
- <variable messageType="cancel" name="cancelVar"/>
+ <variable messageType="tns:makeEnquiryRequest" name="enquiryVar"/>
+ <variable messageType="tns:makeEnquiryResponse" name="quoteListVar"/>
+ <variable messageType="tns:buyRequest" name="buyVar"/>
+ <variable messageType="tns:buyResponse" name="bookingReferenceVar"/>
+ <variable messageType="tns:cancelRequest" name="cancelVar"/>
</variables>
<sequence>
<invoke inputVariable="enquiryVar" name="Send_enquiry" operation="makeEnquiry" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior"/>
@@ -22,7 +22,7 @@
<sequence>
<scope>
<faultHandlers>
- <catch faultMessageType="orderRejected" faultName="rejected" faultVariable="orderRejectedVar">
+ <catch faultMessageType="tns:rejectedFault" faultName="tns:rejected" faultVariable="orderRejectedVar">
<sequence/>
</catch>
</faultHandlers>
Modified: branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)CreditAgency.bpel
===================================================================
--- branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)CreditAgency.bpel 2010-07-01 19:42:28 UTC (rev 291)
+++ branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)CreditAgency.bpel 2010-07-02 19:14:49 UTC (rev 292)
@@ -7,9 +7,9 @@
<partnerLink myRole="CreditAgencyService" name="BrokerToCreditAgency" partnerLinkType="tns:BrokerToCreditAgencyServiceLT"/>
</partnerLinks>
<variables>
- <variable messageType="CreditCheckRequest" name="creditCheckRequestVar"/>
- <variable messageType="CreditCheckOk" name="creditCheckOkVar"/>
- <variable messageType="CreditCheckInvalid" name="creditCheckInvalidVar"/>
+ <variable messageType="tns:checkCreditRequest" name="creditCheckRequestVar"/>
+ <variable messageType="tns:checkCreditResponse" name="creditCheckOkVar"/>
+ <variable messageType="tns:invalidCreditFault" name="creditCheckInvalidVar"/>
</variables>
<sequence>
<pick>
Modified: branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel
===================================================================
--- branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel 2010-07-01 19:42:28 UTC (rev 291)
+++ branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel 2010-07-02 19:14:49 UTC (rev 292)
@@ -5,8 +5,8 @@
<partnerLink myRole="SupplierQuoteEngineService" name="BrokerToSupplierQuoteEngine" partnerLinkType="ns1:BrokerToSupplierQuoteEngineServiceLT"/>
</partnerLinks>
<variables>
- <variable messageType="requestForQuote" name="requestForQuoteVar"/>
- <variable messageType="quote" name="quoteVar"/>
+ <variable messageType="ns1:getQuoteRequest" name="requestForQuoteVar"/>
+ <variable messageType="ns1:getQuoteResponse" name="quoteVar"/>
</variables>
<sequence>
<receive createInstance="yes" name="Receive_requestForQuote" operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="tns:SupplierBehavior" variable="requestForQuoteVar"/>
Modified: branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel
===================================================================
--- branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel 2010-07-01 19:42:28 UTC (rev 291)
+++ branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel 2010-07-02 19:14:49 UTC (rev 292)
@@ -5,8 +5,8 @@
<partnerLink myRole="SupplierTxnProcessorService" name="BrokerToSupplierTxnProcessor" partnerLinkType="ns2:BrokerToSupplierTxnProcessorServiceLT"/>
</partnerLinks>
<variables>
- <variable messageType="orderConfirmed" name="orderConfirmedVar"/>
- <variable messageType="bookingReference" name="bookingReferenceVar"/>
+ <variable messageType="ns1:confirmRequest" name="orderConfirmedVar"/>
+ <variable messageType="ns1:confirmResponse" name="bookingReferenceVar"/>
</variables>
<sequence>
<pick createInstance="yes">
Modified: branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Buyer.bpel
===================================================================
--- branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Buyer.bpel 2010-07-01 19:42:28 UTC (rev 291)
+++ branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Buyer.bpel 2010-07-02 19:14:49 UTC (rev 292)
@@ -6,13 +6,13 @@
<partnerLink name="BuyerToStore" partnerLinkType="tns:BuyerToStoreLT" partnerRole="StoreRequester"/>
</partnerLinks>
<variables>
- <variable messageType="sto:BuyRequest" name="buyRequestVar"/>
- <variable messageType="sto:BuyConfirmed" name="buyConfirmedVar"/>
+ <variable messageType="sto:buyRequest" name="buyRequestVar"/>
+ <variable messageType="sto:buyResponse" name="buyConfirmedVar"/>
</variables>
<sequence>
<scope>
<faultHandlers>
- <catch faultMessageType="sto:BuyFailed" faultName="sto:BuyFailed" faultVariable="buyFailedVar">
+ <catch faultMessageType="sto:BuyFailedFault" faultName="sto:BuyFailed" faultVariable="buyFailedVar">
<sequence/>
</catch>
</faultHandlers>
Modified: branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)CreditAgency.bpel
===================================================================
--- branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)CreditAgency.bpel 2010-07-01 19:42:28 UTC (rev 291)
+++ branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)CreditAgency.bpel 2010-07-02 19:14:49 UTC (rev 292)
@@ -6,9 +6,9 @@
<partnerLink myRole="CreditAgencyService" name="StoreToCreditAgency" partnerLinkType="pur:StoreToCreditAgencyServiceLT"/>
</partnerLinks>
<variables>
- <variable messageType="pur:CreditCheckRequest" name="creditCheckRequestVar"/>
- <variable messageType="pur:CreditCheckOk" name="creditCheckOkVar"/>
- <variable messageType="pur:CreditCheckInvalid" name="creditCheckInvalidVar"/>
+ <variable messageType="pur:checkCreditRequest" name="creditCheckRequestVar"/>
+ <variable messageType="pur:checkCreditResponse" name="creditCheckOkVar"/>
+ <variable messageType="pur:CreditCheckFailedFault" name="creditCheckInvalidVar"/>
</variables>
<sequence>
<receive createInstance="yes" name="Receive_CreditCheckRequest" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" variable="creditCheckRequestVar"/>
Modified: branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Store.bpel
===================================================================
--- branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Store.bpel 2010-07-01 19:42:28 UTC (rev 291)
+++ branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Store.bpel 2010-07-02 19:14:49 UTC (rev 292)
@@ -7,17 +7,17 @@
<partnerLink name="StoreToCreditAgency" partnerLinkType="sto:StoreToCreditAgencyLT" partnerRole="CreditAgencyRequester"/>
</partnerLinks>
<variables>
- <variable messageType="sto:BuyRequest" name="buyRequestVar"/>
- <variable messageType="pur:CreditCheckRequest" name="creditCheckRequestVar"/>
- <variable messageType="pur:CreditCheckOk" name="creditCheckOkVar"/>
- <variable messageType="sto:BuyConfirmed" name="buyConfirmedVar"/>
- <variable messageType="sto:BuyFailed" name="buyFailedVar"/>
+ <variable messageType="sto:buyRequest" name="buyRequestVar"/>
+ <variable messageType="pur:checkCreditRequest" name="creditCheckRequestVar"/>
+ <variable messageType="pur:checkCreditResponse" name="creditCheckOkVar"/>
+ <variable messageType="sto:buyResponse" name="buyConfirmedVar"/>
+ <variable messageType="sto:BuyFailedFault" name="buyFailedVar"/>
</variables>
<sequence>
<receive createInstance="yes" name="Receive_BuyRequest" operation="buy" partnerLink="BuyerToStore" portType="sto:StoreInterface" variable="buyRequestVar"/>
<scope>
<faultHandlers>
- <catch faultMessageType="pur:CreditCheckInvalid" faultName="pur:CreditCheckFailed" faultVariable="creditCheckInvalidVar">
+ <catch faultMessageType="pur:CreditCheckFailedFault" faultName="pur:CreditCheckFailed" faultVariable="creditCheckInvalidVar">
<sequence>
<reply faultName="sto:BuyFailed" name="Send_BuyFailed" operation="buy" partnerLink="BuyerToStore" portType="sto:StoreInterface" variable="buyFailedVar"/>
</sequence>
Modified: branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Buyer.bpel
===================================================================
--- branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Buyer.bpel 2010-07-01 19:42:28 UTC (rev 291)
+++ branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Buyer.bpel 2010-07-02 19:14:49 UTC (rev 292)
@@ -5,13 +5,13 @@
<partnerLink name="BuyerToSeller" partnerLinkType="tns:BuyerToSellerLT" partnerRole="SellerRequester"/>
</partnerLinks>
<variables>
- <variable messageType="CreditCheckRequest" name="creditCheckRequestVar"/>
- <variable messageType="CreditCheckOk" name="creditCheckOkVar"/>
+ <variable messageType="tns:checkCreditRequest" name="creditCheckRequestVar"/>
+ <variable messageType="tns:checkCreditResponse" name="creditCheckOkVar"/>
</variables>
<sequence>
<scope>
<faultHandlers>
- <catch faultMessageType="CreditCheckInvalid" faultName="insufficientCredit" faultVariable="creditCheckInvalidVar">
+ <catch faultMessageType="tns:insufficientCreditFault" faultName="tns:insufficientCredit" faultVariable="creditCheckInvalidVar">
<sequence/>
</catch>
</faultHandlers>
Modified: branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Seller.bpel
===================================================================
--- branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Seller.bpel 2010-07-01 19:42:28 UTC (rev 291)
+++ branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Seller.bpel 2010-07-02 19:14:49 UTC (rev 292)
@@ -5,9 +5,9 @@
<partnerLink myRole="SellerService" name="BuyerToSeller" partnerLinkType="tns:BuyerToSellerServiceLT"/>
</partnerLinks>
<variables>
- <variable messageType="CreditCheckRequest" name="creditCheckRequestVar"/>
- <variable messageType="CreditCheckOk" name="creditCheckOkVar"/>
- <variable messageType="CreditCheckInvalid" name="creditCheckInvalidVar"/>
+ <variable messageType="tns:checkCreditRequest" name="creditCheckRequestVar"/>
+ <variable messageType="tns:checkCreditResponse" name="creditCheckOkVar"/>
+ <variable messageType="tns:insufficientCreditFault" name="creditCheckInvalidVar"/>
</variables>
<sequence>
<receive createInstance="yes" name="Receive_CreditCheckRequest" operation="checkCredit" partnerLink="BuyerToSeller" portType="tns:SellerBehavior" variable="creditCheckRequestVar"/>
Modified: branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker(a)Broker.scv
===================================================================
--- branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker(a)Broker.scv 2010-07-01 19:42:28 UTC (rev 291)
+++ branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker(a)Broker.scv 2010-07-02 19:14:49 UTC (rev 292)
@@ -6,6 +6,7 @@
getQuote(requestForQuote) from Broker to SupplierQuoteEngine;
getQuote(quote) from SupplierQuoteEngine to Broker;
}
+ ;
makeEnquiry(quoteList) from Broker to Buyer;
if {
buy(buy) from Buyer to Broker;
Modified: trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java
===================================================================
--- trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java 2010-07-01 19:42:28 UTC (rev 291)
+++ trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationInteractionModelChangeRule.java 2010-07-02 19:14:49 UTC (rev 292)
@@ -350,6 +350,9 @@
if (InteractionUtil.isRequest(interaction)) {
qname = WSDLGeneratorUtil.getRequestMessageType(contract.getNamespace(),
interaction.getMessageSignature().getOperation());
+ } else if (InteractionPatterns.isFaultResponse(interaction)) {
+ qname = WSDLGeneratorUtil.getFaultMessageType(contract.getNamespace(),
+ InteractionPatterns.getFaultName(interaction));
} else {
qname = WSDLGeneratorUtil.getResponseMessageType(contract.getNamespace(),
interaction.getMessageSignature().getOperation());
Modified: trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Broker.bpel
===================================================================
--- trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Broker.bpel 2010-07-01 19:42:28 UTC (rev 291)
+++ trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Broker.bpel 2010-07-02 19:14:49 UTC (rev 292)
@@ -10,17 +10,17 @@
<partnerLink name="BrokerToSupplierTxnProcessor" partnerLinkType="tns:BrokerToSupplierTxnProcessorLT" partnerRole="SupplierTxnProcessorRequester"/>
</partnerLinks>
<variables>
- <variable messageType="enquiry" name="enquiryVar"/>
- <variable messageType="requestForQuote" name="requestForQuoteVar"/>
- <variable messageType="quote" name="quoteVar"/>
- <variable messageType="quoteList" name="quoteListVar"/>
- <variable messageType="buy" name="buyVar"/>
- <variable messageType="CreditCheckRequest" name="creditCheckRequestVar"/>
- <variable messageType="CreditCheckOk" name="creditCheckOkVar"/>
- <variable messageType="orderConfirmed" name="orderConfirmedVar"/>
- <variable messageType="bookingReference" name="bookingReferenceVar"/>
- <variable messageType="orderRejected" name="orderRejectedVar"/>
- <variable messageType="cancel" name="cancelVar"/>
+ <variable messageType="tns:makeEnquiryRequest" name="enquiryVar"/>
+ <variable messageType="ns1:getQuoteRequest" name="requestForQuoteVar"/>
+ <variable messageType="ns1:getQuoteResponse" name="quoteVar"/>
+ <variable messageType="tns:makeEnquiryResponse" name="quoteListVar"/>
+ <variable messageType="tns:buyRequest" name="buyVar"/>
+ <variable messageType="tns:checkCreditRequest" name="creditCheckRequestVar"/>
+ <variable messageType="tns:checkCreditResponse" name="creditCheckOkVar"/>
+ <variable messageType="ns1:confirmRequest" name="orderConfirmedVar"/>
+ <variable messageType="ns1:confirmResponse" name="bookingReferenceVar"/>
+ <variable messageType="tns:rejectedFault" name="orderRejectedVar"/>
+ <variable messageType="tns:cancelRequest" name="cancelVar"/>
</variables>
<sequence>
<receive createInstance="yes" name="Receive_enquiry" operation="makeEnquiry" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior" variable="enquiryVar"/>
@@ -41,7 +41,7 @@
<sequence>
<scope>
<faultHandlers>
- <catch faultMessageType="CreditCheckInvalid" faultName="invalidCredit" faultVariable="creditCheckInvalidVar">
+ <catch faultMessageType="tns:invalidCreditFault" faultName="tns:invalidCredit" faultVariable="creditCheckInvalidVar">
<sequence>
<reply faultName="tns:rejected" name="Send_orderRejected" operation="buy" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior" variable="orderRejectedVar"/>
</sequence>
Modified: trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Buyer.bpel
===================================================================
--- trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Buyer.bpel 2010-07-01 19:42:28 UTC (rev 291)
+++ trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)Buyer.bpel 2010-07-02 19:14:49 UTC (rev 292)
@@ -7,11 +7,11 @@
<partnerLink myRole="BuyerRequester" name="BuyerToBroker" partnerLinkType="tns:BuyerToBrokerLT" partnerRole="BrokerRequester"/>
</partnerLinks>
<variables>
- <variable messageType="enquiry" name="enquiryVar"/>
- <variable messageType="quoteList" name="quoteListVar"/>
- <variable messageType="buy" name="buyVar"/>
- <variable messageType="bookingReference" name="bookingReferenceVar"/>
- <variable messageType="cancel" name="cancelVar"/>
+ <variable messageType="tns:makeEnquiryRequest" name="enquiryVar"/>
+ <variable messageType="tns:makeEnquiryResponse" name="quoteListVar"/>
+ <variable messageType="tns:buyRequest" name="buyVar"/>
+ <variable messageType="tns:buyResponse" name="bookingReferenceVar"/>
+ <variable messageType="tns:cancelRequest" name="cancelVar"/>
</variables>
<sequence>
<invoke inputVariable="enquiryVar" name="Send_enquiry" operation="makeEnquiry" partnerLink="BuyerToBroker" portType="tns:BrokerBehavior"/>
@@ -22,7 +22,7 @@
<sequence>
<scope>
<faultHandlers>
- <catch faultMessageType="orderRejected" faultName="rejected" faultVariable="orderRejectedVar">
+ <catch faultMessageType="tns:rejectedFault" faultName="tns:rejected" faultVariable="orderRejectedVar">
<sequence/>
</catch>
</faultHandlers>
Modified: trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)CreditAgency.bpel
===================================================================
--- trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)CreditAgency.bpel 2010-07-01 19:42:28 UTC (rev 291)
+++ trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)CreditAgency.bpel 2010-07-02 19:14:49 UTC (rev 292)
@@ -7,9 +7,9 @@
<partnerLink myRole="CreditAgencyService" name="BrokerToCreditAgency" partnerLinkType="tns:BrokerToCreditAgencyServiceLT"/>
</partnerLinks>
<variables>
- <variable messageType="CreditCheckRequest" name="creditCheckRequestVar"/>
- <variable messageType="CreditCheckOk" name="creditCheckOkVar"/>
- <variable messageType="CreditCheckInvalid" name="creditCheckInvalidVar"/>
+ <variable messageType="tns:checkCreditRequest" name="creditCheckRequestVar"/>
+ <variable messageType="tns:checkCreditResponse" name="creditCheckOkVar"/>
+ <variable messageType="tns:invalidCreditFault" name="creditCheckInvalidVar"/>
</variables>
<sequence>
<pick>
Modified: trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel
===================================================================
--- trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel 2010-07-01 19:42:28 UTC (rev 291)
+++ trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierQuoteEngine.bpel 2010-07-02 19:14:49 UTC (rev 292)
@@ -5,8 +5,8 @@
<partnerLink myRole="SupplierQuoteEngineService" name="BrokerToSupplierQuoteEngine" partnerLinkType="ns1:BrokerToSupplierQuoteEngineServiceLT"/>
</partnerLinks>
<variables>
- <variable messageType="requestForQuote" name="requestForQuoteVar"/>
- <variable messageType="quote" name="quoteVar"/>
+ <variable messageType="ns1:getQuoteRequest" name="requestForQuoteVar"/>
+ <variable messageType="ns1:getQuoteResponse" name="quoteVar"/>
</variables>
<sequence>
<receive createInstance="yes" name="Receive_requestForQuote" operation="getQuote" partnerLink="BrokerToSupplierQuoteEngine" portType="tns:SupplierBehavior" variable="requestForQuoteVar"/>
Modified: trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel
===================================================================
--- trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel 2010-07-01 19:42:28 UTC (rev 291)
+++ trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ESBBroker(a)SupplierTxnProcessor.bpel 2010-07-02 19:14:49 UTC (rev 292)
@@ -5,8 +5,8 @@
<partnerLink myRole="SupplierTxnProcessorService" name="BrokerToSupplierTxnProcessor" partnerLinkType="ns2:BrokerToSupplierTxnProcessorServiceLT"/>
</partnerLinks>
<variables>
- <variable messageType="orderConfirmed" name="orderConfirmedVar"/>
- <variable messageType="bookingReference" name="bookingReferenceVar"/>
+ <variable messageType="ns1:confirmRequest" name="orderConfirmedVar"/>
+ <variable messageType="ns1:confirmResponse" name="bookingReferenceVar"/>
</variables>
<sequence>
<pick createInstance="yes">
Modified: trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Buyer.bpel
===================================================================
--- trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Buyer.bpel 2010-07-01 19:42:28 UTC (rev 291)
+++ trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Buyer.bpel 2010-07-02 19:14:49 UTC (rev 292)
@@ -6,13 +6,13 @@
<partnerLink name="BuyerToStore" partnerLinkType="tns:BuyerToStoreLT" partnerRole="StoreRequester"/>
</partnerLinks>
<variables>
- <variable messageType="sto:BuyRequest" name="buyRequestVar"/>
- <variable messageType="sto:BuyConfirmed" name="buyConfirmedVar"/>
+ <variable messageType="sto:buyRequest" name="buyRequestVar"/>
+ <variable messageType="sto:buyResponse" name="buyConfirmedVar"/>
</variables>
<sequence>
<scope>
<faultHandlers>
- <catch faultMessageType="sto:BuyFailed" faultName="sto:BuyFailed" faultVariable="buyFailedVar">
+ <catch faultMessageType="sto:BuyFailedFault" faultName="sto:BuyFailed" faultVariable="buyFailedVar">
<sequence/>
</catch>
</faultHandlers>
Modified: trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)CreditAgency.bpel
===================================================================
--- trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)CreditAgency.bpel 2010-07-01 19:42:28 UTC (rev 291)
+++ trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)CreditAgency.bpel 2010-07-02 19:14:49 UTC (rev 292)
@@ -6,9 +6,9 @@
<partnerLink myRole="CreditAgencyService" name="StoreToCreditAgency" partnerLinkType="pur:StoreToCreditAgencyServiceLT"/>
</partnerLinks>
<variables>
- <variable messageType="pur:CreditCheckRequest" name="creditCheckRequestVar"/>
- <variable messageType="pur:CreditCheckOk" name="creditCheckOkVar"/>
- <variable messageType="pur:CreditCheckInvalid" name="creditCheckInvalidVar"/>
+ <variable messageType="pur:checkCreditRequest" name="creditCheckRequestVar"/>
+ <variable messageType="pur:checkCreditResponse" name="creditCheckOkVar"/>
+ <variable messageType="pur:CreditCheckFailedFault" name="creditCheckInvalidVar"/>
</variables>
<sequence>
<receive createInstance="yes" name="Receive_CreditCheckRequest" operation="checkCredit" partnerLink="StoreToCreditAgency" portType="pur:CreditAgencyInterface" variable="creditCheckRequestVar"/>
Modified: trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Store.bpel
===================================================================
--- trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Store.bpel 2010-07-01 19:42:28 UTC (rev 291)
+++ trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/PurchaseGoods(a)Store.bpel 2010-07-02 19:14:49 UTC (rev 292)
@@ -7,17 +7,17 @@
<partnerLink name="StoreToCreditAgency" partnerLinkType="sto:StoreToCreditAgencyLT" partnerRole="CreditAgencyRequester"/>
</partnerLinks>
<variables>
- <variable messageType="sto:BuyRequest" name="buyRequestVar"/>
- <variable messageType="pur:CreditCheckRequest" name="creditCheckRequestVar"/>
- <variable messageType="pur:CreditCheckOk" name="creditCheckOkVar"/>
- <variable messageType="sto:BuyConfirmed" name="buyConfirmedVar"/>
- <variable messageType="sto:BuyFailed" name="buyFailedVar"/>
+ <variable messageType="sto:buyRequest" name="buyRequestVar"/>
+ <variable messageType="pur:checkCreditRequest" name="creditCheckRequestVar"/>
+ <variable messageType="pur:checkCreditResponse" name="creditCheckOkVar"/>
+ <variable messageType="sto:buyResponse" name="buyConfirmedVar"/>
+ <variable messageType="sto:BuyFailedFault" name="buyFailedVar"/>
</variables>
<sequence>
<receive createInstance="yes" name="Receive_BuyRequest" operation="buy" partnerLink="BuyerToStore" portType="sto:StoreInterface" variable="buyRequestVar"/>
<scope>
<faultHandlers>
- <catch faultMessageType="pur:CreditCheckInvalid" faultName="pur:CreditCheckFailed" faultVariable="creditCheckInvalidVar">
+ <catch faultMessageType="pur:CreditCheckFailedFault" faultName="pur:CreditCheckFailed" faultVariable="creditCheckInvalidVar">
<sequence>
<reply faultName="sto:BuyFailed" name="Send_BuyFailed" operation="buy" partnerLink="BuyerToStore" portType="sto:StoreInterface" variable="buyFailedVar"/>
</sequence>
Modified: trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Buyer.bpel
===================================================================
--- trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Buyer.bpel 2010-07-01 19:42:28 UTC (rev 291)
+++ trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Buyer.bpel 2010-07-02 19:14:49 UTC (rev 292)
@@ -5,13 +5,13 @@
<partnerLink name="BuyerToSeller" partnerLinkType="tns:BuyerToSellerLT" partnerRole="SellerRequester"/>
</partnerLinks>
<variables>
- <variable messageType="CreditCheckRequest" name="creditCheckRequestVar"/>
- <variable messageType="CreditCheckOk" name="creditCheckOkVar"/>
+ <variable messageType="tns:checkCreditRequest" name="creditCheckRequestVar"/>
+ <variable messageType="tns:checkCreditResponse" name="creditCheckOkVar"/>
</variables>
<sequence>
<scope>
<faultHandlers>
- <catch faultMessageType="CreditCheckInvalid" faultName="insufficientCredit" faultVariable="creditCheckInvalidVar">
+ <catch faultMessageType="tns:insufficientCreditFault" faultName="tns:insufficientCredit" faultVariable="creditCheckInvalidVar">
<sequence/>
</catch>
</faultHandlers>
Modified: trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Seller.bpel
===================================================================
--- trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Seller.bpel 2010-07-01 19:42:28 UTC (rev 291)
+++ trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/generator/results/ReqRespFault(a)Seller.bpel 2010-07-02 19:14:49 UTC (rev 292)
@@ -5,9 +5,9 @@
<partnerLink myRole="SellerService" name="BuyerToSeller" partnerLinkType="tns:BuyerToSellerServiceLT"/>
</partnerLinks>
<variables>
- <variable messageType="CreditCheckRequest" name="creditCheckRequestVar"/>
- <variable messageType="CreditCheckOk" name="creditCheckOkVar"/>
- <variable messageType="CreditCheckInvalid" name="creditCheckInvalidVar"/>
+ <variable messageType="tns:checkCreditRequest" name="creditCheckRequestVar"/>
+ <variable messageType="tns:checkCreditResponse" name="creditCheckOkVar"/>
+ <variable messageType="tns:insufficientCreditFault" name="creditCheckInvalidVar"/>
</variables>
<sequence>
<receive createInstance="yes" name="Receive_CreditCheckRequest" operation="checkCredit" partnerLink="BuyerToSeller" portType="tns:SellerBehavior" variable="creditCheckRequestVar"/>
Modified: trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker(a)Broker.scv
===================================================================
--- trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker(a)Broker.scv 2010-07-01 19:42:28 UTC (rev 291)
+++ trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/plugintest/org/jboss/savara/tools/bpel/parser/results/ESBBroker(a)Broker.scv 2010-07-02 19:14:49 UTC (rev 292)
@@ -6,6 +6,7 @@
getQuote(requestForQuote) from Broker to SupplierQuoteEngine;
getQuote(quote) from SupplierQuoteEngine to Broker;
}
+ ;
makeEnquiry(quoteList) from Broker to Buyer;
if {
buy(buy) from Buyer to Broker;
13 years, 10 months
- 1
- 0
Hudson build is back to Hudson build is back to normal : savara-eclipse-1.0.x #16
by jboss-qa-internal＠redhat.com
See <http://hudson.qa.jboss.com/hudson/job/savara-eclipse-1.0.x/16/>
13 years, 10 months
- 1
- 0
savara SVN: r291 - branches/1.0.x/tools/eclipse/releng.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2010-07-01 15:42:28 -0400 (Thu, 01 Jul 2010)
New Revision: 291
Modified:
branches/1.0.x/tools/eclipse/releng/build.properties
Log:
Modified: branches/1.0.x/tools/eclipse/releng/build.properties
===================================================================
--- branches/1.0.x/tools/eclipse/releng/build.properties 2010-07-01 19:39:54 UTC (rev 290)
+++ branches/1.0.x/tools/eclipse/releng/build.properties 2010-07-01 19:42:28 UTC (rev 291)
@@ -25,7 +25,7 @@
repositoryURLs=\
http://download.eclipse.org/releases/galileo/,\
http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/u...
-http://download.jboss.org/jbosstools/builds/nightly/trunk/201006290654/all/JBossTools-Update-3.2.0.v201006290654N-H394-M1.zip
+http://download.jboss.org/jbosstools/builds/nightly/trunk/201007010601/all/JBossTools-Update-3.2.0.v201007010601N-H404-M1.zip
IUsToInstall=org.eclipse.sdk.feature.group+org.eclipse.sdk.ide+\
org.eclipse.emf.feature.group+org.eclipse.xsd.feature.group+org.eclipse.gef.feature.group+\
13 years, 10 months
- 1
- 0
savara SVN: r290 - branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change and 5 other directories.
by do-not-reply＠jboss.org
Author: objectiser
Date: 2010-07-01 15:39:54 -0400 (Thu, 01 Jul 2010)
New Revision: 290
Modified:
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java
branches/1.0.x/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGenerator.java
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java
trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java
trunk/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGenerator.java
trunk/tools/eclipse/releng/build.properties
Log:
Fixed faultMessageType value and added external service imports into Artifacts.wsdl file.
Modified: branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java
===================================================================
--- branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java 2010-06-30 09:36:45 UTC (rev 289)
+++ branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java 2010-07-01 19:39:54 UTC (rev 290)
@@ -459,6 +459,33 @@
defn.appendChild(imp);
+ // Add imports for associated roles
+ java.util.ListIterator<Role> roles=localcm.getConversation().getRoles().listIterator();
+
+ while (roles.hasNext()) {
+ Role r=roles.next();
+ Contract contract=(Contract)r.getAnnotations().get(Contract.class.getName());
+
+ boolean gen=false;
+
+ for (int i=0; gen == false && i < contract.getInterfaces().size(); i++) {
+ if (contract.getInterfaces().get(i).getMessageExchangePatterns().size() > 0) {
+ gen = true;
+ }
+ }
+
+ if (gen) {
+ wsdlName = getWSDLFileName(r, localcm.getModelName().getName(), "");
+
+ imp = doc.createElement(WSDL_IMPORT);
+
+ imp.setAttribute("namespace", contract.getNamespace());
+ imp.setAttribute("location", wsdlName);
+
+ defn.appendChild(imp);
+ }
+ }
+
// Create partner link types
java.util.Map<String, String> nsMap=new java.util.HashMap<String, String>();
Modified: branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java
===================================================================
--- branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java 2010-06-30 09:36:45 UTC (rev 289)
+++ branches/1.0.x/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java 2010-07-01 19:39:54 UTC (rev 290)
@@ -121,16 +121,22 @@
Catch c=new Catch(bpelModel);
c.setFaultVariable(faultVarName);
+ Contract contract = ModelChangeUtils.getContract(context,
+ ((Interaction)act).getFromRole().getName());
+
// Define fault message type
+ QName qname= WSDLGeneratorUtil.getFaultMessageType(contract.getNamespace(),
+ faultName);
+
String mesgType=InteractionPatterns.getMessageTypeLocalPart((Interaction)act);
- String namespace=InteractionPatterns.getMessageTypeNameSpace((Interaction)act);
+ //String namespace=InteractionPatterns.getMessageTypeNameSpace((Interaction)act);
// Find namespace prefix
- if (namespace != null) {
- String prefix=bpelModel.getBPELProcess().addNamespace(namespace);
+ if (qname != null) {
+ String prefix=bpelModel.getBPELProcess().addNamespace(qname.getNamespaceURI());
if (prefix != null) {
- mesgType = prefix+":"+mesgType;
+ mesgType = prefix+":"+qname.getLocalPart();
faultName = prefix+":"+faultName;
}
}
Modified: branches/1.0.x/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGenerator.java
===================================================================
--- branches/1.0.x/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGenerator.java 2010-06-30 09:36:45 UTC (rev 289)
+++ branches/1.0.x/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGenerator.java 2010-07-01 19:39:54 UTC (rev 290)
@@ -384,8 +384,8 @@
ret.setName(mep.getOperation());
- QName msgname=new QName(binding.getQName().getNamespaceURI(),
- mep.getOperation()+"Request");
+ QName msgname=WSDLGeneratorUtil.getRequestMessageType(binding.getQName().getNamespaceURI(),
+ mep.getOperation());
javax.wsdl.Message mesg=getMessage(wsdls, contract,msgname,
mep.getTypes(), wsdlBinding);
@@ -405,8 +405,8 @@
if (mep instanceof RequestResponseMEP) {
RequestResponseMEP rr=(RequestResponseMEP)mep;
- msgname=new QName(binding.getQName().getNamespaceURI(),
- mep.getOperation()+"Response");
+ msgname=WSDLGeneratorUtil.getResponseMessageType(binding.getQName().getNamespaceURI(),
+ mep.getOperation());
javax.wsdl.Message om=getMessage(wsdls, contract, msgname,
rr.getResponseTypes(), wsdlBinding);
@@ -426,8 +426,8 @@
for (int i=0; i < rr.getFaultDetails().size(); i++) {
FaultDetails fd=rr.getFaultDetails().get(i);
- msgname = new QName(binding.getQName().getNamespaceURI(),
- mep.getOperation()+"Fault"+(i+1));
+ msgname = WSDLGeneratorUtil.getFaultMessageType(binding.getQName().getNamespaceURI(),
+ fd.getName());
javax.wsdl.Message fm=getMessage(wsdls, contract, msgname,
fd.getTypes(), wsdlBinding);
Modified: trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java
===================================================================
--- trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java 2010-06-30 09:36:45 UTC (rev 289)
+++ trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/generator/Generator.java 2010-07-01 19:39:54 UTC (rev 290)
@@ -459,6 +459,33 @@
defn.appendChild(imp);
+ // Add imports for associated roles
+ java.util.ListIterator<Role> roles=localcm.getConversation().getRoles().listIterator();
+
+ while (roles.hasNext()) {
+ Role r=roles.next();
+ Contract contract=(Contract)r.getAnnotations().get(Contract.class.getName());
+
+ boolean gen=false;
+
+ for (int i=0; gen == false && i < contract.getInterfaces().size(); i++) {
+ if (contract.getInterfaces().get(i).getMessageExchangePatterns().size() > 0) {
+ gen = true;
+ }
+ }
+
+ if (gen) {
+ wsdlName = getWSDLFileName(r, localcm.getModelName().getName(), "");
+
+ imp = doc.createElement(WSDL_IMPORT);
+
+ imp.setAttribute("namespace", contract.getNamespace());
+ imp.setAttribute("location", wsdlName);
+
+ defn.appendChild(imp);
+ }
+ }
+
// Create partner link types
java.util.Map<String, String> nsMap=new java.util.HashMap<String, String>();
Modified: trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java
===================================================================
--- trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java 2010-06-30 09:36:45 UTC (rev 289)
+++ trunk/tools/eclipse/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/IfModelChangeRule.java 2010-07-01 19:39:54 UTC (rev 290)
@@ -121,16 +121,22 @@
Catch c=new Catch(bpelModel);
c.setFaultVariable(faultVarName);
+ Contract contract = ModelChangeUtils.getContract(context,
+ ((Interaction)act).getFromRole().getName());
+
// Define fault message type
+ QName qname= WSDLGeneratorUtil.getFaultMessageType(contract.getNamespace(),
+ faultName);
+
String mesgType=InteractionPatterns.getMessageTypeLocalPart((Interaction)act);
- String namespace=InteractionPatterns.getMessageTypeNameSpace((Interaction)act);
+ //String namespace=InteractionPatterns.getMessageTypeNameSpace((Interaction)act);
// Find namespace prefix
- if (namespace != null) {
- String prefix=bpelModel.getBPELProcess().addNamespace(namespace);
+ if (qname != null) {
+ String prefix=bpelModel.getBPELProcess().addNamespace(qname.getNamespaceURI());
if (prefix != null) {
- mesgType = prefix+":"+mesgType;
+ mesgType = prefix+":"+qname.getLocalPart();
faultName = prefix+":"+faultName;
}
}
Modified: trunk/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGenerator.java
===================================================================
--- trunk/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGenerator.java 2010-06-30 09:36:45 UTC (rev 289)
+++ trunk/tools/eclipse/org.jboss.savara.tools.wsdl/src/java/org/jboss/savara/tools/wsdl/generator/WSDLGenerator.java 2010-07-01 19:39:54 UTC (rev 290)
@@ -384,8 +384,8 @@
ret.setName(mep.getOperation());
- QName msgname=new QName(binding.getQName().getNamespaceURI(),
- mep.getOperation()+"Request");
+ QName msgname=WSDLGeneratorUtil.getRequestMessageType(binding.getQName().getNamespaceURI(),
+ mep.getOperation());
javax.wsdl.Message mesg=getMessage(wsdls, contract,msgname,
mep.getTypes(), wsdlBinding);
@@ -405,8 +405,8 @@
if (mep instanceof RequestResponseMEP) {
RequestResponseMEP rr=(RequestResponseMEP)mep;
- msgname=new QName(binding.getQName().getNamespaceURI(),
- mep.getOperation()+"Response");
+ msgname=WSDLGeneratorUtil.getResponseMessageType(binding.getQName().getNamespaceURI(),
+ mep.getOperation());
javax.wsdl.Message om=getMessage(wsdls, contract, msgname,
rr.getResponseTypes(), wsdlBinding);
@@ -426,8 +426,8 @@
for (int i=0; i < rr.getFaultDetails().size(); i++) {
FaultDetails fd=rr.getFaultDetails().get(i);
- msgname = new QName(binding.getQName().getNamespaceURI(),
- mep.getOperation()+"Fault"+(i+1));
+ msgname = WSDLGeneratorUtil.getFaultMessageType(binding.getQName().getNamespaceURI(),
+ fd.getName());
javax.wsdl.Message fm=getMessage(wsdls, contract, msgname,
fd.getTypes(), wsdlBinding);
Modified: trunk/tools/eclipse/releng/build.properties
===================================================================
--- trunk/tools/eclipse/releng/build.properties 2010-06-30 09:36:45 UTC (rev 289)
+++ trunk/tools/eclipse/releng/build.properties 2010-07-01 19:39:54 UTC (rev 290)
@@ -25,13 +25,14 @@
repositoryURLs=\
http://download.eclipse.org/releases/galileo/,\
http://download.eclipse.org/tools/orbit/downloads/drops/R20090825191606/u...
-http://download.jboss.org/jbosstools/builds/nightly/trunk/201006210931/all/JBossTools-Update-3.2.0.v201006210931N-H358-M1.zip
+http://download.jboss.org/jbosstools/builds/nightly/trunk/201006290654/all/JBossTools-Update-3.2.0.v201006290654N-H394-M1.zip
IUsToInstall=org.eclipse.sdk.feature.group+org.eclipse.sdk.ide+\
org.eclipse.emf.feature.group+org.eclipse.xsd.feature.group+org.eclipse.gef.feature.group+\
org.apache.xml.resolver+javax.xml+org.apache.xml.serializer+org.apache.xerces+org.apache.xalan+\
org.pi4soa.common+org.pi4soa.cdl+org.pi4soa.service+org.pi4soa.designer+javax.wsdl+org.eclipse.stp.bpmn+\
-org.eclipse.gmf.runtime.notation
+org.eclipse.gmf.runtime.notation+org.eclipse.wst.common.project.facet.core+org.eclipse.jst.common.frameworks+\
+org.eclipse.wst.common.frameworks
flattenDependencies=true
parallelCompilation=true
13 years, 10 months
- 1
- 0