You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by mr...@apache.org on 2008/08/01 02:29:45 UTC
svn commit: r681565 [3/5] - in /ode/branches/rtver: ./
bpel-api/src/main/java/org/apache/ode/bpel/common/
bpel-api/src/main/java/org/apache/ode/bpel/explang/
bpel-api/src/main/java/org/apache/ode/bpel/pmapi/
bpel-compiler/src/main/java/org/apache/ode/b...
Copied: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ExprEvaluationContextImpl.java (from r680846, ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ExprEvaluationContextImpl.java)
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ExprEvaluationContextImpl.java?p2=ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ExprEvaluationContextImpl.java&p1=ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ExprEvaluationContextImpl.java&r1=680846&r2=681565&rev=681565&view=diff
==============================================================================
--- ode/branches/rtver/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ExprEvaluationContextImpl.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ExprEvaluationContextImpl.java Thu Jul 31 17:29:41 2008
@@ -16,9 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.runtime;
+package org.apache.ode.bpel.rtrep.v2;
-import java.net.URI;
import java.util.Map;
import org.apache.commons.logging.Log;
@@ -26,25 +25,17 @@
import org.apache.ode.bpel.common.FaultException;
import org.apache.ode.bpel.evt.ScopeEvent;
import org.apache.ode.bpel.evt.VariableReadEvent;
-import org.apache.ode.bpel.explang.EvaluationContext;
-import org.apache.ode.bpel.o.OConstantVarType;
-import org.apache.ode.bpel.o.OExpression;
-import org.apache.ode.bpel.o.OLink;
-import org.apache.ode.bpel.o.OMessageVarType;
-import org.apache.ode.bpel.o.OProcess;
-import org.apache.ode.bpel.o.OScope;
-import org.apache.ode.bpel.o.OMessageVarType.Part;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
/**
- * The context in which BPEL expressions are evaluated. This class is handed of the {@link org.apache.ode.bpel.o.OExpression}
+ * The context in which BPEL expressions are evaluated. This class is handed of the OExpression
* instances to provide access to variables, link statuses, and the like.
*/
public class ExprEvaluationContextImpl implements EvaluationContext {
private static final Log __log = LogFactory.getLog(ExprEvaluationContextImpl.class);
- private BpelRuntimeContext _native;
+ private RuntimeInstanceImpl _native;
private ScopeFrame _scopeInstance;
@@ -52,17 +43,17 @@
private Node _root;
- public ExprEvaluationContextImpl(ScopeFrame scopeInstace, BpelRuntimeContext ntv) {
+ public ExprEvaluationContextImpl(ScopeFrame scopeInstace, RuntimeInstanceImpl ntv) {
_native = ntv;
_scopeInstance = scopeInstace;
}
- public ExprEvaluationContextImpl(ScopeFrame scopeInstace, BpelRuntimeContext ntv, Node root) {
+ public ExprEvaluationContextImpl(ScopeFrame scopeInstace, RuntimeInstanceImpl ntv, Node root) {
this(scopeInstace, ntv);
_root = root;
}
- public ExprEvaluationContextImpl(ScopeFrame scopeInstnce, BpelRuntimeContext ntv, Map<OLink, Boolean> linkVals) {
+ public ExprEvaluationContextImpl(ScopeFrame scopeInstnce, RuntimeInstanceImpl ntv, Map<OLink, Boolean> linkVals) {
this(scopeInstnce, ntv);
_linkVals = linkVals;
}
@@ -83,7 +74,7 @@
VariableReadEvent vre = new VariableReadEvent();
vre.setVarName(varInstance.declaration.name);
sendEvent(vre);
- ret = _scopeInstance.fetchVariableData(_native, varInstance, part, false);
+ ret = _native.fetchVariableData(varInstance, part, false);
}
return ret;
}
@@ -109,8 +100,8 @@
return _root;
}
- public Node getPartData(Element message, Part part) throws FaultException {
- return _scopeInstance.getPartData(message, part);
+ public Node getPartData(Element message, OMessageVarType.Part part) throws FaultException {
+ return _native.getPartData(message, part);
}
public Long getProcessId() {
@@ -126,8 +117,4 @@
_native.sendEvent(se);
}
- public URI getBaseResourceURI() {
- return _native.getBaseResourceURI();
- }
-
}
Copied: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ExpressionLanguageRuntime.java (from r680846, ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/explang/ExpressionLanguageRuntime.java)
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ExpressionLanguageRuntime.java?p2=ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ExpressionLanguageRuntime.java&p1=ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/explang/ExpressionLanguageRuntime.java&r1=680846&r2=681565&rev=681565&view=diff
==============================================================================
--- ode/branches/rtver/bpel-api/src/main/java/org/apache/ode/bpel/explang/ExpressionLanguageRuntime.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ExpressionLanguageRuntime.java Thu Jul 31 17:29:41 2008
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.explang;
+package org.apache.ode.bpel.rtrep.v2;
import org.apache.ode.bpel.common.FaultException;
-import org.apache.ode.bpel.o.OExpression;
+import org.apache.ode.bpel.rtrep.common.ConfigurationException;
import org.apache.ode.utils.xsd.Duration;
import org.w3c.dom.Node;
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ExpressionLanguageRuntimeRegistry.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ExpressionLanguageRuntimeRegistry.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ExpressionLanguageRuntimeRegistry.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ExpressionLanguageRuntimeRegistry.java Thu Jul 31 17:29:41 2008
@@ -16,14 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.runtime;
+package org.apache.ode.bpel.rtrep.v2;
import org.apache.ode.bpel.common.FaultException;
-import org.apache.ode.bpel.explang.ConfigurationException;
-import org.apache.ode.bpel.explang.EvaluationContext;
-import org.apache.ode.bpel.explang.ExpressionLanguageRuntime;
-import org.apache.ode.bpel.o.OExpression;
-import org.apache.ode.bpel.o.OExpressionLanguage;
+import org.apache.ode.bpel.rtrep.common.ConfigurationException;
import org.apache.ode.utils.xsd.Duration;
import org.w3c.dom.Node;
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ExtensionContextImpl.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ExtensionContextImpl.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ExtensionContextImpl.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ExtensionContextImpl.java Thu Jul 31 17:29:41 2008
@@ -16,27 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.runtime;
+package org.apache.ode.bpel.rtrep.v2;
-import java.io.PrintWriter;
-import java.io.StringWriter;
-import java.util.HashMap;
import java.util.Map;
-
-import javax.xml.namespace.QName;
+import java.util.HashMap;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ode.bpel.common.FaultException;
-import org.apache.ode.bpel.compiler.bom.Bpel20QNames;
-import org.apache.ode.bpel.evt.ScopeEvent;
-import org.apache.ode.bpel.evt.VariableModificationEvent;
-import org.apache.ode.bpel.o.OActivity;
-import org.apache.ode.bpel.o.OScope;
-import org.apache.ode.bpel.o.OProcess.OProperty;
-import org.apache.ode.bpel.o.OScope.Variable;
-import org.apache.ode.bpel.runtime.channels.FaultData;
-import org.apache.ode.bpel.runtime.extension.ExtensionContext;
+import org.apache.ode.bpel.rtrep.common.extension.ExtensionContext;
import org.apache.ode.bpel.evar.ExternalVariableModuleException;
import org.w3c.dom.Node;
@@ -47,13 +35,11 @@
public class ExtensionContextImpl implements ExtensionContext {
private static final Log __log = LogFactory.getLog(ExtensionContextImpl.class);
- private BpelRuntimeContext _context;
+ private RuntimeInstanceImpl _context;
private ScopeFrame _scopeFrame;
private ActivityInfo _activityInfo;
- private boolean hasCompleted = false;
-
- public ExtensionContextImpl(ActivityInfo activityInfo, ScopeFrame scopeFrame, BpelRuntimeContext context) {
+ public ExtensionContextImpl(ActivityInfo activityInfo, ScopeFrame scopeFrame, RuntimeInstanceImpl context) {
_activityInfo = activityInfo;
_context = context;
_scopeFrame = scopeFrame;
@@ -63,8 +49,8 @@
return _context.getPid();
}
- public Map<String, Variable> getVisibleVariables() throws FaultException {
- Map<String, Variable> visVars = new HashMap<String, Variable>();
+ public Map<String, OScope.Variable> getVisibleVariables() throws FaultException {
+ Map<String, OScope.Variable> visVars = new HashMap<String, OScope.Variable>();
OActivity current = _scopeFrame.oscope;
while (current != null) {
@@ -81,39 +67,36 @@
return visVars;
}
- public String readMessageProperty(Variable variable, OProperty property)
+ public String readMessageProperty(OScope.Variable variable, OProcess.OProperty property)
throws FaultException {
VariableInstance vi = _scopeFrame.resolve(variable);
return _context.readProperty(vi, property);
}
- public Node readVariable(Variable variable)
+ public Node readVariable(OScope.Variable variable)
throws FaultException {
VariableInstance vi = _scopeFrame.resolve(variable);
- return _scopeFrame.fetchVariableData(_context, vi, true);
+ return _context.fetchVariableData(vi, true);
}
public void writeVariable(String variableName, Node value)
throws FaultException, ExternalVariableModuleException {
VariableInstance vi = _scopeFrame.resolve(getVisibleVariable(variableName));
- _scopeFrame.commitChanges(_context, vi, value);
+ _context.commitChanges(vi, value);
}
public Node readVariable(String variableName) throws FaultException {
VariableInstance vi = _scopeFrame.resolve(getVisibleVariable(variableName));
- return _scopeFrame.fetchVariableData(_context, vi, true);
+ return _context.fetchVariableData(vi, true);
}
- public void writeVariable(Variable variable, Node value)
+ public void writeVariable(OScope.Variable variable, Node value)
throws FaultException, ExternalVariableModuleException {
- VariableInstance vi = _scopeFrame.resolve(variable);
- _scopeFrame.commitChanges(_context, vi, value);
- VariableModificationEvent vme = new VariableModificationEvent(variable.name);
- vme.setNewValue(value);
- sendEvent(vme);
+ VariableInstance vi = _scopeFrame.resolve(variable);
+ _context.commitChanges(vi, value);
}
- private Variable getVisibleVariable(String varName) {
+ private OScope.Variable getVisibleVariable(String varName) {
return _scopeFrame.oscope.getVisibleVariable(varName);
}
@@ -125,53 +108,4 @@
return _activityInfo.o;
}
- public BpelRuntimeContext getBpelRuntimeContext() {
- return _context;
- }
-
- public void sendEvent(ScopeEvent event) {
- if (event.getLineNo() == -1 && _activityInfo.o.debugInfo != null) {
- event.setLineNo(_activityInfo.o.debugInfo.startLine);
- }
- _scopeFrame.fillEventInfo(event);
- getBpelRuntimeContext().sendEvent(event);
- }
-
- public void complete() {
- if (!hasCompleted) {
- _activityInfo.parent.completed(null, CompensationHandler.emptySet());
- hasCompleted = true;
- } else {
- if (__log.isWarnEnabled()) {
- __log.warn("Activity '" + _activityInfo.o.name + "' has already been completed.");
- }
- }
- }
-
- public void completeWithFault(Throwable t) {
- if (!hasCompleted) {
- StringWriter sw = new StringWriter();
- t.printStackTrace(new PrintWriter(sw));
- FaultData fault = new FaultData(new QName(Bpel20QNames.NS_WSBPEL2_0, "subLanguageExecutionFault"), _activityInfo.o, sw.getBuffer().toString());
- _activityInfo.parent.completed(fault, CompensationHandler.emptySet());
- hasCompleted = true;
- } else {
- if (__log.isWarnEnabled()) {
- __log.warn("Activity '" + _activityInfo.o.name + "' has already been completed.");
- }
- }
- }
-
- public void completeWithFault(FaultException ex) {
- if (!hasCompleted) {
- FaultData fault = new FaultData(ex.getQName(), _activityInfo.o, ex.getMessage());
- _activityInfo.parent.completed(fault, CompensationHandler.emptySet());
- hasCompleted = true;
- } else {
- if (__log.isWarnEnabled()) {
- __log.warn("Activity '" + _activityInfo.o.name + "' has already been completed.");
- }
- }
-
- }
}
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/FLOW.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/FLOW.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/FLOW.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/FLOW.java Thu Jul 31 17:29:41 2008
@@ -16,18 +16,14 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.runtime;
+package org.apache.ode.bpel.rtrep.v2;
-import org.apache.ode.bpel.o.OActivity;
-import org.apache.ode.bpel.o.OFlow;
-import org.apache.ode.bpel.o.OLink;
-import org.apache.ode.bpel.o.OScope;
-import org.apache.ode.bpel.runtime.channels.FaultData;
-import org.apache.ode.bpel.runtime.channels.LinkStatusChannel;
-import org.apache.ode.bpel.runtime.channels.ParentScopeChannel;
-import org.apache.ode.bpel.runtime.channels.ParentScopeChannelListener;
-import org.apache.ode.bpel.runtime.channels.TerminationChannel;
-import org.apache.ode.bpel.runtime.channels.TerminationChannelListener;
+import org.apache.ode.bpel.rtrep.v2.channels.FaultData;
+import org.apache.ode.bpel.rtrep.v2.channels.LinkStatusChannel;
+import org.apache.ode.bpel.rtrep.v2.channels.ParentScopeChannel;
+import org.apache.ode.bpel.rtrep.v2.channels.ParentScopeChannelListener;
+import org.apache.ode.bpel.rtrep.v2.channels.TerminationChannel;
+import org.apache.ode.bpel.rtrep.v2.channels.TerminationChannelListener;
import org.apache.ode.jacob.ChannelListener;
import org.apache.ode.jacob.SynchChannel;
import org.apache.ode.utils.stl.FilterIterator;
@@ -49,23 +45,19 @@
super(self,frame, linkFrame);
_oflow = (OFlow) self.o;
}
-
+
public void run() {
LinkFrame myLinkFrame = new LinkFrame(_linkFrame);
- for (Iterator<OLink> i = _oflow.localLinks.iterator(); i.hasNext(); ) {
- OLink link = i.next();
+ for (OLink link : _oflow.localLinks) {
LinkStatusChannel lsc = newChannel(LinkStatusChannel.class);
- myLinkFrame.links.put(link,new LinkInfo(link,lsc));
+ myLinkFrame.links.put(link, new LinkInfo(link, lsc));
}
- for (Iterator<OActivity> i = _oflow.parallelActivities.iterator(); i.hasNext();) {
- OActivity ochild = i.next();
- ChildInfo childInfo = new ChildInfo(
- new ActivityInfo(genMonotonic(), ochild,
- newChannel(TerminationChannel.class), newChannel(ParentScopeChannel.class)));
+ for (OActivity ochild : _oflow.parallelActivities) {
+ ChildInfo childInfo = new ChildInfo(new ActivityInfo(genMonotonic(), ochild,
+ newChannel(TerminationChannel.class), newChannel(ParentScopeChannel.class)));
_children.add(childInfo);
-
- instance(createChild(childInfo.activity,_scopeFrame, myLinkFrame));
+ instance(createChild(childInfo.activity, _scopeFrame, myLinkFrame));
}
instance(new ACTIVE());
}
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/FOREACH.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/FOREACH.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/FOREACH.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/FOREACH.java Thu Jul 31 17:29:41 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.ode.bpel.runtime;
+package org.apache.ode.bpel.rtrep.v2;
import java.util.HashSet;
import java.util.Iterator;
@@ -27,20 +27,16 @@
import org.apache.commons.logging.LogFactory;
import org.apache.ode.bpel.common.FaultException;
import org.apache.ode.bpel.evt.VariableModificationEvent;
-import org.apache.ode.bpel.o.OExpression;
-import org.apache.ode.bpel.o.OForEach;
-import org.apache.ode.bpel.o.OScope;
-import org.apache.ode.bpel.runtime.channels.FaultData;
-import org.apache.ode.bpel.runtime.channels.ParentScopeChannel;
-import org.apache.ode.bpel.runtime.channels.ParentScopeChannelListener;
-import org.apache.ode.bpel.runtime.channels.TerminationChannel;
-import org.apache.ode.bpel.runtime.channels.TerminationChannelListener;
+import org.apache.ode.bpel.rtrep.v2.channels.FaultData;
+import org.apache.ode.bpel.rtrep.v2.channels.ParentScopeChannel;
+import org.apache.ode.bpel.rtrep.v2.channels.ParentScopeChannelListener;
+import org.apache.ode.bpel.rtrep.v2.channels.TerminationChannel;
+import org.apache.ode.bpel.rtrep.v2.channels.TerminationChannelListener;
import org.apache.ode.jacob.ChannelListener;
import org.apache.ode.jacob.SynchChannel;
import org.apache.ode.utils.DOMUtils;
import org.apache.ode.utils.stl.FilterIterator;
import org.apache.ode.utils.stl.MemberOfFunction;
-import org.apache.ode.bpel.evar.ExternalVariableModuleException;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -184,7 +180,7 @@
private int evaluateCondition(OExpression condition)
throws FaultException {
try {
- return getBpelRuntimeContext().getExpLangRuntime().
+ return getBpelRuntime().getExpLangRuntime().
evaluateAsNumber(condition, getEvaluationContext()).intValue();
} catch (FaultException e) {
String msg;
@@ -206,17 +202,11 @@
// Instantiating the scope directly to keep control of its scope frame, allows
// the introduction of the counter variable in there (monkey business that is).
ScopeFrame newFrame = new ScopeFrame(
- _oforEach.innerScope, getBpelRuntimeContext().createScopeInstance(_scopeFrame.scopeInstanceId,
+ _oforEach.innerScope, getBpelRuntime().createScopeInstance(_scopeFrame.scopeInstanceId,
_oforEach.innerScope), _scopeFrame, null);
VariableInstance vinst = newFrame.resolve(_oforEach.counterVariable);
- try {
- initializeVariable(vinst, counterNode);
- } catch (ExternalVariableModuleException e) {
- __log.error("Exception while initializing external variable", e);
- _self.parent.failure(e.toString(), null);
- return;
- }
+ getBpelRuntime().initializeVariable(vinst, counterNode);
// Generating event
VariableModificationEvent se = new VariableModificationEvent(vinst.declaration.name);
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/INVOKE.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/INVOKE.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/INVOKE.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/INVOKE.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.runtime;
+package org.apache.ode.bpel.rtrep.v2;
import java.util.Collection;
import java.util.Date;
@@ -29,17 +29,14 @@
import org.apache.ode.bpel.evt.ActivityFailureEvent;
import org.apache.ode.bpel.evt.ActivityRecoveryEvent;
import org.apache.ode.bpel.evt.VariableModificationEvent;
-import org.apache.ode.bpel.o.OFailureHandling;
-import org.apache.ode.bpel.o.OInvoke;
-import org.apache.ode.bpel.o.OScope;
-import org.apache.ode.bpel.runtime.channels.ActivityRecoveryChannel;
-import org.apache.ode.bpel.runtime.channels.ActivityRecoveryChannelListener;
-import org.apache.ode.bpel.runtime.channels.FaultData;
-import org.apache.ode.bpel.runtime.channels.InvokeResponseChannel;
-import org.apache.ode.bpel.runtime.channels.InvokeResponseChannelListener;
-import org.apache.ode.bpel.runtime.channels.TerminationChannelListener;
-import org.apache.ode.bpel.runtime.channels.TimerResponseChannel;
-import org.apache.ode.bpel.runtime.channels.TimerResponseChannelListener;
+import org.apache.ode.bpel.rtrep.v2.channels.ActivityRecoveryChannel;
+import org.apache.ode.bpel.rtrep.v2.channels.ActivityRecoveryChannelListener;
+import org.apache.ode.bpel.rtrep.v2.channels.FaultData;
+import org.apache.ode.bpel.rtrep.v2.channels.InvokeResponseChannel;
+import org.apache.ode.bpel.rtrep.v2.channels.InvokeResponseChannelListener;
+import org.apache.ode.bpel.rtrep.v2.channels.TerminationChannelListener;
+import org.apache.ode.bpel.rtrep.v2.channels.TimerResponseChannel;
+import org.apache.ode.bpel.rtrep.v2.channels.TimerResponseChannelListener;
import org.apache.ode.bpel.evar.ExternalVariableModuleException;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -89,7 +86,7 @@
try {
if (!isTwoWay) {
FaultData faultData = null;
- getBpelRuntimeContext().invoke(_scopeFrame.resolve(_oinvoke.partnerLink),
+ getBpelRuntime().invoke(_scopeFrame.resolve(_oinvoke.partnerLink),
_oinvoke.operation, outboundMsg, null);
_self.parent.completed(faultData, CompensationHandler.emptySet());
@@ -97,7 +94,7 @@
final VariableInstance outputVar = _scopeFrame.resolve(_oinvoke.outputVar);
InvokeResponseChannel invokeResponseChannel = newChannel(InvokeResponseChannel.class);
- final String mexId = getBpelRuntimeContext().invoke(
+ final String mexId = getBpelRuntime().invoke(
_scopeFrame.resolve(_oinvoke.partnerLink), _oinvoke.operation,
outboundMsg, invokeResponseChannel);
@@ -111,7 +108,7 @@
Element response;
try {
- response = getBpelRuntimeContext().getPartnerResponse(mexId);
+ response = getBpelRuntime().getPartnerResponse(mexId);
} catch (Exception e) {
__log.error(e);
// TODO: Better error handling
@@ -119,7 +116,7 @@
}
try {
- initializeVariable(outputVar, response);
+ getBpelRuntime().initializeVariable(outputVar, response);
} catch (ExternalVariableModuleException e) {
__log.error("Exception while initializing external variable", e);
_self.parent.failure(e.toString(), null);
@@ -139,19 +136,19 @@
}
if (_oinvoke.partnerLink.hasPartnerRole()) {
// Trying to initialize partner epr based on a message-provided epr/session.
- if (!getBpelRuntimeContext().isPartnerRoleEndpointInitialized(_scopeFrame
+ if (!getBpelRuntime().isPartnerRoleEndpointInitialized(_scopeFrame
.resolve(_oinvoke.partnerLink)) || !_oinvoke.partnerLink.initializePartnerRole) {
- Node fromEpr = getBpelRuntimeContext().getSourceEPR(mexId);
+ Node fromEpr = getBpelRuntime().getSourceEPR(mexId);
if (fromEpr != null) {
- getBpelRuntimeContext().writeEndpointReference(
+ getBpelRuntime().writeEndpointReference(
_scopeFrame.resolve(_oinvoke.partnerLink), (Element) fromEpr);
}
}
- String partnersSessionId = getBpelRuntimeContext().getSourceSessionId(mexId);
+ String partnersSessionId = getBpelRuntime().getSourceSessionId(mexId);
if (partnersSessionId != null)
- getBpelRuntimeContext().initializePartnersSessionId(_scopeFrame.resolve(_oinvoke.partnerLink),
+ getBpelRuntime().initializePartnersSessionId(_scopeFrame.resolve(_oinvoke.partnerLink),
partnersSessionId);
}
@@ -162,17 +159,17 @@
// TODO update output variable with data from non-initiate correlation sets
_self.parent.completed(fault, CompensationHandler.emptySet());
- getBpelRuntimeContext().releasePartnerMex(mexId);
+ getBpelRuntime().releasePartnerMex(mexId);
}
public void onFault() {
- QName faultName = getBpelRuntimeContext().getPartnerFault(mexId);
- Element msg = getBpelRuntimeContext().getPartnerResponse(mexId);
- QName msgType = getBpelRuntimeContext().getPartnerResponseType(mexId);
+ QName faultName = getBpelRuntime().getPartnerFault(mexId);
+ Element msg = getBpelRuntime().getPartnerResponse(mexId);
+ QName msgType = getBpelRuntime().getPartnerResponseType(mexId);
FaultData fault = createFault(faultName, msg,
_oinvoke.getOwner().messageTypes.get(msgType), _self.o);
_self.parent.completed(fault, CompensationHandler.emptySet());
- getBpelRuntimeContext().releasePartnerMex(mexId);
+ getBpelRuntime().releasePartnerMex(mexId);
}
public void onFailure() {
@@ -180,8 +177,8 @@
// because there is no fault, instead we'll re-incarnate the invoke
// and either retry or indicate failure condition.
// admin to resume the process.
- _self.parent.failure(getBpelRuntimeContext().getPartnerFaultExplanation(mexId), null);
- getBpelRuntimeContext().releasePartnerMex(mexId);
+ _self.parent.failure(getBpelRuntime().getPartnerFaultExplanation(mexId), null);
+ getBpelRuntime().releasePartnerMex(mexId);
}
});
}
@@ -231,10 +228,10 @@
if (__log.isDebugEnabled())
__log.debug("ActivityRecovery: Retrying invoke activity " + _self.aId);
- Date future = new Date(new Date().getTime() +
- (failureHandling == null ? 0L : failureHandling.retryDelay * 1000));
+ Date future = new Date(new Date().getTime() + failureHandling.retryDelay * 1000);
final TimerResponseChannel timerChannel = newChannel(TimerResponseChannel.class);
- getBpelRuntimeContext().registerTimer(timerChannel, future);
+ getBpelRuntime().registerTimer(timerChannel, future);
+
object(false, new TimerResponseChannelListener(timerChannel) {
private static final long serialVersionUID = -261911108068231376L;
public void onTimeout() {
@@ -262,7 +259,7 @@
__log.debug("ActivityRecovery: Invoke activity " + _self.aId + " requires recovery");
sendEvent(new ActivityFailureEvent(_failureReason));
final ActivityRecoveryChannel recoveryChannel = newChannel(ActivityRecoveryChannel.class);
- getBpelRuntimeContext().registerActivityForRecovery(recoveryChannel, _self.aId, _failureReason, _lastFailure, _failureData,
+ getBpelRuntime().registerActivityForRecovery(recoveryChannel, _self.aId, _failureReason, _lastFailure, _failureData,
new String[] { "retry", "cancel", "fault" }, _invoked - 1);
object(false, new ActivityRecoveryChannelListener(recoveryChannel) {
private static final long serialVersionUID = 8397883882810521685L;
@@ -270,21 +267,21 @@
if (__log.isDebugEnabled())
__log.debug("ActivityRecovery: Retrying invoke activity " + _self.aId + " (user initiated)");
sendEvent(new ActivityRecoveryEvent("retry"));
- getBpelRuntimeContext().unregisterActivityForRecovery(recoveryChannel);
+ getBpelRuntime().unregisterActivityForRecovery(recoveryChannel);
instance(INVOKE.this);
}
public void cancel() {
if (__log.isDebugEnabled())
__log.debug("ActivityRecovery: Cancelling invoke activity " + _self.aId + " (user initiated)");
sendEvent(new ActivityRecoveryEvent("cancel"));
- getBpelRuntimeContext().unregisterActivityForRecovery(recoveryChannel);
+ getBpelRuntime().unregisterActivityForRecovery(recoveryChannel);
_self.parent.cancelled();
}
public void fault(FaultData faultData) {
if (__log.isDebugEnabled())
__log.debug("ActivityRecovery: Faulting invoke activity " + _self.aId + " (user initiated)");
sendEvent(new ActivityRecoveryEvent("fault"));
- getBpelRuntimeContext().unregisterActivityForRecovery(recoveryChannel);
+ getBpelRuntime().unregisterActivityForRecovery(recoveryChannel);
if (faultData == null)
faultData = createFault(OFailureHandling.FAILURE_FAULT_NAME, _self.o, _failureReason);
_self.parent.completed(faultData, CompensationHandler.emptySet());
@@ -295,7 +292,7 @@
public void terminate() {
if (__log.isDebugEnabled())
__log.debug("ActivityRecovery: Cancelling invoke activity " + _self.aId + " (terminated by scope)");
- getBpelRuntimeContext().unregisterActivityForRecovery(recoveryChannel);
+ getBpelRuntime().unregisterActivityForRecovery(recoveryChannel);
_self.parent.completed(null, CompensationHandler.emptySet());
}
}));
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/InstanceGlobals.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/InstanceGlobals.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/InstanceGlobals.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/InstanceGlobals.java Thu Jul 31 17:29:41 2008
@@ -1,11 +1,10 @@
-package org.apache.ode.bpel.runtime;
+package org.apache.ode.bpel.rtrep.v2;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
-import org.apache.ode.bpel.o.OScope;
-import org.apache.ode.bpel.runtime.channels.ReadWriteLockChannel;
+import org.apache.ode.bpel.rtrep.v2.channels.ReadWriteLockChannel;
/**
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/InvalidContextException.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/InvalidContextException.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/InvalidContextException.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/InvalidContextException.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.runtime;
+package org.apache.ode.bpel.rtrep.v2;
/**
* Exception used by the runtime to indicate a problem with the execution context. This
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/LinkFrame.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/LinkFrame.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/LinkFrame.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/LinkFrame.java Thu Jul 31 17:29:41 2008
@@ -16,9 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.runtime;
-
-import org.apache.ode.bpel.o.OLink;
+package org.apache.ode.bpel.rtrep.v2;
import java.io.Serializable;
import java.util.HashMap;
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/LinkInfo.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/LinkInfo.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/LinkInfo.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/LinkInfo.java Thu Jul 31 17:29:41 2008
@@ -16,10 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.runtime;
+package org.apache.ode.bpel.rtrep.v2;
-import org.apache.ode.bpel.o.OLink;
-import org.apache.ode.bpel.runtime.channels.LinkStatusChannel;
+import org.apache.ode.bpel.rtrep.v2.channels.LinkStatusChannel;
import java.io.Serializable;
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/Messages.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/Messages.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/Messages.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/Messages.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.engine;
+package org.apache.ode.bpel.rtrep.v2;
import org.apache.ode.utils.msg.MessageBundle;
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OActivity.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OActivity.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OActivity.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OActivity.java Thu Jul 31 17:29:41 2008
@@ -16,9 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
-
-import org.apache.ode.utils.ObjectPrinter;
+package org.apache.ode.bpel.rtrep.v2;
import java.util.HashSet;
import java.util.Set;
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OAgent.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OAgent.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OAgent.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OAgent.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
import java.util.HashSet;
import java.util.Set;
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OAssign.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OAssign.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OAssign.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OAssign.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
import java.io.IOException;
import java.util.ArrayList;
@@ -24,7 +24,6 @@
import javax.xml.namespace.QName;
-import org.apache.ode.bpel.o.OScope.Variable;
import org.apache.ode.utils.DOMUtils;
import org.apache.ode.utils.SerializableElement;
import org.w3c.dom.Document;
@@ -48,7 +47,7 @@
* Base class for assign operations.
*/
public static abstract class OAssignOperation extends OBase {
- public enum Type {Copy, ExtensionOperation};
+ public enum Type { Copy, ExtensionOperation }
public OAssignOperation(OProcess owner) {
super(owner);
@@ -129,7 +128,7 @@
private void readObject(java.io.ObjectInputStream in)
throws IOException
{
- String domStr = null;
+ String domStr;
try {
domStr = (String) in.readObject();
} catch (ClassNotFoundException e) {
@@ -163,10 +162,8 @@
public String toString() {
return expression.toString();
}
- /**
- * @see org.apache.ode.bpel.o.OAssign.LValue#getVariable()
- */
- public Variable getVariable() {
+
+ public OScope.Variable getVariable() {
return expression.getVariable();
}
@@ -203,7 +200,7 @@
/** Name of the element referenced. */
public QName elName;
- public Variable getVariable() {
+ public OScope.Variable getVariable() {
return variable;
}
}
@@ -274,7 +271,7 @@
public PartnerLinkRef(OProcess owner) { super(owner); }
// Must fit in a LValue even if it's not variable based
- public Variable getVariable() {
+ public OScope.Variable getVariable() {
return null;
}
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OBase.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OBase.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OBase.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OBase.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
import java.io.Serializable;
@@ -42,7 +42,6 @@
_id = ++_owner._childIdCounter;
_owner._children.add(this);
}
- assert _id == 0 || _owner != null;
}
public OProcess getOwner() {
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OCatch.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OCatch.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OCatch.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OCatch.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
import javax.xml.namespace.QName;
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OCompensate.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OCompensate.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OCompensate.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OCompensate.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
/**
* Compiled representation of the BPEL <code><compensate></code> activity.
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OCompensationHandler.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OCompensationHandler.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OCompensationHandler.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OCompensationHandler.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
public class OCompensationHandler extends OScope {
private static final long serialVersionUID = -9208360082697192920L;
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OConstantExpression.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OConstantExpression.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OConstantExpression.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OConstantExpression.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
public class OConstantExpression extends OExpression {
static final long serialVersionUID = -1L ;
@@ -34,7 +34,7 @@
public void setVal(Object val) {
if (val == null)
- throw new IllegalArgumentException("OConstatExpression cannot be null.");
+ throw new IllegalArgumentException("OConstatExpression cannot be null.");
this._val = val;
}
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OConstantVarType.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OConstantVarType.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OConstantVarType.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OConstantVarType.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
import org.apache.ode.utils.DOMUtils;
import org.w3c.dom.Document;
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OConstants.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OConstants.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OConstants.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OConstants.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
import javax.xml.namespace.QName;
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OElementVarType.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OElementVarType.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OElementVarType.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OElementVarType.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
import javax.xml.namespace.QName;
@@ -35,8 +35,6 @@
}
public Node newInstance(Document doc) {
- Element el = doc.createElementNS(elementType.getNamespaceURI(),
- elementType.getLocalPart());
- return el;
+ return doc.createElementNS(elementType.getNamespaceURI(), elementType.getLocalPart());
}
}
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OEmpty.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OEmpty.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OEmpty.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OEmpty.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
public class OEmpty extends OActivity {
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OEventHandler.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OEventHandler.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OEventHandler.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OEventHandler.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
import java.util.ArrayList;
import java.util.List;
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OExpression.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OExpression.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OExpression.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OExpression.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
/**
* Base class for compiled expressions. The exact form of a compiled expression is
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OExpressionLanguage.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OExpressionLanguage.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OExpressionLanguage.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OExpressionLanguage.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
import java.util.HashMap;
import java.util.Map;
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OExtVar.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OExtVar.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OExtVar.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OExtVar.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
/**
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OExtensionActivity.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OExtensionActivity.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OExtensionActivity.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OExtensionActivity.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
import java.util.ArrayList;
import java.util.List;
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OFailureHandling.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OFailureHandling.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OFailureHandling.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OFailureHandling.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
import javax.xml.namespace.QName;
import java.io.Serializable;
@@ -24,7 +24,7 @@
/**
* Holds information about the failure handling of this activity.
*/
-public class FailureHandling implements Serializable {
+public class OFailureHandling implements Serializable {
private static final long serialVersionUID = 5637366976949702880L;
public static final String EXTENSION_NS_URI = "http://ode.apache.org/activityRecovery";
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OFaultHandler.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OFaultHandler.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OFaultHandler.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OFaultHandler.java Thu Jul 31 17:29:41 2008
@@ -16,10 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
import java.util.ArrayList;
-import java.util.Collection;
import java.util.List;
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OFlow.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OFlow.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OFlow.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OFlow.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
import org.apache.ode.utils.stl.CollectionsX;
import org.apache.ode.utils.stl.MemberOfFunction;
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OForEach.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OForEach.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OForEach.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OForEach.java Thu Jul 31 17:29:41 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
/**
* Base model class for forEach activity.
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OInvoke.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OInvoke.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OInvoke.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OInvoke.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
import java.util.ArrayList;
import java.util.List;
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OLValueExpression.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OLValueExpression.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OLValueExpression.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OLValueExpression.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
public abstract class OLValueExpression extends OExpression {
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OLink.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OLink.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OLink.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OLink.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
/**
* Compiled representation of a BPEL control link.
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OMessageVarType.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OMessageVarType.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OMessageVarType.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OMessageVarType.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
import java.util.Collection;
import java.util.Iterator;
@@ -44,10 +44,8 @@
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);
- }
+ for (Part part : parts)
+ this.parts.put(part.name, part);
if ((parts.size() == 1 && parts.iterator().next().type instanceof OElementVarType))
docLitType = (OElementVarType) parts.iterator().next().type;
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OPartnerLink.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OPartnerLink.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OPartnerLink.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OPartnerLink.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
+
+import org.apache.ode.bpel.rtrep.rapi.PartnerLinkModel;
+import org.apache.ode.bpel.rtrep.rapi.CorrelationSetModel;
import javax.wsdl.Operation;
import javax.wsdl.PortType;
@@ -30,7 +33,7 @@
/**
* Compiled representation of a BPEL partnerLink.
*/
-public class OPartnerLink extends OBase {
+public class OPartnerLink extends OBase implements PartnerLinkModel {
static final long serialVersionUID = -1L ;
/** partnerLink name. */
public String name;
@@ -52,7 +55,7 @@
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>>();
+ private final HashMap<String,Set<CorrelationSetModel>> _nonIntitiatingCorrelationSets = new HashMap<String,Set<CorrelationSetModel>>();
/** The set of {@link Operation}s that can be used to create a process instance. */
private final HashSet<String> _createInstanceOperations = new HashSet<String>();
@@ -65,6 +68,26 @@
return name;
}
+ public String getMyRoleName() {
+ return myRoleName;
+ }
+
+ public String getPartnerRoleName() {
+ return partnerRoleName;
+ }
+
+ public boolean isInitializePartnerRoleSet() {
+ return initializePartnerRole;
+ }
+
+ public PortType getMyRolePortType() {
+ return myRolePortType;
+ }
+
+ public PortType getPartnerRolePortType() {
+ return partnerRolePortType;
+ }
+
public boolean hasMyRole() {
return myRolePortType != null;
}
@@ -90,10 +113,10 @@
* @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());
+ public void addCorrelationSetForOperation(Operation operation, CorrelationSetModel cset) {
+ Set<CorrelationSetModel> ret = _nonIntitiatingCorrelationSets.get(operation.getName());
if (ret == null) {
- ret = new HashSet<OScope.CorrelationSet>();
+ ret = new HashSet<CorrelationSetModel>();
_nonIntitiatingCorrelationSets.put(operation.getName(), ret);
}
ret.add(cset);
@@ -107,8 +130,8 @@
* @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());
+ public Set<CorrelationSetModel> getCorrelationSetsForOperation(Operation operation) {
+ Set<CorrelationSetModel> ret = _nonIntitiatingCorrelationSets.get(operation.getName());
if (ret == null) {
return Collections.EMPTY_SET;
}
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OPickReceive.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OPickReceive.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OPickReceive.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OPickReceive.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
import java.util.ArrayList;
import java.util.List;
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OProcess.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OProcess.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OProcess.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OProcess.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
+
+import org.apache.ode.bpel.rtrep.rapi.ProcessModel;
+import org.apache.ode.bpel.rtrep.rapi.PartnerLinkModel;
import javax.wsdl.Operation;
import javax.xml.namespace.QName;
@@ -28,7 +31,7 @@
/**
* Compiled BPEL process representation.
*/
-public class OProcess extends OBase {
+public class OProcess extends OBase implements ProcessModel {
public static int instanceCount = 0;
static final long serialVersionUID = -1L ;
@@ -54,7 +57,7 @@
public OScope procesScope;
/** All partner links in the process. */
- public final Set<OPartnerLink> allPartnerLinks = new HashSet<OPartnerLink>();
+ public final Set<PartnerLinkModel> allPartnerLinks = new HashSet<PartnerLinkModel>();
public final List<OProperty> properties = new ArrayList<OProperty>();
@@ -87,6 +90,10 @@
instanceCount++;
}
+ public String getGuid() {
+ return guid;
+ }
+
public OBase getChild(final int id) {
for (int i=_children.size()-1; i>=0; i--) {
OBase child = _children.get(i);
@@ -104,17 +111,21 @@
}
- public Set<OPartnerLink> getAllPartnerLinks() {
+ public Set<PartnerLinkModel> getAllPartnerLinks() {
return Collections.unmodifiableSet(allPartnerLinks);
}
- public OPartnerLink getPartnerLink(String name) {
- for (OPartnerLink partnerLink : allPartnerLinks) {
+ public PartnerLinkModel getPartnerLink(String name) {
+ for (PartnerLinkModel partnerLink : allPartnerLinks) {
if (partnerLink.getName().equals(name)) return partnerLink;
}
return null;
}
+ public PartnerLinkModel getPartnerLink(int partnerLinkModelId) {
+ return (PartnerLinkModel) getChild(partnerLinkModelId);
+ }
+
public String getName() {
return processName;
}
@@ -127,9 +138,9 @@
// MOVED from ProcessSchemaGenerator
List<String> correlators = new ArrayList<String>();
- for (OPartnerLink plink : getAllPartnerLinks()) {
+ for (PartnerLinkModel plink : getAllPartnerLinks()) {
if (plink.hasMyRole()) {
- for (Iterator opI = plink.myRolePortType.getOperations().iterator(); opI.hasNext();) {
+ for (Iterator opI = plink.getMyRolePortType().getOperations().iterator(); opI.hasNext();) {
Operation op = (Operation)opI.next();
correlators.add(plink.getId() + "." + op.getName());
}
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ORDEREDCOMPENSATOR.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ORDEREDCOMPENSATOR.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ORDEREDCOMPENSATOR.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ORDEREDCOMPENSATOR.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.runtime;
+package org.apache.ode.bpel.rtrep.v2;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -29,46 +29,46 @@
* Serially activates a list of compensations in order.
*/
class ORDEREDCOMPENSATOR extends BpelJacobRunnable {
- private static final long serialVersionUID = -3181661355085428370L;
+ private static final long serialVersionUID = -3181661355085428370L;
- private static final Log __log = LogFactory.getLog(ORDEREDCOMPENSATOR.class);
+ private static final Log __log = LogFactory.getLog(ORDEREDCOMPENSATOR.class);
- private List<CompensationHandler> _compensations;
- private SynchChannel _ret;
+ private List<CompensationHandler> _compensations;
+ private SynchChannel _ret;
- public ORDEREDCOMPENSATOR(List<CompensationHandler> compensations, SynchChannel ret) {
- _compensations = compensations;
- _ret = ret;
- }
-
- public void run() {
- if (_compensations.isEmpty()) {
- _ret.ret();
+ public ORDEREDCOMPENSATOR(List<CompensationHandler> compensations, SynchChannel ret) {
+ _compensations = compensations;
+ _ret = ret;
}
- else {
- SynchChannel r = newChannel(SynchChannel.class);
- CompensationHandler cdata = _compensations.remove(0);
- cdata.compChannel.compensate(r);
- object(new SynchChannelListener(r) {
- private static final long serialVersionUID = 7173916663479205420L;
- public void ret() {
- instance(ORDEREDCOMPENSATOR.this);
+ public void run() {
+ if (_compensations.isEmpty()) {
+ _ret.ret();
+ }
+ else {
+ SynchChannel r = newChannel(SynchChannel.class);
+ CompensationHandler cdata = _compensations.remove(0);
+ cdata.compChannel.compensate(r);
+ object(new SynchChannelListener(r) {
+ private static final long serialVersionUID = 7173916663479205420L;
+
+ public void ret() {
+ instance(ORDEREDCOMPENSATOR.this);
+ }
+ });
}
- });
+
}
- }
+ protected Log log() {
+ return __log;
+ }
- protected Log log() {
- return __log;
- }
-
- public String toString() {
- return new StringBuffer("ORDEREDCOMPENSATOR(comps=")
- .append(_compensations)
- .append(")")
- .toString();
- }
+ public String toString() {
+ return new StringBuffer("ORDEREDCOMPENSATOR(comps=")
+ .append(_compensations)
+ .append(")")
+ .toString();
+ }
}
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ORepeatUntil.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ORepeatUntil.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ORepeatUntil.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ORepeatUntil.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
/**
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OReply.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OReply.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OReply.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OReply.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
import java.util.ArrayList;
import java.util.List;
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ORethrow.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ORethrow.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ORethrow.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/ORethrow.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
public class ORethrow extends OActivity {
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OScope.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OScope.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OScope.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OScope.java Thu Jul 31 17:29:41 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
import java.util.ArrayList;
import java.util.HashMap;
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OSequence.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OSequence.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OSequence.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OSequence.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
import java.util.List;
import java.util.ArrayList;
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OSwitch.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OSwitch.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OSwitch.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OSwitch.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
import java.util.ArrayList;
import java.util.Collections;
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OTerminate.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OTerminate.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OTerminate.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OTerminate.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
/**
* Compiled representation of the BPEL <code><terminate></code> activity.
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OTerminationHandler.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OTerminationHandler.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OTerminationHandler.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OTerminationHandler.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
public class OTerminationHandler extends OScope {
private static final long serialVersionUID = -4632187173061412134L;
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OThrow.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OThrow.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OThrow.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OThrow.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
import javax.xml.namespace.QName;
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OVarType.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OVarType.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OVarType.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OVarType.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
import org.w3c.dom.Document;
import org.w3c.dom.Node;
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OWait.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OWait.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OWait.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OWait.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
/**
* Wait object
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OWhile.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OWhile.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OWhile.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OWhile.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
/**
* Compiled representation of a <code><while></code> activity.
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OXsdTypeVarType.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OXsdTypeVarType.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OXsdTypeVarType.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OXsdTypeVarType.java Thu Jul 31 17:29:41 2008
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
import org.w3c.dom.Document;
import org.w3c.dom.Element;
@@ -42,8 +42,7 @@
if (simple)
return doc.createTextNode("");
else {
- Element el = doc.createElementNS(null, "xsd-complex-type-wrapper");
- return el;
+ return doc.createElementNS(null, "xsd-complex-type-wrapper");
}
}
}
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OXslSheet.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OXslSheet.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OXslSheet.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OXslSheet.java Thu Jul 31 17:29:41 2008
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.ode.bpel.o;
+package org.apache.ode.bpel.rtrep.v2;
import java.net.URI;
Modified: ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OutstandingRequestManager.java
URL: http://svn.apache.org/viewvc/ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OutstandingRequestManager.java?rev=681565&r1=681564&r2=681565&view=diff
==============================================================================
--- ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OutstandingRequestManager.java (original)
+++ ode/branches/rtver/runtime-repo/src/main/java/org/apache/ode/bpel/rtrep/v2/OutstandingRequestManager.java Thu Jul 31 17:29:41 2008
@@ -16,10 +16,8 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.ode.bpel.engine;
+package org.apache.ode.bpel.rtrep.v2;
-import org.apache.ode.bpel.runtime.PartnerLinkInstance;
-import org.apache.ode.bpel.runtime.Selector;
import org.apache.ode.utils.ObjectPrinter;
import java.io.Serializable;