[overlord-commits] Overlord SVN: r562 - in cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src: java/org/jboss/tools/overlord/cdl/bpel/model/change and 2 other directories.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Mon Mar 30 18:30:30 EDT 2009
Author: objectiser
Date: 2009-03-30 18:30:29 -0400 (Mon, 30 Mar 2009)
New Revision: 562
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/DefaultBPELLanguageModel.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/IfModelChangeRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Invoke.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Receive.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Reply.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBrokerProcess at Broker.bpel
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/PurchaseGoodsProcess at Broker.bpel
Log:
Fixed plugin test failures.
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/DefaultBPELLanguageModel.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/DefaultBPELLanguageModel.java 2009-03-30 20:19:51 UTC (rev 561)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/DefaultBPELLanguageModel.java 2009-03-30 22:30:29 UTC (rev 562)
@@ -18,6 +18,7 @@
package org.jboss.tools.overlord.cdl.bpel.model;
import org.apache.log4j.Logger;
+import org.jboss.tools.overlord.cdl.bpel.model.component.BPELElement;
import org.jboss.tools.overlord.cdl.bpel.model.component.Sequence;
import org.scribble.model.*;
import org.scribble.model.admin.ModelIssue;
@@ -34,6 +35,7 @@
private static final long serialVersionUID = 7625564863751533521L;
+ private static final String PROCESS_ELEMENT = "process";
public static final String BPEL_NOTATION = "bpel";
/**
@@ -76,7 +78,8 @@
doc = javax.xml.parsers.DocumentBuilderFactory.
newInstance().newDocumentBuilder().newDocument();
- m_bpelProcess = doc.createElement("process");
+ m_bpelProcess = doc.createElementNS(BPELElement.BPEL_NS,
+ PROCESS_ELEMENT);
} catch(Exception e) {
logger.error("Failed to create initial BPEL document: "+e, e);
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/IfModelChangeRule.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/IfModelChangeRule.java 2009-03-30 20:19:51 UTC (rev 561)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/IfModelChangeRule.java 2009-03-30 22:30:29 UTC (rev 562)
@@ -98,6 +98,19 @@
Sequence seq=new Sequence(bpelModel);
+ // Process the activities within the conversation
+ java.util.List<Activity> acts=path.getContents();
+
+ Object parent=context.getParent();
+
+ context.setParent(seq);
+
+ for (int j=0; j < acts.size(); j++) {
+ context.insert(model, acts.get(j), null);
+ }
+
+ context.setParent(parent);
+
if (i == 0) {
act.setActivity(seq);
} else if (i == elem.getPaths().size()-1) {
@@ -112,19 +125,6 @@
act.addElseIfPath(construct);
}
-
- // Process the activities within the conversation
- java.util.List<Activity> acts=path.getContents();
-
- Object parent=context.getParent();
-
- context.setParent(seq);
-
- for (int j=0; j < acts.size(); j++) {
- context.insert(model, acts.get(j), null);
- }
-
- context.setParent(parent);
}
return(true);
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Invoke.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Invoke.java 2009-03-30 20:19:51 UTC (rev 561)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Invoke.java 2009-03-30 22:30:29 UTC (rev 562)
@@ -53,8 +53,6 @@
public Invoke(BPELLanguageModel model,
ConversationInteraction interaction) {
super(model, INVOKE, interaction);
-
- initialize(interaction);
}
/**
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Receive.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Receive.java 2009-03-30 20:19:51 UTC (rev 561)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Receive.java 2009-03-30 22:30:29 UTC (rev 562)
@@ -52,8 +52,6 @@
public Receive(BPELLanguageModel model,
ConversationInteraction interaction) {
super(model, RECEIVE, interaction);
-
- initialize(interaction);
}
/**
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Reply.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Reply.java 2009-03-30 20:19:51 UTC (rev 561)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/Reply.java 2009-03-30 22:30:29 UTC (rev 562)
@@ -52,8 +52,6 @@
public Reply(BPELLanguageModel model,
ConversationInteraction interaction) {
super(model, REPLY, interaction);
-
- initialize(interaction);
}
/**
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBrokerProcess at Broker.bpel
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBrokerProcess at Broker.bpel 2009-03-30 20:19:51 UTC (rev 561)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/ESBBrokerProcess at Broker.bpel 2009-03-30 22:30:29 UTC (rev 562)
@@ -1,4 +1,4 @@
-<process>
+<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
<sequence>
<receive operation="makeEnquiry"/>
<while>
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/PurchaseGoodsProcess at Broker.bpel
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/PurchaseGoodsProcess at Broker.bpel 2009-03-30 20:19:51 UTC (rev 561)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/PurchaseGoodsProcess at Broker.bpel 2009-03-30 22:30:29 UTC (rev 562)
@@ -1,4 +1,4 @@
-<process>
+<process xmlns="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
<sequence>
<invoke operation="buy"/>
<invoke operation="checkCredit"/>
More information about the overlord-commits
mailing list