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 2006/07/28 19:23:49 UTC
svn commit: r426612 - in /incubator/ode/trunk: bpel-runtime/
bpel-runtime/src/main/java/org/apache/ode/bpel/engine/
bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ jacob/
jacob/src/main/java/org/apache/ode/jacob/ jacob/src/main/java/org/apache/...
Author: mriou
Date: Fri Jul 28 10:23:47 2006
New Revision: 426612
URL: http://svn.apache.org/viewvc?rev=426612&view=rev
Log:
Renaming JacobRunnable self() method to run().
Added:
incubator/ode/trunk/jacob/src/xdt/org/apache/ode/jacob/ChannelListener.xdt
- copied, changed from r426596, incubator/ode/trunk/jacob/src/xdt/org/apache/ode/jacob/ML.xdt
Removed:
incubator/ode/trunk/jacob/src/xdt/org/apache/ode/jacob/ML.xdt
Modified:
incubator/ode/trunk/bpel-runtime/pom.xml
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ACTIVITYGUARD.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/COMPENSATE.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/COMPENSATIONHANDLER_.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_ALARM.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_EVENT.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EMPTY.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FLOW.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FOREACH.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/INVOKE.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ORDEREDCOMPENSATOR.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PICK.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PROCESS.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/REPLY.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/RETHROW.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPEACT.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SEQUENCE.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SWITCH.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/TERMINATE.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/THROW.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WAIT.java
incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WHILE.java
incubator/ode/trunk/jacob/pom.xml
incubator/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobRunnable.java
incubator/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/Sequence.java
incubator/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/examples/cell/CELL_.java
incubator/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/examples/eratosthenes/Sieve.java
incubator/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/examples/synch/SynchPrinter.java
incubator/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java
incubator/ode/trunk/jacob/src/test/java/org/apache/ode/jacob/SynchTest.java
incubator/ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/JacobCellTest.java
Modified: incubator/ode/trunk/bpel-runtime/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/pom.xml?rev=426612&r1=426611&r2=426612&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-runtime/pom.xml (original)
+++ incubator/ode/trunk/bpel-runtime/pom.xml Fri Jul 28 10:23:47 2006
@@ -80,7 +80,7 @@
<tasks>
<doclet destDir="${project.build.directory}/generated-sources/xdoclet" verbose="true">
<fileset dir="${basedir}/src/main/java" includes="**/*.java"/>
- <template havingClassTag="jacob.kind" destinationFile="{0}ML.java" templateFile="${basedir}/../jacob/src/xdt/org/apache/ode/jacob/ML.xdt"/>
+ <template havingClassTag="jacob.kind" destinationFile="{0}ChannelListener.java" templateFile="${basedir}/../jacob/src/xdt/org/apache/ode/jacob/ChannelListener.xdt"/>
<template havingClassTag="jacob.kind" destinationFile="{0}Channel.java" templateFile="${basedir}/../jacob/src/xdt/org/apache/ode/jacob/channel.xdt"/>
</doclet>
</tasks>
Modified: incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java?rev=426612&r1=426611&r2=426612&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java (original)
+++ incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/engine/BpelRuntimeContextImpl.java Fri Jul 28 10:23:47 2006
@@ -873,7 +873,7 @@
vpu.inject(new JacobRunnable() {
private static final long serialVersionUID = 3168964409165899533L;
- public void self() {
+ public void run() {
PickResponseChannel responseChannel = importChannel(responsechannel,
PickResponseChannel.class);
responseChannel.onRequestRcvd(idx, mexId);
@@ -895,7 +895,7 @@
vpu.inject(new JacobRunnable() {
private static final long serialVersionUID = -7767141033611036745L;
- public void self() {
+ public void run() {
TimerResponseChannel responseChannel = importChannel(
timerResponseChannel, TimerResponseChannel.class);
responseChannel.onTimeout();
@@ -914,7 +914,7 @@
vpu.inject(new JacobRunnable() {
private static final long serialVersionUID = 6157913683737696396L;
- public void self() {
+ public void run() {
TimerResponseChannel responseChannel = importChannel(id,
TimerResponseChannel.class);
responseChannel.onCancel();
@@ -931,7 +931,7 @@
vpu.inject(new BpelJacobRunnable() {
private static final long serialVersionUID = -1095444335740879981L;
- public void self() {
+ public void run() {
((BpelRuntimeContextImpl) getBpelRuntimeContext()).invocationResponse2(
mexid,
importChannel(responseChannelId, InvokeResponseChannel.class));
Modified: incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ACTIVITYGUARD.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ACTIVITYGUARD.java?rev=426612&r1=426611&r2=426612&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ACTIVITYGUARD.java (original)
+++ incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ACTIVITYGUARD.java Fri Jul 28 10:23:47 2006
@@ -62,7 +62,7 @@
_oactivity = self.o;
}
- public void self() {
+ public void run() {
// Send a notification of the activity being enabled,
if (_firstTime) {
sendEvent(new ActivityEnabledEvent());
@@ -176,7 +176,7 @@
_in = in;
}
- public void self() {
+ public void run() {
object(new ParentScopeChannelListener(_in) {
private static final long serialVersionUID = 2667359535900385952L;
Modified: incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java?rev=426612&r1=426611&r2=426612&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java (original)
+++ incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ASSIGN.java Fri Jul 28 10:23:47 2006
@@ -57,7 +57,7 @@
super(self, scopeFrame, linkFrame);
}
- public void self() {
+ public void run() {
OAssign oassign = getOAsssign();
FaultData faultData = null;
Modified: incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/COMPENSATE.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/COMPENSATE.java?rev=426612&r1=426611&r2=426612&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/COMPENSATE.java (original)
+++ incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/COMPENSATE.java Fri Jul 28 10:23:47 2006
@@ -36,7 +36,7 @@
_ocompact = (OCompensate) self.o;
}
- public final void self() {
+ public final void run() {
OScope scopeToCompensate = _ocompact.compensatedScope;
SynchChannel sc = newChannel(SynchChannel.class);
_self.parent.compensate(scopeToCompensate,sc);
Modified: incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/COMPENSATIONHANDLER_.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/COMPENSATIONHANDLER_.java?rev=426612&r1=426611&r2=426612&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/COMPENSATIONHANDLER_.java (original)
+++ incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/COMPENSATIONHANDLER_.java Fri Jul 28 10:23:47 2006
@@ -44,7 +44,7 @@
_completedChildren = visibleCompensations;
}
- public void self() {
+ public void run() {
sendEvent(new CompensationHandlerRegistered());
object(new CompensationChannelListener(_self.compChannel) {
private static final long serialVersionUID = -477602498730810094L;
Modified: incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_ALARM.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_ALARM.java?rev=426612&r1=426611&r2=426612&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_ALARM.java (original)
+++ incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_ALARM.java Fri Jul 28 10:23:47 2006
@@ -70,7 +70,7 @@
_oalarm = o;
}
- public void self() {
+ public void run() {
Calendar alarm = Calendar.getInstance();
@@ -118,7 +118,7 @@
_alarm = alarm;
}
- public void self() {
+ public void run() {
Calendar now = Calendar.getInstance();
if (now.before(_alarm)) {
@@ -163,7 +163,7 @@
private class FIRE extends BpelJacobRunnable {
private static final long serialVersionUID = -7261315204412433250L;
- public void self() {
+ public void run() {
// Start the child activity.
ActivityInfo child = new ActivityInfo(genMonotonic(),
_oalarm.activity,
@@ -188,7 +188,7 @@
_activity = activity;
}
- public void self() {
+ public void run() {
object(false,new ParentScopeChannelListener(_activity.parent){
private static final long serialVersionUID = -3357030137175178040L;
Modified: incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_EVENT.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_EVENT.java?rev=426612&r1=426611&r2=426612&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_EVENT.java (original)
+++ incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_EVENT.java Fri Jul 28 10:23:47 2006
@@ -82,7 +82,7 @@
}
- public void self() {
+ public void run() {
instance(new SELECT());
}
@@ -106,9 +106,9 @@
private static final long serialVersionUID = 1L;
/**
- * @see org.apache.ode.jacob.JacobRunnable#self()
+ * @see org.apache.ode.jacob.JacobRunnable#run()
*/
- public void self() {
+ public void run() {
Selector selector;
try {
PickResponseChannel pickResponseChannel = newChannel(PickResponseChannel.class);
@@ -155,7 +155,7 @@
_pickResponseChannel = pickResponseChannel;
}
- public void self() {
+ public void run() {
if (!_active.isEmpty() || _pickResponseChannel != null) {
HashSet<ChannelListener> mlset = new HashSet<ChannelListener>();
Modified: incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EMPTY.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EMPTY.java?rev=426612&r1=426611&r2=426612&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EMPTY.java (original)
+++ incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EMPTY.java Fri Jul 28 10:23:47 2006
@@ -33,7 +33,7 @@
super(self, frame, linkFrame);
}
- public final void self() {
+ public final void run() {
if (__log.isDebugEnabled()) {
__log.debug("<empty name=" + _self.o + ">");
}
Modified: incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FLOW.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FLOW.java?rev=426612&r1=426611&r2=426612&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FLOW.java (original)
+++ incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FLOW.java Fri Jul 28 10:23:47 2006
@@ -49,7 +49,7 @@
_oflow = (OFlow) self.o;
}
- public void self() {
+ public void run() {
LinkFrame myLinkFrame = new LinkFrame(_linkFrame);
for (Iterator<OLink> i = _oflow.localLinks.iterator(); i.hasNext(); ) {
@@ -77,7 +77,7 @@
private FaultData _fault;
private HashSet<CompensationHandler> _compensations = new HashSet<CompensationHandler>();
- public void self() {
+ public void run() {
Iterator<ChildInfo> active = active();
if (active.hasNext()) {
Set<ChannelListener> mlSet = new HashSet<ChannelListener>();
Modified: incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FOREACH.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FOREACH.java?rev=426612&r1=426611&r2=426612&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FOREACH.java (original)
+++ incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FOREACH.java Fri Jul 28 10:23:47 2006
@@ -63,7 +63,7 @@
_oforEach = (OForEach) self.o;
}
- public void self() {
+ public void run() {
try {
_startCounter = evaluateCondition(_oforEach.startCounterValue);
_finalCounter = evaluateCondition(_oforEach.finalCounterValue);
@@ -104,7 +104,7 @@
private FaultData _fault;
private boolean _terminateRequested = false;
- public void self() {
+ public void run() {
Iterator<ChildInfo> active = active();
// Continuing as long as a child is active
if (active().hasNext()) {
Modified: incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/INVOKE.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/INVOKE.java?rev=426612&r1=426611&r2=426612&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/INVOKE.java (original)
+++ incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/INVOKE.java Fri Jul 28 10:23:47 2006
@@ -43,7 +43,7 @@
_oinvoke = (OInvoke) _self.o;
}
- public final void self() {
+ public final void run() {
Element outboundMsg;
try {
outboundMsg = setupOutbound(_oinvoke, _oinvoke.initCorrelationsInput);
Modified: incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ORDEREDCOMPENSATOR.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ORDEREDCOMPENSATOR.java?rev=426612&r1=426611&r2=426612&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ORDEREDCOMPENSATOR.java (original)
+++ incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ORDEREDCOMPENSATOR.java Fri Jul 28 10:23:47 2006
@@ -41,7 +41,7 @@
_ret = ret;
}
- public void self() {
+ public void run() {
if (_compensations.isEmpty()) {
_ret.ret();
}
Modified: incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PICK.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PICK.java?rev=426612&r1=426611&r2=426612&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PICK.java (original)
+++ incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PICK.java Fri Jul 28 10:23:47 2006
@@ -59,9 +59,9 @@
/**
- * @see org.apache.ode.jacob.JacobRunnable#self()
+ * @see org.apache.ode.jacob.JacobRunnable#run()
*/
- public void self() {
+ public void run() {
PickResponseChannel pickResponseChannel = newChannel(PickResponseChannel.class);
Date timeout;
Selector[] selectors;
@@ -147,7 +147,7 @@
this._pickResponseChannel = pickResponseChannel;
}
- public void self() {
+ public void run() {
object(false, new PickResponseChannelListener(_pickResponseChannel) {
private static final long serialVersionUID = -8237296827418738011L;
Modified: incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PROCESS.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PROCESS.java?rev=426612&r1=426611&r2=426612&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PROCESS.java (original)
+++ incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PROCESS.java Fri Jul 28 10:23:47 2006
@@ -37,7 +37,7 @@
_process = process;
}
- public void self() {
+ public void run() {
BpelRuntimeContext ntive = getBpelRuntimeContext();
Long scopeInstanceId = ntive.createScopeInstance(null, _process.procesScope);
Modified: incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/REPLY.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/REPLY.java?rev=426612&r1=426611&r2=426612&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/REPLY.java (original)
+++ incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/REPLY.java Fri Jul 28 10:23:47 2006
@@ -38,7 +38,7 @@
super(self, scopeFrame, linkFrame);
}
- public void self() {
+ public void run() {
final OReply oreply = (OReply)_self.o;
if (__log.isDebugEnabled()) {
Modified: incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/RETHROW.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/RETHROW.java?rev=426612&r1=426611&r2=426612&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/RETHROW.java (original)
+++ incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/RETHROW.java Fri Jul 28 10:23:47 2006
@@ -31,7 +31,7 @@
super(self, scopeFrame, linkFrame);
}
- public void self() {
+ public void run() {
// find the faultData in the scope stack
FaultData fault = _scopeFrame.getFault();
if(fault == null){
Modified: incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.java?rev=426612&r1=426611&r2=426612&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.java (original)
+++ incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.java Fri Jul 28 10:23:47 2006
@@ -72,7 +72,7 @@
assert _oscope.activity != null;
}
- public void self() {
+ public void run() {
// Start the child activity.
_child = new ActivityInfo(genMonotonic(),
_oscope.activity,
@@ -136,7 +136,7 @@
_startTime = System.currentTimeMillis();
}
- public void self() {
+ public void run() {
if (_child != null || !_eventHandlers.isEmpty()) {
HashSet<ChannelListener> mlSet = new HashSet<ChannelListener>();
Modified: incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPEACT.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPEACT.java?rev=426612&r1=426611&r2=426612&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPEACT.java (original)
+++ incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPEACT.java Fri Jul 28 10:23:47 2006
@@ -29,7 +29,7 @@
super(self, scopeFrame, linkFrame);
}
- public void self() {
+ public void run() {
ScopeFrame newFrame = new ScopeFrame(
(OScope) _self.o,getBpelRuntimeContext().createScopeInstance(_scopeFrame.scopeInstanceId,(OScope) _self.o),
_scopeFrame,
Modified: incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SEQUENCE.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SEQUENCE.java?rev=426612&r1=426611&r2=426612&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SEQUENCE.java (original)
+++ incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SEQUENCE.java Fri Jul 28 10:23:47 2006
@@ -57,7 +57,7 @@
_compensations =Collections.unmodifiableSet(compensations);
}
- public void self() {
+ public void run() {
final ActivityInfo child = new ActivityInfo(genMonotonic(),
_remaining.get(0),
newChannel(TerminationChannel.class), newChannel(ParentScopeChannel.class));
@@ -74,7 +74,7 @@
_child = child;
}
- public void self() {
+ public void run() {
object(false, new TerminationChannelListener(_self.self) {
private static final long serialVersionUID = -2680515407515637639L;
Modified: incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SWITCH.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SWITCH.java?rev=426612&r1=426611&r2=426612&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SWITCH.java (original)
+++ incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SWITCH.java Fri Jul 28 10:23:47 2006
@@ -41,7 +41,7 @@
super(self, scopeFrame, linkFrame);
}
- public final void self() {
+ public final void run() {
OSwitch oswitch = (OSwitch)_self.o;
OSwitch.OCase matchedOCase = null;
FaultData faultData = null;
Modified: incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/TERMINATE.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/TERMINATE.java?rev=426612&r1=426611&r2=426612&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/TERMINATE.java (original)
+++ incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/TERMINATE.java Fri Jul 28 10:23:47 2006
@@ -29,7 +29,7 @@
super(self, scopeFrame, linkFrame);
}
- public final void self() {
+ public final void run() {
getBpelRuntimeContext().terminate();
_self.parent.completed(null, CompensationHandler.emptySet());
}
Modified: incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/THROW.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/THROW.java?rev=426612&r1=426611&r2=426612&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/THROW.java (original)
+++ incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/THROW.java Fri Jul 28 10:23:47 2006
@@ -39,7 +39,7 @@
_othrow = (OThrow) self.o;
}
- public void self() {
+ public void run() {
FaultData fault = null;
if(_othrow.faultVariable != null){
try {
Modified: incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WAIT.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WAIT.java?rev=426612&r1=426611&r2=426612&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WAIT.java (original)
+++ incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WAIT.java Fri Jul 28 10:23:47 2006
@@ -44,7 +44,7 @@
super(self, scopeFrame, linkFrame);
}
- public final void self() {
+ public final void run() {
Date dueDate = null;
try{
Modified: incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WHILE.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WHILE.java?rev=426612&r1=426611&r2=426612&view=diff
==============================================================================
--- incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WHILE.java (original)
+++ incubator/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WHILE.java Fri Jul 28 10:23:47 2006
@@ -48,7 +48,7 @@
super(self, scopeFrame, linkFrame);
}
- public void self() {
+ public void run() {
boolean condResult = false;
@@ -111,7 +111,7 @@
_child = child;
}
- public void self() {
+ public void run() {
object(false, new TerminationChannelListener(_self.self) {
private static final long serialVersionUID = -5471984635653784051L;
Modified: incubator/ode/trunk/jacob/pom.xml
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/jacob/pom.xml?rev=426612&r1=426611&r2=426612&view=diff
==============================================================================
--- incubator/ode/trunk/jacob/pom.xml (original)
+++ incubator/ode/trunk/jacob/pom.xml Fri Jul 28 10:23:47 2006
@@ -51,7 +51,7 @@
<tasks>
<doclet destDir="${project.build.directory}/generated-sources/xdoclet" verbose="false">
<fileset dir="${basedir}/src/main/java" includes="**/*.java"/>
- <template havingClassTag="jacob.kind" destinationFile="{0}ML.java" templateFile="${basedir}/src/xdt/org/apache/ode/jacob/ML.xdt"/>
+ <template havingClassTag="jacob.kind" destinationFile="{0}ChannelListener.java" templateFile="${basedir}/src/xdt/org/apache/ode/jacob/ChannelListener.xdt"/>
<template havingClassTag="jacob.kind" destinationFile="{0}Channel.java" templateFile="${basedir}/src/xdt/org/apache/ode/jacob/channel.xdt"/>
</doclet>
</tasks>
Modified: incubator/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobRunnable.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobRunnable.java?rev=426612&r1=426611&r2=426612&view=diff
==============================================================================
--- incubator/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobRunnable.java (original)
+++ incubator/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobRunnable.java Fri Jul 28 10:23:47 2006
@@ -45,7 +45,7 @@
* this.s = s;
* this.v = v;
* }
- * public void self() {
+ * public void run() {
* object(new CellChannelListener(s) { read(...) {...}
* write(...) {...} } );
* }
@@ -75,7 +75,7 @@
private static final Set<Method> IMPLEMENTED_METHODS;
static {
try {
- IMPLEMENTED_METHODS = Collections.singleton(JacobRunnable.class.getMethod("self", ArrayUtils.EMPTY_CLASS_ARRAY));
+ IMPLEMENTED_METHODS = Collections.singleton(JacobRunnable.class.getMethod("run", ArrayUtils.EMPTY_CLASS_ARRAY));
} catch (NoSuchMethodException e) {
throw new AssertionError(e);
}
@@ -97,7 +97,7 @@
* sequencing of JACOB operations is irrelevant</em>
* </p>
*/
- public abstract void self();
+ public abstract void run();
/**
* Pretty print.
Modified: incubator/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/Sequence.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/Sequence.java?rev=426612&r1=426611&r2=426612&view=diff
==============================================================================
--- incubator/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/Sequence.java (original)
+++ incubator/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/Sequence.java Fri Jul 28 10:23:47 2006
@@ -36,7 +36,7 @@
/**
* DOCUMENTME
*/
- public void self() {
+ public void run() {
if (_step >= _size) {
if (_done != null) {
_done.ret();
Modified: incubator/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/examples/cell/CELL_.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/examples/cell/CELL_.java?rev=426612&r1=426611&r2=426612&view=diff
==============================================================================
--- incubator/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/examples/cell/CELL_.java (original)
+++ incubator/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/examples/cell/CELL_.java Fri Jul 28 10:23:47 2006
@@ -37,13 +37,13 @@
_val = val;
}
- public void self() {
- // INSTANTIATION{Cell(self,val)}
- // ==> self ? [ read(r)={...} & write(newVal)={...} ]
+ public void run() {
+ // INSTANTIATION{Cell(run,val)}
+ // ==> run ? [ read(r)={...} & write(newVal)={...} ]
object(new CellChannelListener(_self) {
public void read(Val r) {
// COMMUNICATION{x & [read... & ... ] | x ! read}
- // ==> Cell(self, val) ...
+ // ==> Cell(run, val) ...
instance(new CELL_<T>(_self, _val));
// ... | r ! val(val)
@@ -55,7 +55,7 @@
@SuppressWarnings("unchecked")
public void write(Object newVal) {
// COMMUNICATION{x & [... & write...]
- // ==> Cell(self, newVal)
+ // ==> Cell(run, newVal)
instance(new CELL_(_self, newVal));
}
});
Modified: incubator/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/examples/eratosthenes/Sieve.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/examples/eratosthenes/Sieve.java?rev=426612&r1=426611&r2=426612&view=diff
==============================================================================
--- incubator/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/examples/eratosthenes/Sieve.java (original)
+++ incubator/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/examples/eratosthenes/Sieve.java Fri Jul 28 10:23:47 2006
@@ -40,7 +40,7 @@
private static int _cnt = 0;
private static int _last = 0;
- public void self() {
+ public void run() {
NaturalNumberStreamChannel integers = newChannel(NaturalNumberStreamChannel.class);
NaturalNumberStreamChannel primes = newChannel(NaturalNumberStreamChannel.class);
instance(new Counter(integers,2));
@@ -65,7 +65,7 @@
_n = n;
}
- public void self() {
+ public void run() {
_out.val(_n, object(new SynchChannelListener(newChannel(SynchChannel.class)) {
public void ret() {
instance(new Counter(_out, _n+1));
@@ -93,7 +93,7 @@
_primes = primes;
}
- public void self() {
+ public void run() {
object(new NaturalNumberStreamChannelListener(_in) {
public void val(final int n, final SynchChannel ret) {
_primes.val(n, object(new SynchChannelListener(newChannel(SynchChannel.class)) {
@@ -114,7 +114,7 @@
public Print(NaturalNumberStreamChannel in) {
_in = in;
}
- public void self() {
+ public void run() {
object(true, new NaturalNumberStreamChannelListener(_in){
public void val(int n, SynchChannel ret) {
_cnt ++;
@@ -144,7 +144,7 @@
_in = in;
_out = out;
}
- public void self() {
+ public void run() {
object(true, new NaturalNumberStreamChannelListener(_in) {
public void val(int n, final SynchChannel ret) {
if (n % _prime != 0)
Modified: incubator/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/examples/synch/SynchPrinter.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/examples/synch/SynchPrinter.java?rev=426612&r1=426611&r2=426612&view=diff
==============================================================================
--- incubator/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/examples/synch/SynchPrinter.java (original)
+++ incubator/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/examples/synch/SynchPrinter.java Fri Jul 28 10:23:47 2006
@@ -37,7 +37,7 @@
public SystemPrinter(SynchPrintChannel self) {
this.self = self;
}
- public void self() {
+ public void run() {
object(true, new SynchPrintChannelListener(self) {
public SynchChannel print(String msg) {
System.out.println(msg);
@@ -48,7 +48,7 @@
}
public static final class Tester extends JacobRunnable {
- public void self() {
+ public void run() {
final SynchPrintChannel p = newChannel(SynchPrintChannel.class);
instance(new SystemPrinter(p));
object(new SynchChannelListener(p.print("1")) {
Modified: incubator/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java?rev=426612&r1=426611&r2=426612&view=diff
==============================================================================
--- incubator/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java (original)
+++ incubator/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java Fri Jul 28 10:23:47 2006
@@ -59,12 +59,12 @@
private static final Method REDUCE_METHOD;
- /** Pre-fetch the {@link JacobRunnable#self} method */
+ /** Pre-fetch the {@link JacobRunnable#run} method */
static {
Method rm = null;
try {
- rm = JacobRunnable.class.getMethod("self", ArrayUtils.EMPTY_CLASS_ARRAY);
+ rm = JacobRunnable.class.getMethod("run", ArrayUtils.EMPTY_CLASS_ARRAY);
} catch (Exception e) {
e.printStackTrace();
}
Modified: incubator/ode/trunk/jacob/src/test/java/org/apache/ode/jacob/SynchTest.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/jacob/src/test/java/org/apache/ode/jacob/SynchTest.java?rev=426612&r1=426611&r2=426612&view=diff
==============================================================================
--- incubator/ode/trunk/jacob/src/test/java/org/apache/ode/jacob/SynchTest.java (original)
+++ incubator/ode/trunk/jacob/src/test/java/org/apache/ode/jacob/SynchTest.java Fri Jul 28 10:23:47 2006
@@ -30,7 +30,7 @@
// TODO still needed? apparently unused..
private static final class P extends JacobRunnable {
- public void self() {
+ public void run() {
}
}
}
Modified: incubator/ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/JacobCellTest.java
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/JacobCellTest.java?rev=426612&r1=426611&r2=426612&view=diff
==============================================================================
--- incubator/ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/JacobCellTest.java (original)
+++ incubator/ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/JacobCellTest.java Fri Jul 28 10:23:47 2006
@@ -54,7 +54,7 @@
}
static class CellTest1 extends JacobRunnable {
- public void self() {
+ public void run() {
CellChannel cellChannel = newChannel(CellChannel.class, "cell");
ValChannel retChannel = newChannel(ValChannel.class, "val");
@@ -77,7 +77,7 @@
_x = x;
}
- public void self() {
+ public void run() {
int y = _x ^ _x;
_out.val(Integer.valueOf(y));
}
@@ -85,7 +85,7 @@
// TODO still needed?
private static class Foo extends JacobRunnable {
- public void self() {
+ public void run() {
ValChannel print = newChannel(ValChannel.class);
instance(new Compute(1, print));
instance(new Compute(2, print));
@@ -101,7 +101,7 @@
_val = val;
}
- public void self() {
+ public void run() {
object(new ValChannelListener(_val) {
public void val(Object retVal) {
System.out.println(retVal);
Copied: incubator/ode/trunk/jacob/src/xdt/org/apache/ode/jacob/ChannelListener.xdt (from r426596, incubator/ode/trunk/jacob/src/xdt/org/apache/ode/jacob/ML.xdt)
URL: http://svn.apache.org/viewvc/incubator/ode/trunk/jacob/src/xdt/org/apache/ode/jacob/ChannelListener.xdt?p2=incubator/ode/trunk/jacob/src/xdt/org/apache/ode/jacob/ChannelListener.xdt&p1=incubator/ode/trunk/jacob/src/xdt/org/apache/ode/jacob/ML.xdt&r1=426596&r2=426612&rev=426612&view=diff
==============================================================================
--- incubator/ode/trunk/jacob/src/xdt/org/apache/ode/jacob/ML.xdt (original)
+++ incubator/ode/trunk/jacob/src/xdt/org/apache/ode/jacob/ChannelListener.xdt Fri Jul 28 10:23:47 2006
@@ -7,14 +7,14 @@
import org.apache.commons.logging.LogFactory;
import org.apache.commons.logging.Log;
-public abstract class <XDtClass:classOf><XDtClass:fullClassName/>ML</XDtClass:classOf>
- extends org.apache.ode.jacob.ML<<XDtClass:classOf><XDtClass:fullClassName/>Channel</XDtClass:classOf>>
+public abstract class <XDtClass:classOf><XDtClass:fullClassName/>ChannelListener</XDtClass:classOf>
+ extends org.apache.ode.jacob.ChannelListener<<XDtClass:classOf><XDtClass:fullClassName/>Channel</XDtClass:classOf>>
implements <XDtClass:classOf><XDtClass:fullClassName/></XDtClass:classOf>
{
- private static final Log __log = LogFactory.getLog(<XDtClass:classOf><XDtClass:fullClassName/>ML</XDtClass:classOf>.class);
+ private static final Log __log = LogFactory.getLog(<XDtClass:classOf><XDtClass:fullClassName/>ChannelListener</XDtClass:classOf>.class);
protected Log log() { return __log; }
- protected <XDtClass:classOf><XDtClass:fullClassName/>ML</XDtClass:classOf>(
+ protected <XDtClass:classOf><XDtClass:fullClassName/>ChannelListener</XDtClass:classOf>(
<XDtClass:classOf><XDtClass:fullClassName/>Channel</XDtClass:classOf> channel) {
super(channel);
}