[overlord-commits] Overlord SVN: r556 - in cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel: src and 5 other directories.

Author: objectiser Date: 2009-03-27 17:04:21 -0400 (Fri, 27 Mar 2009) New Revision: 556 Added: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELElement.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELElementFactory.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/AbstractBPELElement.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/Condition.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/ElseConstruct.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/ElseIfConstruct.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/ Removed: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELActivity.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELActivityFactory.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/AbstractBPELActivity.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/test/ Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/.classpath cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELSequenceActivity.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/activities/AbstractGroupingActivity.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/AbstractInteractionActivity.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/IfActivity.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/SequenceActivity.java cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/UnsupportedActivity.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/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/results/PurchaseGoodsProcess(a)Broker.bpel Log: Moving plugin tests into specific folder, to separate from normal junit tests. Adding more detail to BPEL model. Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/.classpath =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/.classpath 2009-03-27 14:46:16 UTC (rev 555) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/.classpath 2009-03-27 21:04:21 UTC (rev 556) @@ -3,6 +3,6 @@ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/> <classpathentry kind="src" path="src/java"/> - <classpathentry kind="src" path="src/test"/> + <classpathentry kind="src" path="src/plugintest"/> <classpathentry kind="output" path="bin"/> </classpath> Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELActivity.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELActivity.java 2009-03-27 14:46:16 UTC (rev 555) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELActivity.java 2009-03-27 21:04:21 UTC (rev 556) @@ -1,30 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.jboss.tools.overlord.cdl.bpel.model; - -public interface BPELActivity { - - /** - * This method returns the XML configuration representation - * of the activity. - * - * @return The XML configuration for the activity - */ - public org.w3c.dom.Element getActivity(); - -} Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELActivityFactory.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELActivityFactory.java 2009-03-27 14:46:16 UTC (rev 555) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELActivityFactory.java 2009-03-27 21:04:21 UTC (rev 556) @@ -1,69 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.jboss.tools.overlord.cdl.bpel.model; - -import java.util.logging.Logger; - -import org.jboss.tools.overlord.cdl.bpel.model.activities.UnsupportedActivity; - -public class BPELActivityFactory { - - public static final String MODEL_ACTIVITIES_PACKAGE = - "org.jboss.tools.overlord.cdl.bpel.model.activities"; - - /** - * This method creates a BPELActivity instance relevant to the - * supplied JBossESB action, associated with the supplied - * service. - * - * @param model The BPEL model - * @param activity The XML configuration of the BPEL activity - * @return The BPEL activity instance - */ - public static BPELActivity createActivity(BPELLanguageModel model, - org.w3c.dom.Element activity) { - BPELActivity ret=null; - String activityType=activity.getNodeName(); - - String clsName=MODEL_ACTIVITIES_PACKAGE+"."+activityType; - - try { - Class<?> cls=(Class<?>) - Class.forName(clsName); - - java.lang.reflect.Constructor<?> con= - cls.getConstructor(new Class<?>[]{BPELLanguageModel.class, - org.w3c.dom.Element.class}); - - ret = (BPELActivity)con.newInstance(new Object[]{model, activity}); - - } catch(Exception e) { - logger.log(java.util.logging.Level.SEVERE, - "Unable to find action class '"+clsName+"'", e); - } - - if (ret == null) { - // Unrecognised or unsupported activity - ret = new UnsupportedActivity(model, activity); - } - - return(ret); - } - - private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.bpel.model"); -} Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELElement.java (from rev 555, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELActivity.java) =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELElement.java (rev 0) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELElement.java 2009-03-27 21:04:21 UTC (rev 556) @@ -0,0 +1,30 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.jboss.tools.overlord.cdl.bpel.model; + +public interface BPELElement { + + /** + * This method returns the XML configuration representation + * of the activity. + * + * @return The XML configuration for the activity + */ + public org.w3c.dom.Element getDOMElement(); + +} Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELElementFactory.java (from rev 555, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELActivityFactory.java) =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELElementFactory.java (rev 0) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELElementFactory.java 2009-03-27 21:04:21 UTC (rev 556) @@ -0,0 +1,69 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.jboss.tools.overlord.cdl.bpel.model; + +import java.util.logging.Logger; + +import org.jboss.tools.overlord.cdl.bpel.model.activities.UnsupportedActivity; + +public class BPELElementFactory { + + public static final String MODEL_ACTIVITIES_PACKAGE = + "org.jboss.tools.overlord.cdl.bpel.model.activities"; + + /** + * This method creates a BPELActivity instance relevant to the + * supplied JBossESB action, associated with the supplied + * service. + * + * @param model The BPEL model + * @param activity The XML configuration of the BPEL activity + * @return The BPEL activity instance + */ + public static BPELElement createActivity(BPELLanguageModel model, + org.w3c.dom.Element activity) { + BPELElement ret=null; + String activityType=activity.getNodeName(); + + String clsName=MODEL_ACTIVITIES_PACKAGE+"."+activityType; + + try { + Class<?> cls=(Class<?>) + Class.forName(clsName); + + java.lang.reflect.Constructor<?> con= + cls.getConstructor(new Class<?>[]{BPELLanguageModel.class, + org.w3c.dom.Element.class}); + + ret = (BPELElement)con.newInstance(new Object[]{model, activity}); + + } catch(Exception e) { + logger.log(java.util.logging.Level.SEVERE, + "Unable to find action class '"+clsName+"'", e); + } + + if (ret == null) { + // Unrecognised or unsupported activity + ret = new UnsupportedActivity(model, activity); + } + + return(ret); + } + + private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.bpel.model"); +} Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELSequenceActivity.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELSequenceActivity.java 2009-03-27 14:46:16 UTC (rev 555) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/BPELSequenceActivity.java 2009-03-27 21:04:21 UTC (rev 556) @@ -17,7 +17,7 @@ */ package org.jboss.tools.overlord.cdl.bpel.model; -public interface BPELSequenceActivity extends BPELActivity { +public interface BPELSequenceActivity extends BPELElement { /** * This method adds an activity to the grouping construct. @@ -25,7 +25,7 @@ * @param act The activity to be added * @param pos The position to add, or -1 if at the end */ - public void addActivity(BPELActivity act, int pos); + public void addActivity(BPELElement act, int pos); /** * This method removes an activity from the grouping @@ -34,7 +34,7 @@ * @param act The activity to be removed * @return Whether the activity was removed */ - public boolean removeActivity(BPELActivity act); + public boolean removeActivity(BPELElement act); /** * This method returns the list of activities associated @@ -42,6 +42,6 @@ * * @return The list of activities */ - public java.util.List<BPELActivity> getActivities(); + public java.util.List<BPELElement> getActivities(); } 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-27 14:46:16 UTC (rev 555) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/DefaultBPELLanguageModel.java 2009-03-27 21:04:21 UTC (rev 556) @@ -152,7 +152,7 @@ public void setActivity(BPELSequenceActivity act) { m_activity = act; - m_bpelProcess.appendChild(act.getActivity()); + m_bpelProcess.appendChild(act.getDOMElement()); } /** Deleted: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/AbstractBPELActivity.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/AbstractBPELActivity.java 2009-03-27 14:46:16 UTC (rev 555) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/AbstractBPELActivity.java 2009-03-27 21:04:21 UTC (rev 556) @@ -1,121 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated - * by the @authors tag. All rights reserved. - * See the copyright.txt in the distribution for a - * full listing of individual contributors. - * This copyrighted material is made available to anyone wishing to use, - * modify, copy, or redistribute it subject to the terms and conditions - * of the GNU Lesser General Public License, v. 2.1. - * This program is distributed in the hope that it will be useful, but WITHOUT A - * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A - * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. - * You should have received a copy of the GNU Lesser General Public License, - * v.2.1 along with this distribution; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, - * MA 02110-1301, USA. - */ -package org.jboss.tools.overlord.cdl.bpel.model.activities; - -import java.util.logging.Logger; - -import org.scribble.model.*; -import org.scribble.model.admin.ModelIssue; -import org.scribble.model.admin.ModelListener; -import org.jboss.tools.overlord.cdl.bpel.model.*; - -/** - * This is the generic BPEL activity class. - * - * @author gary - */ -public abstract class AbstractBPELActivity extends ModelObject - implements BPELActivity { - - /** - * The constructor for initializing the activity based on - * an existing DOM element. - */ - protected AbstractBPELActivity(BPELLanguageModel model, - org.w3c.dom.Element activity) { - m_model = model; - - initExistingActivity(model, activity); - } - - /** - * The contructor for initializing a new activity. - */ - protected AbstractBPELActivity(BPELLanguageModel model, - String activityName) { - m_model = model; - - initNewAction(model, activityName); - } - - /** - * This method initializes the activity. - * - * @param model The BPEL model - * @param activity The activity name - */ - protected void initNewAction(BPELLanguageModel model, - String activity) { - m_activity = model.getBPELProcess(). - getOwnerDocument().createElement(activity); - - getSource().setObject(this); - } - - /** - * This method initializes the activity. - * - * @param model The BPEL model - * @param activity The XML configuration details for the activity - */ - protected void initExistingActivity(BPELLanguageModel model, - org.w3c.dom.Element activity) { - m_activity = activity; - - // TODO: Set the start/end position information - // in the source details - - getSource().setObject(this); - } - - /** - * This method validates the ESB action and reports warnings or - * errors to the supplied model listener. - * - * @param l The model listener - */ - public void validate(ModelListener l) { - } - - - /** - * This method returns the XML configuration representation - * of the activity. - * - * @return The XML configuration for the activity - */ - public org.w3c.dom.Element getActivity() { - return(m_activity); - } - - /** - * This method converts the BPEL activity into an equivalent - * behavioural description for conformance checking. - * - * @param activities The list of activities that will contain - * the converted action(s) - * @param context The conversion context - */ - public abstract void convert(java.util.List<Activity> activities, - ConversionContext context); - - private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.bpel.model"); - - private BPELLanguageModel m_model=null; - private org.w3c.dom.Element m_activity=null; -} Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/AbstractBPELElement.java (from rev 555, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/AbstractBPELActivity.java) =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/AbstractBPELElement.java (rev 0) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/AbstractBPELElement.java 2009-03-27 21:04:21 UTC (rev 556) @@ -0,0 +1,121 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.jboss.tools.overlord.cdl.bpel.model.activities; + +import java.util.logging.Logger; + +import org.scribble.model.*; +import org.scribble.model.admin.ModelIssue; +import org.scribble.model.admin.ModelListener; +import org.jboss.tools.overlord.cdl.bpel.model.*; + +/** + * This is the generic BPEL element class. + * + * @author gary + */ +public abstract class AbstractBPELElement extends ModelObject + implements BPELElement { + + /** + * The constructor for initializing the BPEL element based on + * an existing DOM element. + */ + protected AbstractBPELElement(BPELLanguageModel model, + org.w3c.dom.Element activity) { + m_model = model; + + initExistingElement(model, activity); + } + + /** + * The contructor for initializing a new element. + */ + protected AbstractBPELElement(BPELLanguageModel model, + String activityName) { + m_model = model; + + initNewElement(model, activityName); + } + + /** + * This method initializes the activity. + * + * @param model The BPEL model + * @param activity The activity name + */ + protected void initNewElement(BPELLanguageModel model, + String activity) { + m_activity = model.getBPELProcess(). + getOwnerDocument().createElement(activity); + + getSource().setObject(this); + } + + /** + * This method initializes the activity. + * + * @param model The BPEL model + * @param activity The XML configuration details for the activity + */ + protected void initExistingElement(BPELLanguageModel model, + org.w3c.dom.Element activity) { + m_activity = activity; + + // TODO: Set the start/end position information + // in the source details + + getSource().setObject(this); + } + + /** + * This method validates the ESB action and reports warnings or + * errors to the supplied model listener. + * + * @param l The model listener + */ + public void validate(ModelListener l) { + } + + + /** + * This method returns the XML configuration representation + * of the activity. + * + * @return The XML configuration for the activity + */ + public org.w3c.dom.Element getDOMElement() { + return(m_activity); + } + + /** + * This method converts the BPEL activity into an equivalent + * behavioural description for conformance checking. + * + * @param activities The list of activities that will contain + * the converted action(s) + * @param context The conversion context + */ + public abstract void convert(java.util.List<Activity> activities, + ConversionContext context); + + private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.bpel.model"); + + private BPELLanguageModel m_model=null; + private org.w3c.dom.Element m_activity=null; +} Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/AbstractGroupingActivity.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/AbstractGroupingActivity.java 2009-03-27 14:46:16 UTC (rev 555) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/AbstractGroupingActivity.java 2009-03-27 21:04:21 UTC (rev 556) @@ -26,7 +26,7 @@ * * @author gary */ -public abstract class AbstractGroupingActivity extends AbstractBPELActivity { +public abstract class AbstractGroupingActivity extends AbstractBPELElement { /** * The constructor for initializing the activity based on @@ -50,10 +50,10 @@ * * @param act The contained activity */ - public void setContainedActivity(BPELActivity act) { + public void setContainedActivity(BPELElement act) { m_containedActivity = act; - getActivity().appendChild(act.getActivity()); + getDOMElement().appendChild(act.getDOMElement()); } /** @@ -61,11 +61,11 @@ * * @return The contained activity */ - public BPELActivity getContainedActivity() { + public BPELElement getContainedActivity() { return(m_containedActivity); } private static Logger logger = Logger.getLogger("org.jboss.tools.overlord.cdl.bpel.model"); - private BPELActivity m_containedActivity=null; + private BPELElement m_containedActivity=null; } Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/AbstractInteractionActivity.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/AbstractInteractionActivity.java 2009-03-27 14:46:16 UTC (rev 555) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/AbstractInteractionActivity.java 2009-03-27 21:04:21 UTC (rev 556) @@ -26,7 +26,7 @@ * * @author gary */ -public abstract class AbstractInteractionActivity extends AbstractBPELActivity { +public abstract class AbstractInteractionActivity extends AbstractBPELElement { private static final long serialVersionUID = -5048477859609625462L; @@ -61,7 +61,7 @@ */ protected void initialize(ConversationInteraction interaction) { - getActivity().setAttribute("operation", + getDOMElement().setAttribute("operation", interaction.getMessageSignature().getOperation()); // TODO: Record variables against relevant interaction Added: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/Condition.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/Condition.java (rev 0) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/Condition.java 2009-03-27 21:04:21 UTC (rev 556) @@ -0,0 +1,95 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.jboss.tools.overlord.cdl.bpel.model.activities; + +import java.util.List; + +import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; +import org.jboss.tools.overlord.cdl.bpel.model.ConversionContext; +import org.scribble.model.Activity; + +/** + * This class represents the BPEL condition element. + */ +public class Condition extends AbstractBPELElement { + + private static final long serialVersionUID = 8666349106632652777L; + + private static final String CONDITION="condition"; + + /** + * The constructor for the element. + * + * @param model The BPEL model + * @param elem The XML configuration details for the element + */ + public Condition(BPELLanguageModel model, + org.w3c.dom.Element elem) { + super(model, elem); + } + + /** + * The constructor for the element. + * + * @param model The BPEL model + */ + public Condition(BPELLanguageModel model) { + super(model, CONDITION); + } + + public String getExpression() { + String ret=null; + + getDOMElement().normalize(); + + if (getDOMElement().getFirstChild() instanceof org.w3c.dom.Text) { + org.w3c.dom.Text text=(org.w3c.dom.Text) + getDOMElement().getFirstChild(); + + ret = text.getNodeValue(); + } + + return(ret); + } + + public void setExpression(String expr) { + + getDOMElement().normalize(); + + if (getDOMElement().getFirstChild() == null) { + org.w3c.dom.Text text= + getDOMElement().getOwnerDocument().createTextNode(expr); + + getDOMElement().appendChild(text); + + } else if (getDOMElement().getFirstChild() instanceof org.w3c.dom.Text) { + org.w3c.dom.Text text=(org.w3c.dom.Text) + getDOMElement().getFirstChild(); + + text.setNodeValue(expr); + } + } + + @Override + public void convert(List<Activity> activities, ConversionContext context) { + // TODO Auto-generated method stub + + } + + +} Added: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/ElseConstruct.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/ElseConstruct.java (rev 0) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/ElseConstruct.java 2009-03-27 21:04:21 UTC (rev 556) @@ -0,0 +1,71 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.jboss.tools.overlord.cdl.bpel.model.activities; + +import java.util.List; + +import org.jboss.tools.overlord.cdl.bpel.model.BPELElement; +import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; +import org.jboss.tools.overlord.cdl.bpel.model.ConversionContext; +import org.scribble.model.Activity; + +/** + * This class represents the 'else' construct contained + * within the 'if' activity. + */ +public class ElseConstruct extends AbstractBPELElement { + + private static final String ELSE="else"; + + /** + * The constructor for the element. + * + * @param model The BPEL model + * @param activity The XML configuration details for the element + */ + public ElseConstruct(BPELLanguageModel model, + org.w3c.dom.Element activity) { + super(model, activity); + } + + /** + * The constructor for the element. + * + * @param model The BPEL model + */ + public ElseConstruct(BPELLanguageModel model) { + super(model, ELSE); + } + + + @Override + public void convert(List<Activity> activities, ConversionContext context) { + // TODO Auto-generated method stub + + } + + public void setActivity(BPELElement act) { + m_activity = act; + } + + public BPELElement getActivity() { + return(m_activity); + } + + private BPELElement m_activity=null; +} Added: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/ElseIfConstruct.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/ElseIfConstruct.java (rev 0) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/ElseIfConstruct.java 2009-03-27 21:04:21 UTC (rev 556) @@ -0,0 +1,82 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2008, Red Hat Middleware LLC, and others contributors as indicated + * by the @authors tag. All rights reserved. + * See the copyright.txt in the distribution for a + * full listing of individual contributors. + * This copyrighted material is made available to anyone wishing to use, + * modify, copy, or redistribute it subject to the terms and conditions + * of the GNU Lesser General Public License, v. 2.1. + * This program is distributed in the hope that it will be useful, but WITHOUT A + * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. + * You should have received a copy of the GNU Lesser General Public License, + * v.2.1 along with this distribution; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301, USA. + */ +package org.jboss.tools.overlord.cdl.bpel.model.activities; + +import java.util.List; + +import org.jboss.tools.overlord.cdl.bpel.model.BPELElement; +import org.jboss.tools.overlord.cdl.bpel.model.BPELLanguageModel; +import org.jboss.tools.overlord.cdl.bpel.model.ConversionContext; +import org.scribble.model.Activity; + +/** + * This class represents the 'elseif' construct contained + * within the 'if' activity. + */ +public class ElseIfConstruct extends AbstractBPELElement { + + private static final long serialVersionUID = 6371029130621912170L; + + private static final String ELSEIF="elseif"; + + /** + * The constructor for the element. + * + * @param model The BPEL model + * @param activity The XML configuration details for the element + */ + public ElseIfConstruct(BPELLanguageModel model, + org.w3c.dom.Element activity) { + super(model, activity); + } + + /** + * The constructor for the element. + * + * @param model The BPEL model + */ + public ElseIfConstruct(BPELLanguageModel model) { + super(model, ELSEIF); + } + + + @Override + public void convert(List<Activity> activities, ConversionContext context) { + // TODO Auto-generated method stub + + } + + public void setCondition(Condition cond) { + m_condition = cond; + } + + public Condition getCondition() { + return(m_condition); + } + + public void setActivity(BPELElement act) { + m_activity = act; + } + + public BPELElement getActivity() { + return(m_activity); + } + + private Condition m_condition=null; + private BPELElement m_activity=null; +} Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/IfActivity.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/IfActivity.java 2009-03-27 14:46:16 UTC (rev 555) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/IfActivity.java 2009-03-27 21:04:21 UTC (rev 556) @@ -26,7 +26,7 @@ * * @author gary */ -public class IfActivity extends AbstractBPELActivity { +public class IfActivity extends AbstractBPELElement { private static final long serialVersionUID = -763221632866464831L; private static final String IF = "if"; @@ -73,43 +73,52 @@ ConversionContext context) { } - public void setConditionPath(SequenceActivity act) { - m_conditionPath = act; - getActivity().appendChild(act.getActivity()); + public void setCondition(Condition cond) { + m_condition = cond; } - public SequenceActivity getConditionPath() { - return(m_conditionPath); + public Condition getCondition() { + return(m_condition); } + + public void setConditionPath(BPELElement act) { + m_activity = act; + getDOMElement().appendChild(act.getDOMElement()); + } - public void addElseIfPath(SequenceActivity act) { + public BPELElement getConditionPath() { + return(m_activity); + } + + public void addElseIfPath(ElseIfConstruct act) { m_elseIfPaths.add(act); - org.w3c.dom.Element elem=getActivity().getOwnerDocument().createElement("elseif"); + org.w3c.dom.Element elem=getDOMElement().getOwnerDocument().createElement("elseif"); - getActivity().appendChild(elem); - elem.appendChild(act.getActivity()); + getDOMElement().appendChild(elem); + elem.appendChild(act.getDOMElement()); } - public java.util.List<SequenceActivity> getElseIfPaths() { + public java.util.List<ElseIfConstruct> getElseIfPaths() { return(m_elseIfPaths); } - public void setElsePath(SequenceActivity act) { + public void setElsePath(BPELElement act) { m_elsePath = act; - org.w3c.dom.Element elem=getActivity().getOwnerDocument().createElement("else"); + org.w3c.dom.Element elem=getDOMElement().getOwnerDocument().createElement("else"); - getActivity().appendChild(elem); - elem.appendChild(act.getActivity()); + getDOMElement().appendChild(elem); + elem.appendChild(act.getDOMElement()); } - public SequenceActivity getElsePath() { + public BPELElement getElsePath() { return(m_elsePath); } - private SequenceActivity m_conditionPath=null; - private SequenceActivity m_elsePath=null; - private java.util.List<SequenceActivity> m_elseIfPaths= - new java.util.Vector<SequenceActivity>(); + private Condition m_condition=null; + private BPELElement m_activity=null; + private BPELElement m_elsePath=null; + private java.util.List<ElseIfConstruct> m_elseIfPaths= + new java.util.Vector<ElseIfConstruct>(); } Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/SequenceActivity.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/SequenceActivity.java 2009-03-27 14:46:16 UTC (rev 555) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/SequenceActivity.java 2009-03-27 21:04:21 UTC (rev 556) @@ -26,7 +26,7 @@ * * @author gary */ -public class SequenceActivity extends AbstractBPELActivity +public class SequenceActivity extends AbstractBPELElement implements BPELSequenceActivity { private static final String SEQUENCE = "sequence"; @@ -80,14 +80,14 @@ * @param act The activity to be added * @param pos The position to add, or -1 if at the end */ - public void addActivity(BPELActivity act, int pos) { + public void addActivity(BPELElement act, int pos) { if (pos == -1) { m_activities.add(act); - getActivity().appendChild(act.getActivity()); + getDOMElement().appendChild(act.getDOMElement()); } else { m_activities.add(pos, act); - org.w3c.dom.NodeList nl=getActivity().getChildNodes(); + org.w3c.dom.NodeList nl=getDOMElement().getChildNodes(); org.w3c.dom.Element elem=null; int cur=-1; @@ -102,9 +102,9 @@ } if (elem != null) { - getActivity().insertBefore(act.getActivity(), elem); + getDOMElement().insertBefore(act.getDOMElement(), elem); } else { - getActivity().appendChild(act.getActivity()); + getDOMElement().appendChild(act.getDOMElement()); } } } @@ -116,11 +116,11 @@ * @param act The activity to be removed * @return Whether the activity was removed */ - public boolean removeActivity(BPELActivity act) { + public boolean removeActivity(BPELElement act) { boolean ret=m_activities.remove(act); if (ret) { - getActivity().removeChild(act.getActivity()); + getDOMElement().removeChild(act.getDOMElement()); } return(ret); @@ -132,10 +132,10 @@ * * @return The list of activities */ - public java.util.List<BPELActivity> getActivities() { + public java.util.List<BPELElement> getActivities() { return(m_activities); } - private java.util.List<BPELActivity> m_activities= - new java.util.Vector<BPELActivity>(); + private java.util.List<BPELElement> m_activities= + new java.util.Vector<BPELElement>(); } Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/UnsupportedActivity.java =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/UnsupportedActivity.java 2009-03-27 14:46:16 UTC (rev 555) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/activities/UnsupportedActivity.java 2009-03-27 21:04:21 UTC (rev 556) @@ -26,7 +26,7 @@ * * @author gary */ -public class UnsupportedActivity extends AbstractBPELActivity { +public class UnsupportedActivity extends AbstractBPELElement { /** * The constructor for the activity. 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-27 14:46:16 UTC (rev 555) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/java/org/jboss/tools/overlord/cdl/bpel/model/change/IfModelChangeRule.java 2009-03-27 21:04:21 UTC (rev 556) @@ -103,7 +103,11 @@ } else if (i == elem.getPaths().size()-1) { act.setElsePath(seq); } else { - act.addElseIfPath(seq); + ElseIfConstruct construct=new ElseIfConstruct(bpelModel); + + construct.setActivity(seq); + + act.addElseIfPath(construct); } // Process the activities within the conversation Copied: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest (from rev 555, cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/test) 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/test/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java 2009-03-27 14:46:16 UTC (rev 555) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/GeneratorTest.java 2009-03-27 21:04:21 UTC (rev 556) @@ -149,9 +149,9 @@ new Throwable("Generated BPEL does not match stored version")); System.out.println("COMPARED GENERATED:"); - System.out.println(bpel); + System.out.println("["+bpel+"]"); System.out.println("WITH ORIGINAL:"); - System.out.println(orig); + System.out.println("["+orig+"]"); } } catch(Exception e) { result.addError(this, e); Modified: cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/PurchaseGoodsProcess(a)Broker.bpel =================================================================== --- cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/test/org/jboss/tools/overlord/cdl/bpel/generator/results/PurchaseGoodsProcess(a)Broker.bpel 2009-03-27 14:46:16 UTC (rev 555) +++ cdl/trunk/tools/plugins/org.jboss.tools.overlord.cdl.bpel/src/plugintest/org/jboss/tools/overlord/cdl/bpel/generator/results/PurchaseGoodsProcess(a)Broker.bpel 2009-03-27 21:04:21 UTC (rev 556) @@ -15,4 +15,4 @@ </else> </if> </sequence> -</process> \ No newline at end of file +</process>