[savara-commits] savara SVN: r67 - in tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src: java/org/jboss/savara/tools/bpel/model/change and 2 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Fri Oct 30 19:48:26 EDT 2009
Author: objectiser
Date: 2009-10-30 19:48:26 -0400 (Fri, 30 Oct 2009)
New Revision: 67
Modified:
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/DefaultBPELLanguageModel.java
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationModelChangeRule.java
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Process.java
tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ProcessTest.java
Log:
Minor changes and added bpel prefix namespace by default, as Eclipse BPEL editor expects this to be present.
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/DefaultBPELLanguageModel.java
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/DefaultBPELLanguageModel.java 2009-10-27 23:34:03 UTC (rev 66)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/DefaultBPELLanguageModel.java 2009-10-30 23:48:26 UTC (rev 67)
@@ -17,7 +17,7 @@
*/
package org.jboss.savara.tools.bpel.model;
-import org.apache.commons.logging.*;
+//import org.apache.commons.logging.*;
import org.jboss.savara.tools.bpel.model.component.Process;
import org.scribble.conversation.model.Conversation;
import org.scribble.model.*;
@@ -124,7 +124,7 @@
return(m_bpelProcess);
}
- private static Log logger = LogFactory.getLog(DefaultBPELLanguageModel.class);
+ //private static Log logger = LogFactory.getLog(DefaultBPELLanguageModel.class);
private ModelReference m_source=null;
private Process m_bpelProcess=null;
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationModelChangeRule.java
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationModelChangeRule.java 2009-10-27 23:34:03 UTC (rev 66)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/change/ConversationModelChangeRule.java 2009-10-30 23:48:26 UTC (rev 67)
@@ -33,7 +33,7 @@
@RegistryInfo(extension=ModelChangeRule.class,notation=BPELNotation.NOTATION_CODE)
public class ConversationModelChangeRule extends AbstractModelChangeRule {
- private static final String NAME_SUFFIX = "_main";
+ //private static final String NAME_SUFFIX = "_main";
/**
* This method determines whether the rule is appropriate
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Process.java
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Process.java 2009-10-27 23:34:03 UTC (rev 66)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/java/org/jboss/savara/tools/bpel/model/component/Process.java 2009-10-30 23:48:26 UTC (rev 67)
@@ -41,6 +41,7 @@
public static final String NAME = "name";
public static final String TARGET_NAMESPACE = "targetNamespace";
public static final String CONVERSATION_TYPE = "conversationType";
+ public static final String BPEL_PREFIX = "bpel";
public static final String CONVERSATION_NS="http://www.scribble.org/conversation";
@@ -78,8 +79,8 @@
}
}
- m_messageExchangesElem = findChildElement("messageExchanges");
- m_correlationSetsElem = findChildElement("correlationSets");
+ //m_messageExchangesElem = findChildElement("messageExchanges");
+ //m_correlationSetsElem = findChildElement("correlationSets");
org.w3c.dom.Element ehs=findChildElement(EventHandlers.EVENTHANDLERS);
if (ehs != null) {
@@ -101,6 +102,8 @@
*/
public Process(BPELLanguageModel model) {
super(model, PROCESS);
+
+ initNamespace(BPEL_NS, BPEL_PREFIX);
}
/**
@@ -839,9 +842,9 @@
private static Log logger = LogFactory.getLog(Process.class);
private org.w3c.dom.Element m_partnerLinksElem=null;
- private org.w3c.dom.Element m_messageExchangesElem=null;
+ //private org.w3c.dom.Element m_messageExchangesElem=null;
private org.w3c.dom.Element m_variablesElem=null;
- private org.w3c.dom.Element m_correlationSetsElem=null;
+ //private org.w3c.dom.Element m_correlationSetsElem=null;
private java.util.List<Import> m_imports=new java.util.Vector<Import>();
private java.util.List<PartnerLink> m_partnerLinks=new java.util.Vector<PartnerLink>();
private java.util.List<Variable> m_variables=new java.util.Vector<Variable>();
Modified: tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ProcessTest.java
===================================================================
--- tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ProcessTest.java 2009-10-27 23:34:03 UTC (rev 66)
+++ tools/eclipse/trunk/plugins/org.jboss.savara.tools.bpel/src/test/org/jboss/savara/tools/bpel/model/component/ProcessTest.java 2009-10-30 23:48:26 UTC (rev 67)
@@ -41,7 +41,7 @@
public void testProcessFromDOM() {
BPELLanguageModel model=new DefaultBPELLanguageModel(null);
- String xml="<scope xmlns=\"http://docs.oasis-open.org/wsbpel/2.0/process/executable\">"+
+ String xml="<process xmlns=\"http://docs.oasis-open.org/wsbpel/2.0/process/executable\">"+
"<partnerLinks><partnerLink/></partnerLinks>"+
"<messageExchanges/>"+
"<variables><variable/></variables>"+
@@ -49,7 +49,7 @@
"<faultHandlers/>"+
"<eventHandlers/>"+
"<sequence/>"+
- "</scope>";
+ "</process>";
org.w3c.dom.Element elem=null;
@@ -98,14 +98,14 @@
public void testAddVariable() {
BPELLanguageModel model=new DefaultBPELLanguageModel(null);
- String xml="<scope xmlns=\"http://docs.oasis-open.org/wsbpel/2.0/process/executable\">"+
+ String xml="<process xmlns=\"http://docs.oasis-open.org/wsbpel/2.0/process/executable\">"+
"<partnerLinks><partnerLink/></partnerLinks>"+
"<messageExchanges/>"+
"<correlationSets/>"+
"<faultHandlers/>"+
"<eventHandlers/>"+
"<sequence/>"+
- "</scope>";
+ "</process>";
org.w3c.dom.Element ifelem=null;
@@ -151,14 +151,14 @@
public void testAddPartnerLink() {
BPELLanguageModel model=new DefaultBPELLanguageModel(null);
- String xml="<scope xmlns=\"http://docs.oasis-open.org/wsbpel/2.0/process/executable\">"+
+ String xml="<process xmlns=\"http://docs.oasis-open.org/wsbpel/2.0/process/executable\">"+
"<messageExchanges/>"+
"<variables><variable/></variables>"+
"<correlationSets/>"+
"<faultHandlers/>"+
"<eventHandlers/>"+
"<sequence/>"+
- "</scope>";
+ "</process>";
org.w3c.dom.Element elem=null;
@@ -224,14 +224,14 @@
public void testSetEventHandlers() {
BPELLanguageModel model=new DefaultBPELLanguageModel(null);
- String xml="<scope xmlns=\"http://docs.oasis-open.org/wsbpel/2.0/process/executable\">"+
+ String xml="<process xmlns=\"http://docs.oasis-open.org/wsbpel/2.0/process/executable\">"+
"<partnerLinks><partnerLink/></partnerLinks>"+
"<messageExchanges/>"+
"<variables><variable/></variables>"+
"<correlationSets/>"+
"<faultHandlers/>"+
"<sequence/>"+
- "</scope>";
+ "</process>";
org.w3c.dom.Element ifelem=null;
@@ -277,14 +277,14 @@
public void testSetFaultHandlers() {
BPELLanguageModel model=new DefaultBPELLanguageModel(null);
- String xml="<scope xmlns=\"http://docs.oasis-open.org/wsbpel/2.0/process/executable\">"+
+ String xml="<process xmlns=\"http://docs.oasis-open.org/wsbpel/2.0/process/executable\">"+
"<partnerLinks><partnerLink/></partnerLinks>"+
"<messageExchanges/>"+
"<variables><variable/></variables>"+
"<correlationSets/>"+
"<eventHandlers/>"+
"<sequence/>"+
- "</scope>";
+ "</process>";
org.w3c.dom.Element ifelem=null;
@@ -330,14 +330,14 @@
public void testSetActivity() {
BPELLanguageModel model=new DefaultBPELLanguageModel(null);
- String xml="<scope xmlns=\"http://docs.oasis-open.org/wsbpel/2.0/process/executable\">"+
+ String xml="<process xmlns=\"http://docs.oasis-open.org/wsbpel/2.0/process/executable\">"+
"<partnerLinks><partnerLink/></partnerLinks>"+
"<messageExchanges/>"+
"<variables><variable/></variables>"+
"<correlationSets/>"+
"<faultHandlers/>"+
"<eventHandlers/>"+
- "</scope>";
+ "</process>";
org.w3c.dom.Element ifelem=null;
@@ -421,4 +421,20 @@
fail("Prefixes should be same: "+prefix1+" "+prefix2);
}
}
+
+ public void testDefaultNamesapces() {
+ BPELLanguageModel model=new DefaultBPELLanguageModel(null);
+
+ Process component=new Process(model);
+
+ String ns=component.getNamespace(Process.BPEL_PREFIX);
+
+ if (ns == null) {
+ fail("Namespace not found");
+ }
+
+ if (ns.equals(Process.BPEL_NS) == false) {
+ fail("Namespace is wrong: "+ns+" was expecting "+Process.BPEL_NS);
+ }
+ }
}
More information about the savara-commits
mailing list