You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by as...@apache.org on 2006/10/17 20:38:39 UTC
svn commit: r464992 [3/4] - in /incubator/ode/trunk:
bpel-compiler/src/main/java/org/apache/ode/bpel/compiler/
bpel-obj/src/main/java/org/apache/ode/bpel/o/
bpel-runtime/src/test/java/org/apache/ode/bpel/runtime/
Modified: incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OAssign.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OAssign.java?view=diff&rev=464992&r1=464991&r2=464992
==============================================================================
--- incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OAssign.java (original)
+++ incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OAssign.java Tue Oct 17 11:38:35 2006
@@ -27,180 +27,180 @@
import java.util.List;
public class OAssign extends OActivity {
- static final long serialVersionUID = -1L ;
-
- public final List<Copy> copy = new ArrayList<Copy>();
-
- public OAssign(OProcess owner) {
- super(owner);
- }
-
-
- public String toString() {
- return "{OAssign : " + name + ", joinCondition=" + joinCondition + "}";
- }
-
- /**
- * Assignmenet copy entry, i.e. what the assignment consits of.
- */
- public static class Copy extends OBase {
- private static final long serialVersionUID = 1L;
- public LValue to;
- public RValue from;
- public boolean keepSrcElementName;
-
- public Copy(OProcess owner) {
- super(owner);
- }
-
- public String toString() {
- return "{OCopy " + to + "=" + from + "}";
- }
- }
-
- public interface LValue {
- OScope.Variable getVariable();
- }
-
- public interface RValue { }
-
- public static class Literal extends OBase implements RValue {
- private static final long serialVersionUID = 1L;
- public transient Document xmlLiteral;
-
- public Literal(OProcess owner, Document xmlLiteral) {
- super(owner);
- if (xmlLiteral == null)
- throw new IllegalArgumentException("null xmlLiteral!");
- this.xmlLiteral = xmlLiteral;
- }
-
- public String toString() {
- return "{Literal " + xmlLiteral + "}";
- }
-
- private void writeObject(java.io.ObjectOutputStream out)
- throws IOException
- {
- out.writeUTF(DOMUtils.domToString(xmlLiteral));
- }
-
- private void readObject(java.io.ObjectInputStream in)
- throws IOException
- {
- String domStr = in.readUTF();
- try {
- xmlLiteral = DOMUtils.stringToDOM(domStr).getOwnerDocument();
- } catch (Exception ex) {
- throw (IOException)(new IOException("XML de-serialization error.")).initCause(ex);
- }
- }
-
- }
-
- public static class LValueExpression extends OBase implements LValue {
- private static final long serialVersionUID = 1L;
- public OLValueExpression expression;
+ static final long serialVersionUID = -1L ;
+
+ public final List<Copy> copy = new ArrayList<Copy>();
- public LValueExpression(OProcess owner, OLValueExpression compiledExpression) {
- super(owner);
- this.expression = compiledExpression;
+ public OAssign(OProcess owner, OActivity parent) {
+ super(owner, parent);
}
- public String toString() {
- return expression.toString();
- }
- /**
- * @see org.apache.ode.bpel.o.OAssign.LValue#getVariable()
- */
- public Variable getVariable() {
- return expression.getVariable();
- }
-
- }
- public static class Expression extends OBase implements RValue {
- private static final long serialVersionUID = 1L;
- public OExpression expression;
-
- public Expression(OProcess owner, OExpression compiledExpression) {
- super(owner);
- this.expression = compiledExpression;
- }
public String toString() {
- return expression.toString();
+ return "{OAssign : " + name + ", joinCondition=" + joinCondition + "}";
}
- }
-
- public static class VariableRef extends OBase implements RValue, LValue {
- private static final long serialVersionUID = 1L;
- public OScope.Variable variable;
- public OMessageVarType.Part part;
- public OExpression location;
- public VariableRef(OProcess owner) {
- super(owner);
- }
-
- public OScope.Variable getVariable() {
- return variable;
- }
-
- /**
- * Report whether this is a reference to a whole "message"
- * @return <code>true</code> if whole-message reference
- */
- public boolean isMessageRef() {
- return variable.type instanceof OMessageVarType &&
- part == null && location == null;
- }
-
/**
- * Report whether this is a reference to a message part.
- * @return <code>true</code> if reference to a message part
+ * Assignmenet copy entry, i.e. what the assignment consits of.
*/
- public boolean isPartRef() {
- return variable.type instanceof OMessageVarType &&
- part != null && location == null;
- }
-
- public String toString() {
- return "{VarRef " + variable +
- (part==null ? "" : "." + part.name) +
- (location == null ? "" : location.toString())+ "}";
- }
- }
-
- public static class PropertyRef extends OBase implements RValue, LValue {
- private static final long serialVersionUID = 1L;
- public OScope.Variable variable;
- public OProcess.OPropertyAlias propertyAlias;
-
- public PropertyRef(OProcess owner) { super(owner); }
-
- public OScope.Variable getVariable() {
- return variable;
- }
-
- public String toString() {
- return "{PropRef " + variable + "!" + propertyAlias+ "}";
- }
- }
-
- public static class PartnerLinkRef extends OBase implements RValue, LValue {
- private static final long serialVersionUID = 1L;
- public OPartnerLink partnerLink;
- public boolean isMyEndpointReference;
-
- public PartnerLinkRef(OProcess owner) { super(owner); }
-
- // Must fit in a LValue even if it's not variable based
- public Variable getVariable() {
- return null;
- }
-
- public String toString() {
- return "{PLinkRef " + partnerLink + "!" + isMyEndpointReference + "}";
+ public static class Copy extends OBase {
+ private static final long serialVersionUID = 1L;
+ public LValue to;
+ public RValue from;
+ public boolean keepSrcElementName;
+
+ public Copy(OProcess owner) {
+ super(owner);
+ }
+
+ public String toString() {
+ return "{OCopy " + to + "=" + from + "}";
+ }
+ }
+
+ public interface LValue {
+ OScope.Variable getVariable();
+ }
+
+ public interface RValue { }
+
+ public static class Literal extends OBase implements RValue {
+ private static final long serialVersionUID = 1L;
+ public transient Document xmlLiteral;
+
+ public Literal(OProcess owner, Document xmlLiteral) {
+ super(owner);
+ if (xmlLiteral == null)
+ throw new IllegalArgumentException("null xmlLiteral!");
+ this.xmlLiteral = xmlLiteral;
+ }
+
+ public String toString() {
+ return "{Literal " + xmlLiteral + "}";
+ }
+
+ private void writeObject(java.io.ObjectOutputStream out)
+ throws IOException
+ {
+ out.writeUTF(DOMUtils.domToString(xmlLiteral));
+ }
+
+ private void readObject(java.io.ObjectInputStream in)
+ throws IOException
+ {
+ String domStr = in.readUTF();
+ try {
+ xmlLiteral = DOMUtils.stringToDOM(domStr).getOwnerDocument();
+ } catch (Exception ex) {
+ throw (IOException)(new IOException("XML de-serialization error.")).initCause(ex);
+ }
+ }
+
+ }
+
+ public static class LValueExpression extends OBase implements LValue {
+ private static final long serialVersionUID = 1L;
+ public OLValueExpression expression;
+
+ public LValueExpression(OProcess owner, OLValueExpression compiledExpression) {
+ super(owner);
+ this.expression = compiledExpression;
+ }
+
+ public String toString() {
+ return expression.toString();
+ }
+ /**
+ * @see org.apache.ode.bpel.o.OAssign.LValue#getVariable()
+ */
+ public Variable getVariable() {
+ return expression.getVariable();
+ }
+
+ }
+ public static class Expression extends OBase implements RValue {
+ private static final long serialVersionUID = 1L;
+ public OExpression expression;
+
+ public Expression(OProcess owner, OExpression compiledExpression) {
+ super(owner);
+ this.expression = compiledExpression;
+ }
+
+ public String toString() {
+ return expression.toString();
+ }
+ }
+
+ public static class VariableRef extends OBase implements RValue, LValue {
+ private static final long serialVersionUID = 1L;
+ public OScope.Variable variable;
+ public OMessageVarType.Part part;
+ public OExpression location;
+
+ public VariableRef(OProcess owner) {
+ super(owner);
+ }
+
+ public OScope.Variable getVariable() {
+ return variable;
+ }
+
+ /**
+ * Report whether this is a reference to a whole "message"
+ * @return <code>true</code> if whole-message reference
+ */
+ public boolean isMessageRef() {
+ return variable.type instanceof OMessageVarType &&
+ part == null && location == null;
+ }
+
+ /**
+ * Report whether this is a reference to a message part.
+ * @return <code>true</code> if reference to a message part
+ */
+ public boolean isPartRef() {
+ return variable.type instanceof OMessageVarType &&
+ part != null && location == null;
+ }
+
+ public String toString() {
+ return "{VarRef " + variable +
+ (part==null ? "" : "." + part.name) +
+ (location == null ? "" : location.toString())+ "}";
+ }
+ }
+
+ public static class PropertyRef extends OBase implements RValue, LValue {
+ private static final long serialVersionUID = 1L;
+ public OScope.Variable variable;
+ public OProcess.OPropertyAlias propertyAlias;
+
+ public PropertyRef(OProcess owner) { super(owner); }
+
+ public OScope.Variable getVariable() {
+ return variable;
+ }
+
+ public String toString() {
+ return "{PropRef " + variable + "!" + propertyAlias+ "}";
+ }
+ }
+
+ public static class PartnerLinkRef extends OBase implements RValue, LValue {
+ private static final long serialVersionUID = 1L;
+ public OPartnerLink partnerLink;
+ public boolean isMyEndpointReference;
+
+ public PartnerLinkRef(OProcess owner) { super(owner); }
+
+ // Must fit in a LValue even if it's not variable based
+ public Variable getVariable() {
+ return null;
+ }
+
+ public String toString() {
+ return "{PLinkRef " + partnerLink + "!" + isMyEndpointReference + "}";
+ }
}
- }
}
Modified: incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OBase.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OBase.java?view=diff&rev=464992&r1=464991&r2=464992
==============================================================================
--- incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OBase.java (original)
+++ incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OBase.java Tue Oct 17 11:38:35 2006
@@ -28,49 +28,49 @@
*/
public class OBase implements Serializable {
- static final long serialVersionUID = -1L ;
-
- /** Our identifier, in terms of our parent. */
- private final int _id;
- private final OProcess _owner;
-
- public DebugInfo debugInfo;
-
- protected OBase(OProcess owner) {
- _owner = owner;
- if (owner == null) {
- _id = 0;
- } else {
- _id = ++_owner._childIdCounter;
- _owner._children.add(this);
- }
- assert _id == 0 || _owner != null;
- }
-
- public OProcess getOwner() {
- return (OProcess) (_owner == null ? this : _owner);
- }
-
- public int hashCode() {
- return _id;
- }
-
- public boolean equals(Object obj) {
- if(!(obj instanceof OBase))
- return false;
+ static final long serialVersionUID = -1L ;
- OBase other = (OBase) obj;
- return (_id == 0 && other._id == 0) || _id == other._id && other._owner.equals(_owner);
- }
-
- public int getId() {
- return _id;
- }
-
- public String toString() {
- StringBuffer buf = new StringBuffer(ObjectPrinter.getShortClassName(this));
- buf.append('#');
- buf.append(_id);
- return buf.toString();
- }
+ /** Our identifier, in terms of our parent. */
+ private final int _id;
+ private final OProcess _owner;
+
+ public DebugInfo debugInfo;
+
+ protected OBase(OProcess owner) {
+ _owner = owner;
+ if (owner == null) {
+ _id = 0;
+ } else {
+ _id = ++_owner._childIdCounter;
+ _owner._children.add(this);
+ }
+ assert _id == 0 || _owner != null;
+ }
+
+ public OProcess getOwner() {
+ return (OProcess) (_owner == null ? this : _owner);
+ }
+
+ public int hashCode() {
+ return _id;
+ }
+
+ public boolean equals(Object obj) {
+ if(!(obj instanceof OBase))
+ return false;
+
+ OBase other = (OBase) obj;
+ return (_id == 0 && other._id == 0) || _id == other._id && other._owner.equals(_owner);
+ }
+
+ public int getId() {
+ return _id;
+ }
+
+ public String toString() {
+ StringBuffer buf = new StringBuffer(ObjectPrinter.getShortClassName(this));
+ buf.append('#');
+ buf.append(_id);
+ return buf.toString();
+ }
}
Modified: incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OCatch.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OCatch.java?view=diff&rev=464992&r1=464991&r2=464992
==============================================================================
--- incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OCatch.java (original)
+++ incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OCatch.java Tue Oct 17 11:38:35 2006
@@ -24,17 +24,15 @@
* The catch pseudo-activity.
*/
public final class OCatch extends OScope {
- static final long serialVersionUID = -1L ;
- public QName faultName;
- public OScope.Variable faultVariable;
+ static final long serialVersionUID = -1L ;
+ public QName faultName;
+ public OScope.Variable faultVariable;
-
+ public OCatch(OProcess owner, OActivity parent) {
+ super(owner, parent);
+ }
- public OCatch(OProcess owner) {
- super(owner);
- }
-
- public String toString() {
- return "{OCatch faultName=" + faultName + ", faultVariable=" + faultVariable + "}";
- }
+ public String toString() {
+ return "{OCatch faultName=" + faultName + ", faultVariable=" + faultVariable + "}";
+ }
}
Modified: incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OCompensate.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OCompensate.java?view=diff&rev=464992&r1=464991&r2=464992
==============================================================================
--- incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OCompensate.java (original)
+++ incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OCompensate.java Tue Oct 17 11:38:35 2006
@@ -22,12 +22,12 @@
* Compiled representation of the BPEL <code><compensate></code> activity.
*/
public class OCompensate extends OActivity {
- static final long serialVersionUID = -1L ;
+ static final long serialVersionUID = -1L ;
- /** The scope that is compensated by this activity. */
- public OScope compensatedScope;
+ /** The scope that is compensated by this activity. */
+ public OScope compensatedScope;
- public OCompensate(OProcess owner) {
- super(owner);
- }
+ public OCompensate(OProcess owner, OActivity parent) {
+ super(owner, parent);
+ }
}
Modified: incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OCompensationHandler.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OCompensationHandler.java?view=diff&rev=464992&r1=464991&r2=464992
==============================================================================
--- incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OCompensationHandler.java (original)
+++ incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OCompensationHandler.java Tue Oct 17 11:38:35 2006
@@ -20,7 +20,7 @@
public class OCompensationHandler extends OScope {
- public OCompensationHandler(OProcess owner) {
- super(owner);
- }
+ public OCompensationHandler(OProcess owner, OActivity parent) {
+ super(owner, parent);
+ }
}
Modified: incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OConstantExpression.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OConstantExpression.java?view=diff&rev=464992&r1=464991&r2=464992
==============================================================================
--- incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OConstantExpression.java (original)
+++ incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OConstantExpression.java Tue Oct 17 11:38:35 2006
@@ -19,27 +19,27 @@
package org.apache.ode.bpel.o;
public class OConstantExpression extends OExpression {
- static final long serialVersionUID = -1L ;
+ static final long serialVersionUID = -1L ;
- private Object _val;
+ private Object _val;
- public OConstantExpression(OProcess owner, Object val) {
- super(owner);
- setVal(val);
- }
+ public OConstantExpression(OProcess owner, Object val) {
+ super(owner);
+ setVal(val);
+ }
- public Object getVal() {
- return _val;
- }
+ public Object getVal() {
+ return _val;
+ }
- public void setVal(Object val) {
- if (val == null)
- throw new IllegalArgumentException("OConstatExpression cannot be null.");
+ public void setVal(Object val) {
+ if (val == null)
+ throw new IllegalArgumentException("OConstatExpression cannot be null.");
- this._val = val;
- }
+ this._val = val;
+ }
- public String toString() {
- return "{OConstantExpression " + _val + "}";
- }
+ public String toString() {
+ return "{OConstantExpression " + _val + "}";
+ }
}
Modified: incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OConstants.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OConstants.java?view=diff&rev=464992&r1=464991&r2=464992
==============================================================================
--- incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OConstants.java (original)
+++ incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OConstants.java Tue Oct 17 11:38:35 2006
@@ -26,25 +26,25 @@
*/
public class OConstants extends OBase {
- private static final long serialVersionUID = 1L;
- public QName qnMissingRequest;
- public QName qnMissingReply;
- public QName qnUninitializedVariable;
- public QName qnConflictingReceive;
- public QName qnSelectionFailure;
- public QName qnMismatchedAssignmentFailure;
- public QName qnJoinFailure;
- public QName qnForcedTermination;
- public QName qnCorrelationViolation;
- public QName qnXsltInvalidSource;
- public QName qnSubLanguageExecutionFault;
- public QName qnUninitializedPartnerRole;
- public QName qnForEachCounterError;
- public QName qnInvalidBranchCondition;
+ private static final long serialVersionUID = 1L;
+ public QName qnMissingRequest;
+ public QName qnMissingReply;
+ public QName qnUninitializedVariable;
+ public QName qnConflictingReceive;
+ public QName qnSelectionFailure;
+ public QName qnMismatchedAssignmentFailure;
+ public QName qnJoinFailure;
+ public QName qnForcedTermination;
+ public QName qnCorrelationViolation;
+ public QName qnXsltInvalidSource;
+ public QName qnSubLanguageExecutionFault;
+ public QName qnUninitializedPartnerRole;
+ public QName qnForEachCounterError;
+ public QName qnInvalidBranchCondition;
- public OConstants(OProcess owner) {
- super(owner);
- }
+ public OConstants(OProcess owner) {
+ super(owner);
+ }
}
Modified: incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OElementVarType.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OElementVarType.java?view=diff&rev=464992&r1=464991&r2=464992
==============================================================================
--- incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OElementVarType.java (original)
+++ incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OElementVarType.java Tue Oct 17 11:38:35 2006
@@ -25,18 +25,18 @@
import org.w3c.dom.Node;
public class OElementVarType extends OVarType {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- public QName elementType;
+ public QName elementType;
- public OElementVarType(OProcess owner, QName typeName) {
- super(owner);
- elementType = typeName;
- }
+ public OElementVarType(OProcess owner, QName typeName) {
+ super(owner);
+ elementType = typeName;
+ }
- public Node newInstance(Document doc) {
- Element el = doc.createElementNS(elementType.getNamespaceURI(),
- elementType.getLocalPart());
- return el;
- }
+ public Node newInstance(Document doc) {
+ Element el = doc.createElementNS(elementType.getNamespaceURI(),
+ elementType.getLocalPart());
+ return el;
+ }
}
Modified: incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OEmpty.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OEmpty.java?view=diff&rev=464992&r1=464991&r2=464992
==============================================================================
--- incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OEmpty.java (original)
+++ incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OEmpty.java Tue Oct 17 11:38:35 2006
@@ -20,9 +20,9 @@
public class OEmpty extends OActivity {
- static final long serialVersionUID = -1L ;
+ static final long serialVersionUID = -1L ;
- public OEmpty(OProcess owner) {
- super(owner);
- }
+ public OEmpty(OProcess owner, OActivity parent) {
+ super(owner, parent);
+ }
}
Modified: incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OEventHandler.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OEventHandler.java?view=diff&rev=464992&r1=464991&r2=464992
==============================================================================
--- incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OEventHandler.java (original)
+++ incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OEventHandler.java Tue Oct 17 11:38:35 2006
@@ -28,51 +28,51 @@
* Compiled represenation of a BPEL event handler.
*/
public class OEventHandler extends OAgent {
- static final long serialVersionUID = -1L ;
- public List<OEvent> onMessages = new ArrayList<OEvent>();
- public List<OAlarm> onAlarms = new ArrayList<OAlarm>();
-
- public OEventHandler(OProcess owner) {
- super(owner);
- }
-
- public static class OAlarm extends OAgent {
static final long serialVersionUID = -1L ;
+ public List<OEvent> onMessages = new ArrayList<OEvent>();
+ public List<OAlarm> onAlarms = new ArrayList<OAlarm>();
- public OExpression forExpr;
- public OExpression untilExpr;
- public OExpression repeatExpr;
- public OActivity activity;
-
- public OAlarm(OProcess owner){
- super(owner);
- }
- }
-
- public static class OEvent extends OScope {
- static final long serialVersionUID = -1L ;
-
- /** Correlations to initialize. */
- public final List <OScope.CorrelationSet> initCorrelations = new ArrayList<OScope.CorrelationSet>();
-
- /** Correlation set to match on. */
- public OScope.CorrelationSet matchCorrelation;
-
- public OPartnerLink partnerLink;
- public Operation operation;
- public OScope.Variable variable;
- public OActivity activity;
-
- /** OASIS addition for disambiguating receives (optional). */
- public String messageExchangeId = "";
+ public OEventHandler(OProcess owner) {
+ super(owner);
+ }
+ public static class OAlarm extends OAgent {
+ static final long serialVersionUID = -1L ;
- public String getCorrelatorId() {
- return partnerLink.getId() + "." + operation.getName();
+ public OExpression forExpr;
+ public OExpression untilExpr;
+ public OExpression repeatExpr;
+ public OActivity activity;
+
+ public OAlarm(OProcess owner){
+ super(owner);
+ }
+ }
+
+ public static class OEvent extends OScope {
+ static final long serialVersionUID = -1L ;
+
+ /** Correlations to initialize. */
+ public final List <OScope.CorrelationSet> initCorrelations = new ArrayList<OScope.CorrelationSet>();
+
+ /** Correlation set to match on. */
+ public OScope.CorrelationSet matchCorrelation;
+
+ public OPartnerLink partnerLink;
+ public Operation operation;
+ public OScope.Variable variable;
+ public OActivity activity;
+
+ /** OASIS addition for disambiguating receives (optional). */
+ public String messageExchangeId = "";
+
+
+ public String getCorrelatorId() {
+ return partnerLink.getId() + "." + operation.getName();
+ }
+
+ public OEvent(OProcess owner, OActivity parent) {
+ super(owner, parent);
+ }
}
-
- public OEvent(OProcess owner) {
- super(owner);
- }
- }
}
Modified: incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OExpression.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OExpression.java?view=diff&rev=464992&r1=464991&r2=464992
==============================================================================
--- incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OExpression.java (original)
+++ incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OExpression.java Tue Oct 17 11:38:35 2006
@@ -23,17 +23,17 @@
* dependent on the compiler implementation.
*/
public abstract class OExpression extends OBase {
- static final long serialVersionUID = -1L ;
-
- public OExpressionLanguage expressionLanguage;
+ static final long serialVersionUID = -1L ;
+
+ public OExpressionLanguage expressionLanguage;
- public OExpression(OProcess owner) {
- super(owner);
- }
+ public OExpression(OProcess owner) {
+ super(owner);
+ }
- /** Get the expression language used to generate this expression. */
- public OExpressionLanguage getExpressionLanguage() {
- return expressionLanguage;
+ /** Get the expression language used to generate this expression. */
+ public OExpressionLanguage getExpressionLanguage() {
+ return expressionLanguage;
}
}
Modified: incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OExpressionLanguage.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OExpressionLanguage.java?view=diff&rev=464992&r1=464991&r2=464992
==============================================================================
--- incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OExpressionLanguage.java (original)
+++ incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OExpressionLanguage.java Tue Oct 17 11:38:35 2006
@@ -25,13 +25,13 @@
* Compiled representation of an expression language dependency.
*/
public class OExpressionLanguage extends OBase {
- private static final long serialVersionUID = 1L;
- public String expressionLanguageUri;
- public final Map<String,String> properties = new HashMap<String,String>();
+ private static final long serialVersionUID = 1L;
+ public String expressionLanguageUri;
+ public final Map<String,String> properties = new HashMap<String,String>();
- public OExpressionLanguage(OProcess owner, Map<String,String> properties) {
- super(owner);
- if (properties != null)
- this.properties.putAll(properties);
- }
+ public OExpressionLanguage(OProcess owner, Map<String,String> properties) {
+ super(owner);
+ if (properties != null)
+ this.properties.putAll(properties);
+ }
}
Modified: incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OFaultHandler.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OFaultHandler.java?view=diff&rev=464992&r1=464991&r2=464992
==============================================================================
--- incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OFaultHandler.java (original)
+++ incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OFaultHandler.java Tue Oct 17 11:38:35 2006
@@ -28,15 +28,15 @@
*/
public class OFaultHandler extends OBase {
- static final long serialVersionUID = -1L ;
-
- public final List<OCatch> catchBlocks = new ArrayList<OCatch>();
+ static final long serialVersionUID = -1L ;
+
+ public final List<OCatch> catchBlocks = new ArrayList<OCatch>();
- public OFaultHandler(OProcess owner) {
- super(owner);
- }
+ public OFaultHandler(OProcess owner) {
+ super(owner);
+ }
- public Collection<OLink> outgoinglinks() {
- throw new UnsupportedOperationException(); // TODO: implement me!
- }
+ public Collection<OLink> outgoinglinks() {
+ throw new UnsupportedOperationException(); // TODO: implement me!
+ }
}
Modified: incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OFlow.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OFlow.java?view=diff&rev=464992&r1=464991&r2=464992
==============================================================================
--- incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OFlow.java (original)
+++ incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OFlow.java Tue Oct 17 11:38:35 2006
@@ -28,23 +28,23 @@
/**
*/
public class OFlow extends OActivity {
- static final long serialVersionUID = -1L ;
+ static final long serialVersionUID = -1L ;
- /** Links delcared within this activity. */
- public final Set<OLink> localLinks = new HashSet<OLink>();
+ /** Links delcared within this activity. */
+ public final Set<OLink> localLinks = new HashSet<OLink>();
- public final Set<OActivity> parallelActivities = new HashSet<OActivity>();
+ public final Set<OActivity> parallelActivities = new HashSet<OActivity>();
- public OFlow(OProcess owner) {
- super(owner);
- }
+ public OFlow(OProcess owner, OActivity parent) {
+ super(owner, parent);
+ }
- public OLink getLocalLink(final String linkName) {
- return CollectionsX.find_if(localLinks, new MemberOfFunction<OLink>() {
- public boolean isMember(OLink o) {
- return o.name.equals(linkName);
- }
- });
- }
+ public OLink getLocalLink(final String linkName) {
+ return CollectionsX.find_if(localLinks, new MemberOfFunction<OLink>() {
+ public boolean isMember(OLink o) {
+ return o.name.equals(linkName);
+ }
+ });
+ }
}
Modified: incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OForEach.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OForEach.java?view=diff&rev=464992&r1=464991&r2=464992
==============================================================================
--- incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OForEach.java (original)
+++ incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OForEach.java Tue Oct 17 11:38:35 2006
@@ -23,37 +23,37 @@
* Base model class for forEach activity.
*/
public class OForEach extends OActivity {
- static final long serialVersionUID = -1L;
+ static final long serialVersionUID = -1L;
- public OScope.Variable counterVariable;
- public boolean parallel;
- public OExpression startCounterValue;
- public OExpression finalCounterValue;
- public CompletionCondition completionCondition;
-
- public OScope innerScope;
-
- public OForEach(OProcess owner) {
- super(owner);
- }
-
- public String toString() {
- return "+{OForEach : " + name +
- ", counterName=" + counterVariable.name +
- ", parallel=" + parallel +
- ", startCounterValue=" + startCounterValue +
- ", finalCounterValue=" + finalCounterValue +
- ", completionCondition=" + (completionCondition == null ? "" : completionCondition.branchCount) + "}";
- }
+ public OScope.Variable counterVariable;
+ public boolean parallel;
+ public OExpression startCounterValue;
+ public OExpression finalCounterValue;
+ public CompletionCondition completionCondition;
- public static class CompletionCondition extends OBase {
- static final long serialVersionUID = -1L;
+ public OScope innerScope;
+
+ public OForEach(OProcess owner, OActivity parent) {
+ super(owner, parent);
+ }
+
+ public String toString() {
+ return "+{OForEach : " + name +
+ ", counterName=" + counterVariable.name +
+ ", parallel=" + parallel +
+ ", startCounterValue=" + startCounterValue +
+ ", finalCounterValue=" + finalCounterValue +
+ ", completionCondition=" + (completionCondition == null ? "" : completionCondition.branchCount) + "}";
+ }
+
+ public static class CompletionCondition extends OBase {
+ static final long serialVersionUID = -1L;
- public boolean successfulBranchesOnly;
- public OExpression branchCount;
+ public boolean successfulBranchesOnly;
+ public OExpression branchCount;
- public CompletionCondition(OProcess owner) {
- super(owner);
+ public CompletionCondition(OProcess owner) {
+ super(owner);
+ }
}
- }
}
Modified: incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OInvoke.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OInvoke.java?view=diff&rev=464992&r1=464991&r2=464992
==============================================================================
--- incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OInvoke.java (original)
+++ incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OInvoke.java Tue Oct 17 11:38:35 2006
@@ -28,25 +28,25 @@
*/
public class OInvoke extends OActivity {
- static final long serialVersionUID = -1L ;
- public OPartnerLink partnerLink;
- public OScope.Variable inputVar;
- public OScope.Variable outputVar;
- public Operation operation;
+ static final long serialVersionUID = -1L ;
+ public OPartnerLink partnerLink;
+ public OScope.Variable inputVar;
+ public OScope.Variable outputVar;
+ public Operation operation;
- /** Correlation sets initialized on the input message. */
- public final List<OScope.CorrelationSet> initCorrelationsInput = new ArrayList<OScope.CorrelationSet>();
+ /** Correlation sets initialized on the input message. */
+ public final List<OScope.CorrelationSet> initCorrelationsInput = new ArrayList<OScope.CorrelationSet>();
- /** Correlation sets initialized on the input message. */
- public final List <OScope.CorrelationSet> initCorrelationsOutput = new ArrayList<OScope.CorrelationSet>();
+ /** Correlation sets initialized on the input message. */
+ public final List <OScope.CorrelationSet> initCorrelationsOutput = new ArrayList<OScope.CorrelationSet>();
- /** Correlation sets asserted on input. */
- public final List <OScope.CorrelationSet> assertCorrelationsInput = new ArrayList<OScope.CorrelationSet>();
+ /** Correlation sets asserted on input. */
+ public final List <OScope.CorrelationSet> assertCorrelationsInput = new ArrayList<OScope.CorrelationSet>();
- /** Correlation sets asserted on output. */
- public final List<OScope.CorrelationSet> assertCorrelationsOutput = new ArrayList<OScope.CorrelationSet>();
+ /** Correlation sets asserted on output. */
+ public final List<OScope.CorrelationSet> assertCorrelationsOutput = new ArrayList<OScope.CorrelationSet>();
- public OInvoke(OProcess owner) {
- super(owner);
- }
+ public OInvoke(OProcess owner, OActivity parent) {
+ super(owner, parent);
+ }
}
Modified: incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OLValueExpression.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OLValueExpression.java?view=diff&rev=464992&r1=464991&r2=464992
==============================================================================
--- incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OLValueExpression.java (original)
+++ incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OLValueExpression.java Tue Oct 17 11:38:35 2006
@@ -20,15 +20,15 @@
public abstract class OLValueExpression extends OExpression {
- private static final long serialVersionUID = 1L;
-
- /**
- * @param owner
- */
- public OLValueExpression(OProcess owner) {
- super(owner);
- }
-
- public abstract OScope.Variable getVariable();
+ private static final long serialVersionUID = 1L;
+
+ /**
+ * @param owner
+ */
+ public OLValueExpression(OProcess owner) {
+ super(owner);
+ }
+
+ public abstract OScope.Variable getVariable();
}
Modified: incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OLink.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OLink.java?view=diff&rev=464992&r1=464991&r2=464992
==============================================================================
--- incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OLink.java (original)
+++ incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OLink.java Tue Oct 17 11:38:35 2006
@@ -22,24 +22,24 @@
* Compiled representation of a BPEL control link.
*/
public class OLink extends OBase {
- static final long serialVersionUID = -1L ;
-
- /** The flow in which the link is declared. */
- public OFlow declaringFlow;
+ static final long serialVersionUID = -1L ;
+
+ /** The flow in which the link is declared. */
+ public OFlow declaringFlow;
- /** The name of the link. */
- public String name;
+ /** The name of the link. */
+ public String name;
- /** The link's transition condition. */
- public OExpression transitionCondition;
+ /** The link's transition condition. */
+ public OExpression transitionCondition;
- /** The source activity. */
- public OActivity source;
+ /** The source activity. */
+ public OActivity source;
- /** The target activity. */
- public OActivity target;
+ /** The target activity. */
+ public OActivity target;
- public OLink(OProcess owner) {
- super(owner);
- }
+ public OLink(OProcess owner) {
+ super(owner);
+ }
}
Modified: incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OMessageVarType.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OMessageVarType.java?view=diff&rev=464992&r1=464991&r2=464992
==============================================================================
--- incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OMessageVarType.java (original)
+++ incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OMessageVarType.java Tue Oct 17 11:38:35 2006
@@ -32,52 +32,49 @@
* Message variable type.
*/
public class OMessageVarType extends OVarType {
- public QName messageType;
- public final Map<String, Part> parts = new HashMap<String,Part>();
+ public QName messageType;
+ public final Map<String, Part> parts = new HashMap<String,Part>();
- /** For doc-lit-like message types , the element type of the only part. */
- public final OElementVarType docLitType;
+ /** For doc-lit-like message types , the element type of the only part. */
+ public final OElementVarType docLitType;
- public OMessageVarType(OProcess owner, QName messageType, Collection<Part> parts) {
- super(owner);
- this.messageType = messageType;
- for (Iterator<Part> i = parts.iterator(); i.hasNext();) {
- Part part = i.next();
- this.parts.put(part.name,part);
+ public OMessageVarType(OProcess owner, QName messageType, Collection<Part> parts) {
+ super(owner);
+ this.messageType = messageType;
+ for (Iterator<Part> i = parts.iterator(); i.hasNext();) {
+ Part part = i.next();
+ this.parts.put(part.name,part);
+ }
+
+ if ((parts.size() == 1 && parts.iterator().next().type instanceof OElementVarType))
+ docLitType = (OElementVarType) parts.iterator().next().type;
+ else
+ docLitType = null;
}
- if ((parts.size() == 1 && parts.iterator().next().type instanceof OElementVarType))
- docLitType = (OElementVarType) parts.iterator().next().type;
- else
- docLitType = null;
-
- }
-
- boolean isDocLit() { return docLitType != null; }
-
-
- public Node newInstance(Document doc) {
- Element el = doc.createElementNS(null, "message");
- for(OMessageVarType.Part part : parts.values()){
- Element partElement = doc.createElementNS(null, part.name);
- partElement.appendChild(part.type.newInstance(doc));
- el.appendChild(partElement);
- }
- return el;
- }
+ boolean isDocLit() { return docLitType != null; }
- public static class Part extends OBase {
- public String name;
- public OVarType type;
-
- public Part(OProcess owner, String partName, OVarType partType) {
- super(owner);
- this.name = partName;
- this.type = partType;
- }
- }
+ public Node newInstance(Document doc) {
+ Element el = doc.createElementNS(null, "message");
+ for(OMessageVarType.Part part : parts.values()){
+ Element partElement = doc.createElementNS(null, part.name);
+ partElement.appendChild(part.type.newInstance(doc));
+ el.appendChild(partElement);
+ }
+ return el;
+ }
+ public static class Part extends OBase {
+ public String name;
+ public OVarType type;
+
+ public Part(OProcess owner, String partName, OVarType partType) {
+ super(owner);
+ this.name = partName;
+ this.type = partType;
+ }
+ }
}
Modified: incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OPartnerLink.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OPartnerLink.java?view=diff&rev=464992&r1=464991&r2=464992
==============================================================================
--- incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OPartnerLink.java (original)
+++ incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OPartnerLink.java Tue Oct 17 11:38:35 2006
@@ -31,103 +31,103 @@
* Compiled representation of a BPEL partnerLink.
*/
public class OPartnerLink extends OBase {
- static final long serialVersionUID = -1L ;
- /** partnerLink name. */
- public String name;
-
- /** Scope in which this partnerLink is declared. */
- public OScope declaringScope;
-
- /** The type of this partnerLink. */
- public QName partnerLinkType;
-
- public String partnerRoleName;
-
- public String myRoleName;
-
- public PortType myRolePortType;
-
- public PortType partnerRolePortType;
-
- public boolean initializePartnerRole;
-
- /** The set of CorrelationSets that may be used as a match criteria, organized by {@link Operation} */
- private final HashMap<String,Set<OScope.CorrelationSet>> _nonIntitiatingCorrelationSets = new HashMap<String,Set<OScope.CorrelationSet>>();
-
- /** The set of {@link Operation}s that can be used to create a process instance. */
- private final HashSet<String> _createInstanceOperations = new HashSet<String>();
-
- public OPartnerLink(OProcess owner) {
- super(owner);
- }
-
- public String getName() {
- return name;
- }
-
- public boolean hasMyRole() {
- return myRolePortType != null;
- }
-
- public boolean hasPartnerRole() {
- return partnerRolePortType != null;
- }
-
- public boolean isCreateInstanceOperation(Operation op) {
- return _createInstanceOperations.contains(op.getName());
- }
-
- public void addCreateInstanceOperation(Operation operation) {
- _createInstanceOperations.add(operation.getName());
- }
-
- /**
- * Add a {@link org.apache.ode.bpel.o.OScope.CorrelationSet} to an {@link Operation}'s list
- * of "non-initiating" correlation sets. The non-initiating correlation sets are those
- * sets that are used (along with the operation) to "match" incoming messages.
- * We need to know which correlation sets are used with which operation in order to
- * pre-compute correlation keys at the time of message receipt.
- * @param operation WSDL {@link Operation}
- * @param cset non-initiating correlation used in this operation
- */
- public void addCorrelationSetForOperation(Operation operation, OScope.CorrelationSet cset) {
- Set<OScope.CorrelationSet> ret = _nonIntitiatingCorrelationSets.get(operation.getName());
- if (ret == null) {
- ret = new HashSet<OScope.CorrelationSet>();
- _nonIntitiatingCorrelationSets.put(operation.getName(), ret);
- }
- ret.add(cset);
-
- }
-
- /**
- * Get all non-initiating correlation sets that are ever used to qualify a receive for a the given
- * operation.
- * @param operation the operation
- * @return all non-initiating correlation sets used in the given operation
- */
- @SuppressWarnings("unchecked")
- public Set<OScope.CorrelationSet> getCorrelationSetsForOperation(Operation operation) {
- Set<OScope.CorrelationSet> ret = _nonIntitiatingCorrelationSets.get(operation.getName());
- if (ret == null) {
- return Collections.EMPTY_SET;
- }
- return Collections.unmodifiableSet(ret);
- }
-
- @SuppressWarnings("unchecked")
- public Operation getMyRoleOperation(String name) {
- for (Operation op : (List<Operation>)myRolePortType.getOperations())
- if (op.getName().equals(name))
- return op;
- return null;
- }
-
- @SuppressWarnings("unchecked")
- public Operation getPartnerRoleOperation(String name) {
- for (Operation op : (List<Operation>)partnerRolePortType.getOperations())
- if (op.getName().equals(name))
- return op;
- return null;
- }
+ static final long serialVersionUID = -1L ;
+ /** partnerLink name. */
+ public String name;
+
+ /** Scope in which this partnerLink is declared. */
+ public OScope declaringScope;
+
+ /** The type of this partnerLink. */
+ public QName partnerLinkType;
+
+ public String partnerRoleName;
+
+ public String myRoleName;
+
+ public PortType myRolePortType;
+
+ public PortType partnerRolePortType;
+
+ public boolean initializePartnerRole;
+
+ /** The set of CorrelationSets that may be used as a match criteria, organized by {@link Operation} */
+ private final HashMap<String,Set<OScope.CorrelationSet>> _nonIntitiatingCorrelationSets = new HashMap<String,Set<OScope.CorrelationSet>>();
+
+ /** The set of {@link Operation}s that can be used to create a process instance. */
+ private final HashSet<String> _createInstanceOperations = new HashSet<String>();
+
+ public OPartnerLink(OProcess owner) {
+ super(owner);
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public boolean hasMyRole() {
+ return myRolePortType != null;
+ }
+
+ public boolean hasPartnerRole() {
+ return partnerRolePortType != null;
+ }
+
+ public boolean isCreateInstanceOperation(Operation op) {
+ return _createInstanceOperations.contains(op.getName());
+ }
+
+ public void addCreateInstanceOperation(Operation operation) {
+ _createInstanceOperations.add(operation.getName());
+ }
+
+ /**
+ * Add a {@link org.apache.ode.bpel.o.OScope.CorrelationSet} to an {@link Operation}'s list
+ * of "non-initiating" correlation sets. The non-initiating correlation sets are those
+ * sets that are used (along with the operation) to "match" incoming messages.
+ * We need to know which correlation sets are used with which operation in order to
+ * pre-compute correlation keys at the time of message receipt.
+ * @param operation WSDL {@link Operation}
+ * @param cset non-initiating correlation used in this operation
+ */
+ public void addCorrelationSetForOperation(Operation operation, OScope.CorrelationSet cset) {
+ Set<OScope.CorrelationSet> ret = _nonIntitiatingCorrelationSets.get(operation.getName());
+ if (ret == null) {
+ ret = new HashSet<OScope.CorrelationSet>();
+ _nonIntitiatingCorrelationSets.put(operation.getName(), ret);
+ }
+ ret.add(cset);
+
+ }
+
+ /**
+ * Get all non-initiating correlation sets that are ever used to qualify a receive for a the given
+ * operation.
+ * @param operation the operation
+ * @return all non-initiating correlation sets used in the given operation
+ */
+ @SuppressWarnings("unchecked")
+ public Set<OScope.CorrelationSet> getCorrelationSetsForOperation(Operation operation) {
+ Set<OScope.CorrelationSet> ret = _nonIntitiatingCorrelationSets.get(operation.getName());
+ if (ret == null) {
+ return Collections.EMPTY_SET;
+ }
+ return Collections.unmodifiableSet(ret);
+ }
+
+ @SuppressWarnings("unchecked")
+ public Operation getMyRoleOperation(String name) {
+ for (Operation op : (List<Operation>)myRolePortType.getOperations())
+ if (op.getName().equals(name))
+ return op;
+ return null;
+ }
+
+ @SuppressWarnings("unchecked")
+ public Operation getPartnerRoleOperation(String name) {
+ for (Operation op : (List<Operation>)partnerRolePortType.getOperations())
+ if (op.getName().equals(name))
+ return op;
+ return null;
+ }
}
Modified: incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OPickReceive.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OPickReceive.java?view=diff&rev=464992&r1=464991&r2=464992
==============================================================================
--- incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OPickReceive.java (original)
+++ incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OPickReceive.java Tue Oct 17 11:38:35 2006
@@ -31,51 +31,51 @@
* between the two.
*/
public class OPickReceive extends OActivity{
- static final long serialVersionUID = -1L ;
- public final List<OnMessage> onMessages = new ArrayList<OnMessage>();
- public final List<OnAlarm> onAlarms = new ArrayList<OnAlarm>();
-
- public boolean createInstanceFlag;
-
- public OPickReceive(OProcess owner) {
- super(owner);
- }
-
- public static class OnAlarm extends OBase {
- static final long serialVersionUID = -1L ;
- public OActivity activity;
- public OExpression forExpr;
- public OExpression untilExpr;
-
- public OnAlarm(OProcess owner) {
- super(owner);
- }
- }
-
- public static class OnMessage extends OBase {
-
static final long serialVersionUID = -1L ;
-
- /** Correlations to initialize. */
- public final List <OScope.CorrelationSet> initCorrelations = new ArrayList<OScope.CorrelationSet>();
-
- /** Correlation set to match on. */
- public OScope.CorrelationSet matchCorrelation;
+ public final List<OnMessage> onMessages = new ArrayList<OnMessage>();
+ public final List<OnAlarm> onAlarms = new ArrayList<OnAlarm>();
- public OPartnerLink partnerLink;
- public Operation operation;
- public OScope.Variable variable;
- public OActivity activity;
+ public boolean createInstanceFlag;
- /** OASIS addition for disambiguating receives (optional). */
- public String messageExchangeId = "";
-
- public OnMessage(OProcess owner) {
- super(owner);
+ public OPickReceive(OProcess owner, OActivity parent) {
+ super(owner, parent);
}
- public String getCorrelatorId() {
- return partnerLink.getId() + "." + operation.getName();
+ public static class OnAlarm extends OBase {
+ static final long serialVersionUID = -1L ;
+ public OActivity activity;
+ public OExpression forExpr;
+ public OExpression untilExpr;
+
+ public OnAlarm(OProcess owner) {
+ super(owner);
+ }
+ }
+
+ public static class OnMessage extends OBase {
+
+ static final long serialVersionUID = -1L ;
+
+ /** Correlations to initialize. */
+ public final List <OScope.CorrelationSet> initCorrelations = new ArrayList<OScope.CorrelationSet>();
+
+ /** Correlation set to match on. */
+ public OScope.CorrelationSet matchCorrelation;
+
+ public OPartnerLink partnerLink;
+ public Operation operation;
+ public OScope.Variable variable;
+ public OActivity activity;
+
+ /** OASIS addition for disambiguating receives (optional). */
+ public String messageExchangeId = "";
+
+ public OnMessage(OProcess owner) {
+ super(owner);
+ }
+
+ public String getCorrelatorId() {
+ return partnerLink.getId() + "." + operation.getName();
+ }
}
- }
}
Modified: incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OProcess.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OProcess.java?view=diff&rev=464992&r1=464991&r2=464992
==============================================================================
--- incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OProcess.java (original)
+++ incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OProcess.java Tue Oct 17 11:38:35 2006
@@ -32,159 +32,159 @@
*/
public class OProcess extends OBase {
- static final long serialVersionUID = -1L ;
+ static final long serialVersionUID = -1L ;
- /** BPEL version. */
- public final String version;
+ /** BPEL version. */
+ public final String version;
- /** Various constants that are needed at runtime. */
- public OConstants constants;
+ /** Various constants that are needed at runtime. */
+ public OConstants constants;
- /** Universally Unique Identifier */
- public String uuid;
+ /** Universally Unique Identifier */
+ public String uuid;
- /** Namespace of the process. */
- public String targetNamespace;
+ /** Namespace of the process. */
+ public String targetNamespace;
- /** Name of the process. */
- public String processName;
+ /** Name of the process. */
+ public String processName;
- /** ProcessImpl-level scope. */
- public OScope procesScope;
+ /** ProcessImpl-level scope. */
+ public OScope procesScope;
- /** All partner links in the process. */
- public final Set<OPartnerLink> allPartnerLinks = new HashSet<OPartnerLink>();
+ /** All partner links in the process. */
+ public final Set<OPartnerLink> allPartnerLinks = new HashSet<OPartnerLink>();
- public final List<OProperty> properties = new ArrayList<OProperty>();
+ public final List<OProperty> properties = new ArrayList<OProperty>();
- /** Date process was compiled. */
- public Date compileDate;
+ /** Date process was compiled. */
+ public Date compileDate;
- int _childIdCounter = 0;
+ int _childIdCounter = 0;
- List<OBase> _children = new ArrayList<OBase>();
-
- public final HashSet<OExpressionLanguage> expressionLanguages = new HashSet<OExpressionLanguage>();
+ List<OBase> _children = new ArrayList<OBase>();
+
+ public final HashSet<OExpressionLanguage> expressionLanguages = new HashSet<OExpressionLanguage>();
- public final HashMap<QName, OMessageVarType> messageTypes = new HashMap<QName, OMessageVarType>();
+ public final HashMap<QName, OMessageVarType> messageTypes = new HashMap<QName, OMessageVarType>();
- public final HashMap<QName, OElementVarType> elementTypes = new HashMap<QName, OElementVarType>();
+ public final HashMap<QName, OElementVarType> elementTypes = new HashMap<QName, OElementVarType>();
- public final HashMap<QName, OXsdTypeVarType> xsdTypes = new HashMap<QName, OXsdTypeVarType>();
+ public final HashMap<QName, OXsdTypeVarType> xsdTypes = new HashMap<QName, OXsdTypeVarType>();
- public final HashMap<URI, OXslSheet> xslSheets = new HashMap<URI, OXslSheet>();
+ public final HashMap<URI, OXslSheet> xslSheets = new HashMap<URI, OXslSheet>();
- public OProcess(String bpelVersion) {
- super(null);
- this.version = bpelVersion;
- }
+ public OProcess(String bpelVersion) {
+ super(null);
+ this.version = bpelVersion;
+ }
- public OBase getChild(final int id) {
- return CollectionsX.find_if(_children, new MemberOfFunction<OBase>() {
- public boolean isMember(OBase o) {
- return o.getId() == id;
- }
- });
- }
+ public OBase getChild(final int id) {
+ return CollectionsX.find_if(_children, new MemberOfFunction<OBase>() {
+ public boolean isMember(OBase o) {
+ return o.getId() == id;
+ }
+ });
+ }
- public List<OBase> getChildren() {
- return _children;
- }
+ public List<OBase> getChildren() {
+ return _children;
+ }
- public OScope getScope(String scopeName) {
- throw new UnsupportedOperationException();
- }
+ public OScope getScope(String scopeName) {
+ throw new UnsupportedOperationException();
+ }
- public Set<OPartnerLink> getAllPartnerLinks() {
- return Collections.unmodifiableSet(allPartnerLinks);
- }
+ public Set<OPartnerLink> getAllPartnerLinks() {
+ return Collections.unmodifiableSet(allPartnerLinks);
+ }
- public OPartnerLink getPartnerLink(String name) {
- for (OPartnerLink partnerLink : allPartnerLinks) {
- if (partnerLink.getName().equals(name)) return partnerLink;
+ public OPartnerLink getPartnerLink(String name) {
+ for (OPartnerLink partnerLink : allPartnerLinks) {
+ if (partnerLink.getName().equals(name)) return partnerLink;
+ }
+ return null;
}
- return null;
- }
- public String getName() {
- return processName;
- }
+ public String getName() {
+ return processName;
+ }
- public Collection getExpressionLanguages() {
- throw new UnsupportedOperationException(); // TODO: implement me!
- }
+ public Collection getExpressionLanguages() {
+ throw new UnsupportedOperationException(); // TODO: implement me!
+ }
- public List<String> getCorrelators() {
- // MOVED from ProcessSchemaGenerator
- List<String> correlators = new ArrayList<String>();
+ public List<String> getCorrelators() {
+ // MOVED from ProcessSchemaGenerator
+ List<String> correlators = new ArrayList<String>();
- for (OPartnerLink plink : getAllPartnerLinks()) {
- if (plink.hasMyRole()) {
- for (Iterator opI = plink.myRolePortType.getOperations().iterator(); opI.hasNext();) {
- Operation op = (Operation)opI.next();
- correlators.add(plink.getId() + "." + op.getName());
+ for (OPartnerLink plink : getAllPartnerLinks()) {
+ if (plink.hasMyRole()) {
+ for (Iterator opI = plink.myRolePortType.getOperations().iterator(); opI.hasNext();) {
+ Operation op = (Operation)opI.next();
+ correlators.add(plink.getId() + "." + op.getName());
+ }
+ }
}
- }
+
+ return correlators;
}
- return correlators;
- }
-
- public static class OProperty extends OBase {
-
- static final long serialVersionUID = -1L ;
- public final List<OPropertyAlias> aliases = new ArrayList<OPropertyAlias>();
- public QName name;
-
- public OProperty(OProcess process) { super(process); }
+ public static class OProperty extends OBase {
+
+ static final long serialVersionUID = -1L ;
+ public final List<OPropertyAlias> aliases = new ArrayList<OPropertyAlias>();
+ public QName name;
+
+ public OProperty(OProcess process) { super(process); }
+
+ public OPropertyAlias getAlias(OVarType messageType) {
+ for (OPropertyAlias aliase : aliases)
+ if (aliase.varType.equals(messageType))
+ return aliase;
+ return null;
+ }
- public OPropertyAlias getAlias(OVarType messageType) {
- for (OPropertyAlias aliase : aliases)
- if (aliase.varType.equals(messageType))
- return aliase;
- return null;
+ public String toString() {
+ return "{OProperty " + name + "}";
+ }
}
- public String toString() {
- return "{OProperty " + name + "}";
- }
- }
+ public static class OPropertyAlias extends OBase {
+
+ static final long serialVersionUID = -1L ;
- public static class OPropertyAlias extends OBase {
-
- static final long serialVersionUID = -1L ;
+ public OVarType varType;
- public OVarType varType;
+ /** For BPEL 1.1 */
+ public OMessageVarType.Part part;
- /** For BPEL 1.1 */
- public OMessageVarType.Part part;
+ public OExpression location;
- public OExpression location;
+ public OPropertyAlias(OProcess owner) {super(owner); }
- public OPropertyAlias(OProcess owner) {super(owner); }
+ public String toString() {
+ return "{OPropertyAlias " + getDescription() + "}";
+ }
- public String toString() {
- return "{OPropertyAlias " + getDescription() + "}";
+ public String getDescription() {
+ StringBuffer buf = new StringBuffer(varType.toString());
+ buf.append('[');
+ buf.append(part != null ? part.name : "");
+ if (location != null) {
+ buf.append("][");
+ buf.append(location.toString());
+ }
+ buf.append(']');
+ return buf.toString();
+ }
+
}
- public String getDescription() {
- StringBuffer buf = new StringBuffer(varType.toString());
- buf.append('[');
- buf.append(part != null ? part.name : "");
- if (location != null) {
- buf.append("][");
- buf.append(location.toString());
- }
- buf.append(']');
- return buf.toString();
+ public QName getQName() {
+ return new QName(targetNamespace, processName);
}
-
- }
-
- public QName getQName() {
- return new QName(targetNamespace, processName);
- }
}
Modified: incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OReply.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OReply.java?view=diff&rev=464992&r1=464991&r2=464992
==============================================================================
--- incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OReply.java (original)
+++ incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OReply.java Tue Oct 17 11:38:35 2006
@@ -29,28 +29,28 @@
*/
public class OReply extends OActivity {
- static final long serialVersionUID = -1L ;
+ static final long serialVersionUID = -1L ;
- /** Is this a Fault reply? */
- public boolean isFaultReply;
+ /** Is this a Fault reply? */
+ public boolean isFaultReply;
- /** The type of the fault (if isFaultReply). */
- public Fault fault;
+ /** The type of the fault (if isFaultReply). */
+ public Fault fault;
- public OPartnerLink partnerLink;
- public Operation operation;
- public OScope.Variable variable;
+ public OPartnerLink partnerLink;
+ public Operation operation;
+ public OScope.Variable variable;
- /** Correlation sets initialized. */
- public final List<OScope.CorrelationSet> initCorrelations = new ArrayList<OScope.CorrelationSet>();
+ /** Correlation sets initialized. */
+ public final List<OScope.CorrelationSet> initCorrelations = new ArrayList<OScope.CorrelationSet>();
- /** Correlation sets asserted. */
- public final List<OScope.CorrelationSet> assertCorrelations = new ArrayList<OScope.CorrelationSet>();
+ /** Correlation sets asserted. */
+ public final List<OScope.CorrelationSet> assertCorrelations = new ArrayList<OScope.CorrelationSet>();
- /** OASIS modification - Message Exchange Id. */
- public String messageExchangeId = "";
+ /** OASIS modification - Message Exchange Id. */
+ public String messageExchangeId = "";
- public OReply(OProcess owner) {
- super(owner);
- }
+ public OReply(OProcess owner, OActivity parent) {
+ super(owner, parent);
+ }
}
Modified: incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/ORethrow.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/ORethrow.java?view=diff&rev=464992&r1=464991&r2=464992
==============================================================================
--- incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/ORethrow.java (original)
+++ incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/ORethrow.java Tue Oct 17 11:38:35 2006
@@ -20,9 +20,9 @@
public class ORethrow extends OActivity {
- static final long serialVersionUID = -1L ;
+ static final long serialVersionUID = -1L ;
- public ORethrow(OProcess owner) {
- super(owner);
- }
+ public ORethrow(OProcess owner, OActivity parent) {
+ super(owner, parent);
+ }
}
Modified: incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OScope.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OScope.java?view=diff&rev=464992&r1=464991&r2=464992
==============================================================================
--- incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OScope.java (original)
+++ incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OScope.java Tue Oct 17 11:38:35 2006
@@ -27,124 +27,124 @@
*/
public class OScope extends OActivity {
- static final long serialVersionUID = -1L ;
+ static final long serialVersionUID = -1L ;
- /** Name of the scope. */
- public String name;
+ /** Name of the scope. */
+ public String name;
- /** ScopeLikeConstructImpl's fault handler. */
- public OFaultHandler faultHandler;
+ /** ScopeLikeConstructImpl's fault handler. */
+ public OFaultHandler faultHandler;
- /** The activity that gets executed within this scope. */
- public OActivity activity;
-
- /** ScopeLikeConstructImpl's compensation handler. */
- public OCompensationHandler compensationHandler;
-
- /** ScopeLikeConstructImpl's termination handler. */
- public OTerminationHandler terminationHandler;
-
- /** ScopeLikeConstructImpl's event handler. */
- public OEventHandler eventHandler;
-
- /** Variables declared within the scope. */
- public final HashMap<String,Variable> variables = new HashMap<String,Variable>();
-
- /** OCorrelation sets declared within the scope. */
- public final Map<String,CorrelationSet> correlationSets = new HashMap<String, CorrelationSet>();
-
- public final Map<String, OPartnerLink> partnerLinks = new HashMap<String,OPartnerLink>();
-
- /** The descendants of this scope that can be compensated from the FH/CH of this scope. */
- public final Set<OScope> compensatable = new HashSet<OScope>();
-
- public OScope(OProcess owner) {
- super(owner);
- }
-
- /**
- * Obtains the correlation set visible in current scope or parent scope.
- *
- * @param corrName correlation set name
- *
- * @return
- */
- public CorrelationSet getCorrelationSet(String corrName) {
- return correlationSets.get(corrName);
- }
-
- /**
- *
- * Get a localy-defined variable by name.
- * @param varName name of variable
- *
- * @return
- */
- public Variable getLocalVariable(final String varName) {
- return variables.get(varName);
- }
-
- public void addLocalVariable(Variable variable) {
- variables.put(variable.name, variable);
- }
-
- public Variable getVisibleVariable(String varName) {
- // TODO: implement
- assert false;
- return null; //To change body of created methods use File | Settings | File Templates.
- }
-
- public OPartnerLink getLocalPartnerLink(String name) {
- return partnerLinks.get(name);
- }
-
-
- public void addCorrelationSet(CorrelationSet ocset) {
- correlationSets.put(ocset.name, ocset);
- }
-
- public String toString() {
- return "{OScope '" + name + "' id=" + getId() + "}";
- }
+ /** The activity that gets executed within this scope. */
+ public OActivity activity;
- public static final class CorrelationSet extends OBase {
+ /** ScopeLikeConstructImpl's compensation handler. */
+ public OCompensationHandler compensationHandler;
- static final long serialVersionUID = -1L ;
- public String name;
- public OScope declaringScope;
- public final List<OProcess.OProperty>properties = new ArrayList<OProcess.OProperty>();
+ /** ScopeLikeConstructImpl's termination handler. */
+ public OTerminationHandler terminationHandler;
+
+ /** ScopeLikeConstructImpl's event handler. */
+ public OEventHandler eventHandler;
+
+ /** Variables declared within the scope. */
+ public final HashMap<String,Variable> variables = new HashMap<String,Variable>();
+ /** OCorrelation sets declared within the scope. */
+ public final Map<String,CorrelationSet> correlationSets = new HashMap<String, CorrelationSet>();
- public CorrelationSet(OProcess owner) {
- super(owner);
+ public final Map<String, OPartnerLink> partnerLinks = new HashMap<String,OPartnerLink>();
+
+ /** The descendants of this scope that can be compensated from the FH/CH of this scope. */
+ public final Set<OScope> compensatable = new HashSet<OScope>();
+
+ public OScope(OProcess owner, OActivity parent) {
+ super(owner, parent);
}
- public String toString() {
- return "{CSet " + name + " " + properties + "}";
+ /**
+ * Obtains the correlation set visible in current scope or parent scope.
+ *
+ * @param corrName correlation set name
+ *
+ * @return
+ */
+ public CorrelationSet getCorrelationSet(String corrName) {
+ return correlationSets.get(corrName);
}
- }
- public static final class Variable extends OBase {
- static final long serialVersionUID = -1L ;
- public String name;
- public OScope declaringScope;
- public OVarType type;
+ /**
+ *
+ * Get a localy-defined variable by name.
+ * @param varName name of variable
+ *
+ * @return
+ */
+ public Variable getLocalVariable(final String varName) {
+ return variables.get(varName);
+ }
- public Variable(OProcess owner, OVarType type) {
- super(owner);
- this.type = type;
+ public void addLocalVariable(Variable variable) {
+ variables.put(variable.name, variable);
+ }
+
+ public Variable getVisibleVariable(String varName) {
+ // TODO: implement
+ assert false;
+ return null; //To change body of created methods use File | Settings | File Templates.
+ }
+
+ public OPartnerLink getLocalPartnerLink(String name) {
+ return partnerLinks.get(name);
+ }
+
+
+ public void addCorrelationSet(CorrelationSet ocset) {
+ correlationSets.put(ocset.name, ocset);
}
public String toString() {
- return "{Variable " + getDescription() + ":" + type + "}";
+ return "{OScope '" + name + "' id=" + getId() + "}";
+ }
+
+ public static final class CorrelationSet extends OBase {
+
+ static final long serialVersionUID = -1L ;
+ public String name;
+ public OScope declaringScope;
+ public final List<OProcess.OProperty>properties = new ArrayList<OProcess.OProperty>();
+
+
+ public CorrelationSet(OProcess owner) {
+ super(owner);
+ }
+
+ public String toString() {
+ return "{CSet " + name + " " + properties + "}";
+ }
}
- public String getDescription() {
- StringBuffer buf = new StringBuffer(declaringScope.name);
- buf.append('.');
- buf.append(name);
- return buf.toString();
+ public static final class Variable extends OBase {
+ static final long serialVersionUID = -1L ;
+ public String name;
+ public OScope declaringScope;
+ public OVarType type;
+
+ public Variable(OProcess owner, OVarType type) {
+ super(owner);
+ this.type = type;
+ }
+
+ public String toString() {
+ return "{Variable " + getDescription() + ":" + type + "}";
+ }
+
+ public String getDescription() {
+ StringBuffer buf = new StringBuffer(declaringScope.name);
+ buf.append('.');
+ buf.append(name);
+ return buf.toString();
+ }
}
- }
}
Modified: incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OSequence.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OSequence.java?view=diff&rev=464992&r1=464991&r2=464992
==============================================================================
--- incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OSequence.java (original)
+++ incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OSequence.java Tue Oct 17 11:38:35 2006
@@ -26,11 +26,11 @@
* Compiled representation of the BPEL <code><sequence></code> activity.
*/
public class OSequence extends OActivity {
- static final long serialVersionUID = -1L ;
+ static final long serialVersionUID = -1L ;
- public final List<OActivity> sequence = new ArrayList<OActivity>();
+ public final List<OActivity> sequence = new ArrayList<OActivity>();
- public OSequence(OProcess owner) {
- super(owner);
- }
+ public OSequence(OProcess owner, OActivity parent) {
+ super(owner, parent);
+ }
}
Modified: incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OSwitch.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OSwitch.java?view=diff&rev=464992&r1=464991&r2=464992
==============================================================================
--- incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OSwitch.java (original)
+++ incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OSwitch.java Tue Oct 17 11:38:35 2006
@@ -28,32 +28,32 @@
* BPEL compiler generates instances of this class.
*/
public class OSwitch extends OActivity {
- static final long serialVersionUID = -1L ;
+ static final long serialVersionUID = -1L ;
- /**
- * The cases declared within the <code><switch></code> actvity.
- */
- private final List<OCase> _cases = new ArrayList<OCase> ();
-
- public OSwitch(OProcess owner) {
- super(owner);
- }
-
- public void addCase(OCase acase) {
- _cases.add(acase);
- }
-
- public List<OCase> getCases() {
- return Collections.unmodifiableList(_cases);
- }
-
- public static class OCase extends OBase {
- private static final long serialVersionUID = 1L;
- public OExpression expression;
- public OActivity activity;
+ /**
+ * The cases declared within the <code><switch></code> actvity.
+ */
+ private final List<OCase> _cases = new ArrayList<OCase> ();
- public OCase(OProcess owner) {
- super(owner);
+ public OSwitch(OProcess owner, OActivity parent) {
+ super(owner, parent);
+ }
+
+ public void addCase(OCase acase) {
+ _cases.add(acase);
+ }
+
+ public List<OCase> getCases() {
+ return Collections.unmodifiableList(_cases);
+ }
+
+ public static class OCase extends OBase {
+ private static final long serialVersionUID = 1L;
+ public OExpression expression;
+ public OActivity activity;
+
+ public OCase(OProcess owner) {
+ super(owner);
+ }
}
- }
}
Modified: incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OTerminate.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OTerminate.java?view=diff&rev=464992&r1=464991&r2=464992
==============================================================================
--- incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OTerminate.java (original)
+++ incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OTerminate.java Tue Oct 17 11:38:35 2006
@@ -23,8 +23,9 @@
*/
public class OTerminate extends OActivity {
- static final long serialVersionUID = -1L ;
- public OTerminate(OProcess owner) {
- super(owner);
- }
+ static final long serialVersionUID = -1L ;
+
+ public OTerminate(OProcess owner, OActivity parent) {
+ super(owner, parent);
+ }
}
Modified: incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OTerminationHandler.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OTerminationHandler.java?view=diff&rev=464992&r1=464991&r2=464992
==============================================================================
--- incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OTerminationHandler.java (original)
+++ incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OTerminationHandler.java Tue Oct 17 11:38:35 2006
@@ -19,7 +19,7 @@
package org.apache.ode.bpel.o;
public class OTerminationHandler extends OScope {
- public OTerminationHandler(OProcess owner) {
- super(owner);
- }
+ public OTerminationHandler(OProcess owner, OActivity parent) {
+ super(owner, parent);
+ }
}
Modified: incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OThrow.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OThrow.java?view=diff&rev=464992&r1=464991&r2=464992
==============================================================================
--- incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OThrow.java (original)
+++ incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OThrow.java Tue Oct 17 11:38:35 2006
@@ -24,12 +24,12 @@
* Compiled representation of the BPEL <code><throw></code> activity.
*/
public class OThrow extends OActivity {
-
- static final long serialVersionUID = -1L ;
- public OScope.Variable faultVariable;
- public QName faultName;
+
+ static final long serialVersionUID = -1L ;
+ public OScope.Variable faultVariable;
+ public QName faultName;
- public OThrow(OProcess owner) {
- super(owner);
- }
+ public OThrow(OProcess owner, OActivity parent) {
+ super(owner, parent);
+ }
}
Modified: incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OVarType.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OVarType.java?view=diff&rev=464992&r1=464991&r2=464992
==============================================================================
--- incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OVarType.java (original)
+++ incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OVarType.java Tue Oct 17 11:38:35 2006
@@ -25,15 +25,15 @@
* Base class for variable types.
*/
public abstract class OVarType extends OBase {
-
- public OVarType(OProcess owner) {
- super(owner);
- }
-
- /**
- * Create a new instance of this variable.
- * @return a "skeleton" representation of this variable
- */
- public abstract Node newInstance(Document doc);
+
+ public OVarType(OProcess owner) {
+ super(owner);
+ }
+
+ /**
+ * Create a new instance of this variable.
+ * @return a "skeleton" representation of this variable
+ */
+ public abstract Node newInstance(Document doc);
}
Modified: incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OWait.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OWait.java?view=diff&rev=464992&r1=464991&r2=464992
==============================================================================
--- incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OWait.java (original)
+++ incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OWait.java Tue Oct 17 11:38:35 2006
@@ -23,25 +23,25 @@
*/
public class OWait extends OActivity {
- static final long serialVersionUID = -1L ;
+ static final long serialVersionUID = -1L ;
- public OExpression forExpression;
- public OExpression untilExpression;
+ public OExpression forExpression;
+ public OExpression untilExpression;
- public OWait(OProcess owner) {
- super(owner);
- }
+ public OWait(OProcess owner, OActivity parent) {
+ super(owner, parent);
+ }
- /**
- * Is wait a duration?
- * @return
- */
- public boolean hasFor() { return forExpression != null; }
-
- /**
- * Is wait an until?
- * @return
- */
- public boolean hasUntil() { return untilExpression != null; }
+ /**
+ * Is wait a duration?
+ * @return
+ */
+ public boolean hasFor() { return forExpression != null; }
+
+ /**
+ * Is wait an until?
+ * @return
+ */
+ public boolean hasUntil() { return untilExpression != null; }
}
Modified: incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OWhile.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OWhile.java?view=diff&rev=464992&r1=464991&r2=464992
==============================================================================
--- incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OWhile.java (original)
+++ incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OWhile.java Tue Oct 17 11:38:35 2006
@@ -23,13 +23,13 @@
*/
public class OWhile extends OActivity {
- static final long serialVersionUID = -1L ;
- /** The while condition. */
- public OExpression whileCondition;
+ static final long serialVersionUID = -1L ;
+ /** The while condition. */
+ public OExpression whileCondition;
- public OActivity activity;
+ public OActivity activity;
- public OWhile(OProcess owner) {
- super(owner);
- }
+ public OWhile(OProcess owner, OActivity parent) {
+ super(owner, parent);
+ }
}
Modified: incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OXslSheet.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OXslSheet.java?view=diff&rev=464992&r1=464991&r2=464992
==============================================================================
--- incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OXslSheet.java (original)
+++ incubator/ode/trunk/bpel-obj/src/main/java/org/apache/ode/bpel/o/OXslSheet.java Tue Oct 17 11:38:35 2006
@@ -26,13 +26,13 @@
*/
public class OXslSheet extends OBase {
- private static final long serialVersionUID = 1L;
+ private static final long serialVersionUID = 1L;
- public URI uri;
- public String sheetBody;
+ public URI uri;
+ public String sheetBody;
- public OXslSheet(OProcess owner) {
- super(owner);
- }
+ public OXslSheet(OProcess owner) {
+ super(owner);
+ }
}