[overlord-commits] Overlord SVN: r583 - in cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src: java/org/jboss/tools/overlord/cdl/bpel/generator and 4 other directories.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Sun Apr 12 07:50:53 EDT 2009
Author: objectiser
Date: 2009-04-12 07:50:52 -0400 (Sun, 12 Apr 2009)
New Revision: 583
Modified:
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/export/BPELLanguageModelStreamExportRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELLanguageModel.java
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/ConversationModelChangeRule.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/BPELElement.java
cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java
Log:
Make use of top level BPELProcess in model, rather than separate DOM element and sequence model object.
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/export/BPELLanguageModelStreamExportRule.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/export/BPELLanguageModelStreamExportRule.java 2009-04-11 22:16:03 UTC (rev 582)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/export/BPELLanguageModelStreamExportRule.java 2009-04-12 11:50:52 UTC (rev 583)
@@ -62,7 +62,7 @@
BPELLanguageModel model=(BPELLanguageModel)modelObject;
try {
- String text=XMLUtils.toText(model.getBPELProcessElement());
+ String text=XMLUtils.toText(model.getBPELProcess().getDOMElement());
context.getFormatter().record(text.getBytes());
} catch(Exception e) {
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java 2009-04-11 22:16:03 UTC (rev 582)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/generator/Generator.java 2009-04-12 11:50:52 UTC (rev 583)
@@ -147,7 +147,7 @@
lcm);
generateRoleProject(projectName,
- target.getBPELProcessElement(),
+ target.getBPELProcess().getDOMElement(),
lcm, target);
} else {
logger.error("Unable to find model generator");
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELLanguageModel.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELLanguageModel.java 2009-04-11 22:16:03 UTC (rev 582)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELLanguageModel.java 2009-04-12 11:50:52 UTC (rev 583)
@@ -17,7 +17,7 @@
*/
package org.jboss.tools.overlord.cdl.bpel.model;
-import org.jboss.tools.overlord.cdl.bpel.model.component.Sequence;
+import org.jboss.tools.overlord.cdl.bpel.model.component.BPELProcess;
import org.scribble.model.*;
import org.scribble.model.admin.ModelListener;
@@ -51,19 +51,10 @@
public String getOriginalContents();
/**
- * This method returns the top level grouping
- * activity.
+ * This method returns the BPEL Process.
*
- * @return The top level grouping activity
+ * @return The BPEL Process
*/
- public Sequence getActivity();
-
- /**
- * This method returns the reference to the DOM
- * representation of the BPEL process.
- *
- * @return The BPEL process
- */
- public org.w3c.dom.Element getBPELProcessElement();
+ public BPELProcess getBPELProcess();
}
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-04-11 22:16:03 UTC (rev 582)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/DefaultBPELLanguageModel.java 2009-04-12 11:50:52 UTC (rev 583)
@@ -18,8 +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.jboss.tools.overlord.cdl.bpel.model.component.BPELProcess;
import org.scribble.model.*;
import org.scribble.model.admin.ModelIssue;
import org.scribble.model.admin.ModelListener;
@@ -35,7 +34,6 @@
private static final long serialVersionUID = 7625564863751533521L;
- private static final String PROCESS_ELEMENT = "process";
public static final String BPEL_NOTATION = "bpel";
/**
@@ -48,11 +46,8 @@
public DefaultBPELLanguageModel(ModelReference source, org.w3c.dom.Element elem,
String contents) {
m_source = source;
- m_bpelProcess = elem;
+ m_bpelProcess = new BPELProcess(this, elem);
m_contents = contents;
-
- // Extract service action pipelines
- initializeExistingConfig();
}
/**
@@ -63,39 +58,10 @@
public DefaultBPELLanguageModel(ModelReference source) {
m_source = source;
- initializeNewConfig();
+ m_bpelProcess = new BPELProcess(this);
}
/**
- * This method creates a new BPEL process.
- */
- protected void initializeNewConfig() {
-
- org.w3c.dom.Document doc=null;
-
- // Create an empty document
- try {
- doc = javax.xml.parsers.DocumentBuilderFactory.
- newInstance().newDocumentBuilder().newDocument();
-
- m_bpelProcess = doc.createElementNS(BPELElement.BPEL_NS,
- PROCESS_ELEMENT);
-
- } catch(Exception e) {
- logger.error("Failed to create initial BPEL document: "+e, e);
- }
-
- }
-
- /**
- * This method initializes the ESB Model.
- */
- protected void initializeExistingConfig() {
-
- // Needs to establish dependency to conversation
- }
-
- /**
* This method returns the source model reference.
*
* @return The source model reference
@@ -136,42 +102,19 @@
}
/**
- * This method returns the top level grouping
- * activity.
+ * This method returns the BPEL Process.
*
- * @return The top level grouping activity
- */
- public Sequence getActivity() {
- return(m_activity);
- }
-
- /**
- * This method sets the top level activity.
- *
- * @param act The top level activity
- */
- public void setActivity(Sequence act) {
- m_activity = act;
-
- m_bpelProcess.appendChild(act.getDOMElement());
- }
-
- /**
- * This method returns the reference to the DOM
- * representation of the BPEL process.
- *
* @return The BPEL Process
*/
- public org.w3c.dom.Element getBPELProcessElement() {
+ public BPELProcess getBPELProcess() {
return(m_bpelProcess);
}
private static Logger logger = Logger.getLogger(DefaultBPELLanguageModel.class);
private ModelReference m_source=null;
- private org.w3c.dom.Element m_bpelProcess=null;
+ private BPELProcess m_bpelProcess=null;
private String m_contents=null;
- private Sequence m_activity=null;
public class InnerModelListener implements ModelListener {
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/ConversationModelChangeRule.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/ConversationModelChangeRule.java 2009-04-11 22:16:03 UTC (rev 582)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/ConversationModelChangeRule.java 2009-04-12 11:50:52 UTC (rev 583)
@@ -95,7 +95,7 @@
if (conv.getParent() instanceof Model) {
// Add sequence to model
- bpelModel.setActivity(seq);
+ bpelModel.getBPELProcess().setActivity(seq);
} else if (context.getParent() instanceof Sequence) {
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/BPELElement.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/BPELElement.java 2009-04-11 22:16:03 UTC (rev 582)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/component/BPELElement.java 2009-04-12 11:50:52 UTC (rev 583)
@@ -55,9 +55,26 @@
protected BPELElement(BPELLanguageModel model,
String elemName) {
m_model = model;
+
+ org.w3c.dom.Document doc=null;
- m_element = model.getBPELProcessElement().
- getOwnerDocument().createElementNS(BPEL_NS, elemName);
+ if (model.getBPELProcess() == null) {
+ try {
+ javax.xml.parsers.DocumentBuilderFactory factory=
+ javax.xml.parsers.DocumentBuilderFactory.
+ newInstance();
+ factory.setNamespaceAware(true);
+
+ doc = factory.newDocumentBuilder().newDocument();
+ } catch(Exception e) {
+ logger.error("Failed to create document", e);
+ }
+ } else {
+ doc = model.getBPELProcess().getDOMElement().
+ getOwnerDocument();
+ }
+
+ m_element = doc.createElementNS(BPEL_NS, elemName);
getSource().setObject(this);
}
Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java
===================================================================
--- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java 2009-04-11 22:16:03 UTC (rev 582)
+++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java 2009-04-12 11:50:52 UTC (rev 583)
@@ -97,9 +97,9 @@
model.getModelName().getLocatedRole(),
target, model);
- if (target.getBPELProcessElement() != null) {
+ if (target.getBPELProcess().getDOMElement() != null) {
try {
- String text=XMLUtils.toText(target.getBPELProcessElement());
+ String text=XMLUtils.toText(target.getBPELProcess().getDOMElement());
checkResults(result, text);
} catch(Exception e) {
result.addError(this, e);
More information about the overlord-commits
mailing list