You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ode.apache.org by ha...@apache.org on 2013/01/17 05:37:01 UTC
svn commit: r1434552 - in /ode/trunk:
bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/
bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/
jacob/src/main/java/org/apache/ode/jacob/vpu/
jacob/src/test/java/org/apache/ode/jacob/exampl...
Author: hadrian
Date: Thu Jan 17 04:37:00 2013
New Revision: 1434552
URL: http://svn.apache.org/viewvc?rev=1434552&view=rev
Log:
ODE-987. Remove the use SynchChannel
Modified:
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ACTIVITYGUARD.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/COMPENSATE.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/COMPENSATIONHANDLER_.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_ALARM.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_EVENT.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FLOW.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FOREACH.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ORDEREDCOMPENSATOR.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PROCESS.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/READWRITELOCK.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/REPEATUNTIL.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPEACT.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SEQUENCE.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WHILE.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/Compensation.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ParentScope.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ReadWriteLock.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStream.java
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/eratosthenes/Sieve.java
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/helloworld/HelloWorld.java
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/sequence/Sequence.java
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrint.java
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrinter.java
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ACTIVITYGUARD.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ACTIVITYGUARD.java?rev=1434552&r1=1434551&r2=1434552&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ACTIVITYGUARD.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ACTIVITYGUARD.java Thu Jan 17 04:37:00 2013
@@ -52,7 +52,7 @@ import org.apache.ode.bpel.runtime.chann
import org.apache.ode.bpel.runtime.channels.TimerResponseChannel;
import org.apache.ode.jacob.ChannelListener;
import org.apache.ode.jacob.ReceiveProcess;
-import org.apache.ode.jacob.SynchChannel;
+import org.apache.ode.jacob.Synch;
import org.w3c.dom.Element;
class ACTIVITYGUARD extends ACTIVITY {
@@ -201,7 +201,7 @@ class ACTIVITYGUARD extends ACTIVITY {
public void run() {
object(new ReceiveProcess<ParentScope>(_in, new ParentScope() {
- public void compensate(OScope scope, SynchChannel ret) {
+ public void compensate(OScope scope, Synch ret) {
_self.parent.compensate(scope,ret);
instance(TCONDINTERCEPT.this);
}
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/COMPENSATE.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/COMPENSATE.java?rev=1434552&r1=1434551&r2=1434552&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/COMPENSATE.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/COMPENSATE.java Thu Jan 17 04:37:00 2013
@@ -22,7 +22,6 @@ import org.apache.ode.bpel.o.OCompensate
import org.apache.ode.bpel.o.OScope;
import org.apache.ode.jacob.ReceiveProcess;
import org.apache.ode.jacob.Synch;
-import org.apache.ode.jacob.SynchChannel;
/**
@@ -39,7 +38,7 @@ class COMPENSATE extends ACTIVITY {
public final void run() {
OScope scopeToCompensate = _ocompact.compensatedScope;
- SynchChannel sc = newChannel(SynchChannel.class);
+ Synch sc = newChannel(Synch.class);
_self.parent.compensate(scopeToCompensate,sc);
object(new ReceiveProcess<Synch>(sc, new Synch() {
public void ret() {
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/COMPENSATIONHANDLER_.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/COMPENSATIONHANDLER_.java?rev=1434552&r1=1434551&r2=1434552&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/COMPENSATIONHANDLER_.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/COMPENSATIONHANDLER_.java Thu Jan 17 04:37:00 2013
@@ -30,7 +30,7 @@ import org.apache.ode.bpel.runtime.chann
import org.apache.ode.bpel.runtime.channels.ParentScopeChannel;
import org.apache.ode.bpel.runtime.channels.TerminationChannel;
import org.apache.ode.jacob.ReceiveProcess;
-import org.apache.ode.jacob.SynchChannel;
+import org.apache.ode.jacob.Synch;
import org.w3c.dom.Element;
/**
@@ -55,7 +55,7 @@ class COMPENSATIONHANDLER_ extends BpelJ
i.next().compChannel.forget();
}
- public void compensate(final SynchChannel ret) {
+ public void compensate(final Synch ret) {
// Only scopes with compensation handlers can be compensated.
assert _self.compensated.oscope.compensationHandler != null;
@@ -74,7 +74,7 @@ class COMPENSATIONHANDLER_ extends BpelJ
instance(new SCOPE(ai,compHandlerScopeFrame, new LinkFrame(null)));
object(new ReceiveProcess<ParentScope>(ai.parent, new ParentScope() {
- public void compensate(OScope scope, SynchChannel ret) {
+ public void compensate(OScope scope, Synch ret) {
throw new AssertionError("Unexpected.");
}
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_ALARM.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_ALARM.java?rev=1434552&r1=1434551&r2=1434552&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_ALARM.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_ALARM.java Thu Jan 17 04:37:00 2013
@@ -39,7 +39,7 @@ import org.apache.ode.bpel.runtime.chann
import org.apache.ode.bpel.runtime.channels.TimerResponseChannel;
import org.apache.ode.jacob.ChannelListener;
import org.apache.ode.jacob.ReceiveProcess;
-import org.apache.ode.jacob.SynchChannel;
+import org.apache.ode.jacob.Synch;
import org.w3c.dom.Element;
/**
@@ -208,7 +208,7 @@ class EH_ALARM extends BpelJacobRunnable
public void run() {
object(false,new ReceiveProcess<ParentScope>(_activity.parent, new ParentScope() {
- public void compensate(OScope scope, SynchChannel ret) {
+ public void compensate(OScope scope, Synch ret) {
_psc.compensate(scope,ret);
instance(ACTIVE.this);
}
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_EVENT.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_EVENT.java?rev=1434552&r1=1434551&r2=1434552&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_EVENT.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/EH_EVENT.java Thu Jan 17 04:37:00 2013
@@ -40,7 +40,7 @@ import org.apache.ode.bpel.runtime.chann
import org.apache.ode.jacob.ChannelListener;
import org.apache.ode.jacob.ProcessUtil;
import org.apache.ode.jacob.ReceiveProcess;
-import org.apache.ode.jacob.SynchChannel;
+import org.apache.ode.jacob.Synch;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -192,7 +192,7 @@ class EH_EVENT extends BpelJacobRunnable
for (final ActivityInfo ai : _active) {
mlset.add(new ReceiveProcess<ParentScope>(ai.parent, new ParentScope() {
- public void compensate(OScope scope, SynchChannel ret) {
+ public void compensate(OScope scope, Synch ret) {
_psc.compensate(scope, ret);
instance(WAITING.this);
}
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FLOW.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FLOW.java?rev=1434552&r1=1434551&r2=1434552&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FLOW.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FLOW.java Thu Jan 17 04:37:00 2013
@@ -34,7 +34,7 @@ import org.apache.ode.bpel.runtime.chann
import org.apache.ode.bpel.runtime.channels.TerminationChannel;
import org.apache.ode.jacob.ChannelListener;
import org.apache.ode.jacob.ReceiveProcess;
-import org.apache.ode.jacob.SynchChannel;
+import org.apache.ode.jacob.Synch;
import org.apache.ode.utils.stl.FilterIterator;
import org.apache.ode.utils.stl.MemberOfFunction;
import org.w3c.dom.Element;
@@ -106,7 +106,7 @@ class FLOW extends ACTIVITY {
instance(ACTIVE.this);
}
- public void compensate(OScope scope, SynchChannel ret) {
+ public void compensate(OScope scope, Synch ret) {
// Flow does not do compensations, forward these to parent.
_self.parent.compensate(scope, ret);
instance(ACTIVE.this);
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FOREACH.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FOREACH.java?rev=1434552&r1=1434551&r2=1434552&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FOREACH.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/FOREACH.java Thu Jan 17 04:37:00 2013
@@ -39,7 +39,7 @@ import org.apache.ode.bpel.runtime.chann
import org.apache.ode.bpel.runtime.channels.TerminationChannel;
import org.apache.ode.jacob.ChannelListener;
import org.apache.ode.jacob.ReceiveProcess;
-import org.apache.ode.jacob.SynchChannel;
+import org.apache.ode.jacob.Synch;
import org.apache.ode.utils.DOMUtils;
import org.apache.ode.utils.stl.FilterIterator;
import org.apache.ode.utils.stl.MemberOfFunction;
@@ -129,7 +129,7 @@ public class FOREACH extends ACTIVITY {
// Checking out our children
final ChildInfo child = active.next();
mlSet.add(new ReceiveProcess<ParentScope>(child.activity.parent, new ParentScope() {
- public void compensate(OScope scope, SynchChannel ret) {
+ public void compensate(OScope scope, Synch ret) {
// Forward compensation to parent
_self.parent.compensate(scope, ret);
instance(ACTIVE.this);
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ORDEREDCOMPENSATOR.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ORDEREDCOMPENSATOR.java?rev=1434552&r1=1434551&r2=1434552&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ORDEREDCOMPENSATOR.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/ORDEREDCOMPENSATOR.java Thu Jan 17 04:37:00 2013
@@ -24,52 +24,50 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ode.jacob.ReceiveProcess;
import org.apache.ode.jacob.Synch;
-import org.apache.ode.jacob.SynchChannel;
+
/**
* Serially activates a list of compensations in order.
*/
class ORDEREDCOMPENSATOR extends BpelJacobRunnable {
- private static final long serialVersionUID = -3181661355085428370L;
-
- private static final Log __log = LogFactory.getLog(ORDEREDCOMPENSATOR.class);
+ private static final long serialVersionUID = -3181661355085428370L;
- private List<CompensationHandler> _compensations;
- private SynchChannel _ret;
+ private static final Log __log = LogFactory.getLog(ORDEREDCOMPENSATOR.class);
- public ORDEREDCOMPENSATOR(List<CompensationHandler> compensations, SynchChannel ret) {
- _compensations = compensations;
- _ret = ret;
- }
+ private List<CompensationHandler> _compensations;
+ private Synch _ret;
- 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 ReceiveProcess<Synch>(r, new Synch() {
- public void ret() {
- instance(ORDEREDCOMPENSATOR.this);
- }
- }) {
- private static final long serialVersionUID = 7173916663479205420L;
- });
+ public ORDEREDCOMPENSATOR(List<CompensationHandler> compensations, Synch ret) {
+ _compensations = compensations;
+ _ret = ret;
}
- }
+ public void run() {
+ if (_compensations.isEmpty()) {
+ _ret.ret();
+ } else {
+ Synch r = newChannel(Synch.class);
+ CompensationHandler cdata = _compensations.remove(0);
+ cdata.compChannel.compensate(r);
+ object(new ReceiveProcess<Synch>(r, new Synch() {
+ public void ret() {
+ instance(ORDEREDCOMPENSATOR.this);
+ }
+ }) {
+ private static final long serialVersionUID = 7173916663479205420L;
+ });
+ }
+ }
- protected Log log() {
- return __log;
- }
+ protected Log log() {
+ return __log;
+ }
- public String toString() {
- return new StringBuffer("ORDEREDCOMPENSATOR(comps=")
+ public String toString() {
+ return new StringBuffer("ORDEREDCOMPENSATOR(comps=")
.append(_compensations)
.append(")")
.toString();
- }
+ }
}
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PROCESS.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PROCESS.java?rev=1434552&r1=1434551&r2=1434552&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PROCESS.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PROCESS.java Thu Jan 17 04:37:00 2013
@@ -32,7 +32,7 @@ import org.apache.ode.bpel.runtime.chann
import org.apache.ode.bpel.runtime.channels.ReadWriteLock;
import org.apache.ode.bpel.runtime.channels.TerminationChannel;
import org.apache.ode.jacob.ReceiveProcess;
-import org.apache.ode.jacob.SynchChannel;
+import org.apache.ode.jacob.Synch;
import org.w3c.dom.Element;
public class PROCESS extends BpelJacobRunnable {
@@ -61,7 +61,7 @@ public class PROCESS extends BpelJacobRu
instance(new SCOPE(child, processFrame, new LinkFrame(null)));
object(new ReceiveProcess<ParentScope>(child.parent, new ParentScope() {
- public void compensate(OScope scope, SynchChannel ret) {
+ public void compensate(OScope scope, Synch ret) {
assert false;
}
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/READWRITELOCK.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/READWRITELOCK.java?rev=1434552&r1=1434551&r2=1434552&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/READWRITELOCK.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/READWRITELOCK.java Thu Jan 17 04:37:00 2013
@@ -25,7 +25,7 @@ import java.util.LinkedList;
import org.apache.ode.bpel.runtime.channels.ReadWriteLock;
import org.apache.ode.jacob.JacobRunnable;
import org.apache.ode.jacob.ReceiveProcess;
-import org.apache.ode.jacob.SynchChannel;
+import org.apache.ode.jacob.Synch;
/**
* A fair READ-WRITE lock.
@@ -43,7 +43,7 @@ public class READWRITELOCK extends Jacob
private LinkedList<Waiter> _waiters = new LinkedList<Waiter>();
- private HashSet<SynchChannel> _owners = new HashSet<SynchChannel>();
+ private HashSet<Synch> _owners = new HashSet<Synch>();
private Status _status = Status.UNLOCKED;
@@ -56,7 +56,7 @@ public class READWRITELOCK extends Jacob
@Override
public void run() {
object(new ReceiveProcess<ReadWriteLock>(_self, new ReadWriteLock() {
- public void readLock(SynchChannel s) {
+ public void readLock(Synch s) {
switch (_status) {
case UNLOCKED:
_status = Status.READLOCK;
@@ -75,7 +75,7 @@ public class READWRITELOCK extends Jacob
instance(READWRITELOCK.this);
}
- public void writeLock(SynchChannel s) {
+ public void writeLock(Synch s) {
switch (_status) {
case UNLOCKED:
_status = Status.WRITELOCK;
@@ -93,7 +93,7 @@ public class READWRITELOCK extends Jacob
instance(READWRITELOCK.this);
}
- public void unlock(SynchChannel s) {
+ public void unlock(Synch s) {
_owners.remove(s);
if (_owners.isEmpty()) {
@@ -125,11 +125,10 @@ public class READWRITELOCK extends Jacob
}
private static class Waiter {
- SynchChannel synch;
-
+ Synch synch;
boolean write;
- Waiter(SynchChannel s, boolean w) {
+ Waiter(Synch s, boolean w) {
synch = s;
write = w;
}
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/REPEATUNTIL.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/REPEATUNTIL.java?rev=1434552&r1=1434551&r2=1434552&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/REPEATUNTIL.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/REPEATUNTIL.java Thu Jan 17 04:37:00 2013
@@ -33,7 +33,7 @@ import org.apache.ode.bpel.runtime.chann
import org.apache.ode.bpel.runtime.channels.Termination;
import org.apache.ode.bpel.runtime.channels.TerminationChannel;
import org.apache.ode.jacob.ReceiveProcess;
-import org.apache.ode.jacob.SynchChannel;
+import org.apache.ode.jacob.Synch;
import org.w3c.dom.Element;
public class REPEATUNTIL extends ACTIVITY {
@@ -105,7 +105,7 @@ public class REPEATUNTIL extends ACTIVIT
}) {
private static final long serialVersionUID = -5471984635653784051L;
}.or(new ReceiveProcess<ParentScope>(_child.parent, new ParentScope() {
- public void compensate(OScope scope, SynchChannel ret) {
+ public void compensate(OScope scope, Synch ret) {
_self.parent.compensate(scope,ret);
instance(WAITER.this);
}
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.java?rev=1434552&r1=1434551&r2=1434552&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPE.java Thu Jan 17 04:37:00 2013
@@ -53,7 +53,7 @@ import org.apache.ode.bpel.runtime.chann
import org.apache.ode.bpel.runtime.channels.TerminationChannel;
import org.apache.ode.jacob.ChannelListener;
import org.apache.ode.jacob.ReceiveProcess;
-import org.apache.ode.jacob.SynchChannel;
+import org.apache.ode.jacob.Synch;
import org.w3c.dom.Element;
/**
@@ -165,7 +165,7 @@ class SCOPE extends ACTIVITY {
// Handle messages from the child if it is still alive
if (_child != null) {
mlSet.add(new ReceiveProcess<ParentScope>(_child.parent, new ParentScope() {
- public void compensate(OScope scope, SynchChannel ret) {
+ public void compensate(OScope scope, Synch ret) {
// If this scope does not have available compensations, defer to
// parent scope, otherwise do compensation.
if (_scopeFrame.availableCompensations == null)
@@ -220,7 +220,7 @@ class SCOPE extends ACTIVITY {
final EventHandlerInfo ehi = i.next();
mlSet.add(new ReceiveProcess<ParentScope>(ehi.psc, new ParentScope() {
- public void compensate(OScope scope, SynchChannel ret) {
+ public void compensate(OScope scope, Synch ret) {
// ACTIVE scopes do not compensate, send request up to parent.
_self.parent.compensate(scope, ret);
instance(ACTIVE.this);
@@ -295,7 +295,7 @@ class SCOPE extends ACTIVITY {
instance(new SCOPE(terminationHandlerActivity,terminationHandlerScopeFrame, SCOPE.this._linkFrame));
object(new ReceiveProcess<ParentScope>(terminationHandlerActivity.parent, new ParentScope() {
- public void compensate(OScope scope, SynchChannel ret) {
+ public void compensate(OScope scope, Synch ret) {
// This should never happen.
throw new AssertionError("received compensate request!");
}
@@ -374,7 +374,7 @@ class SCOPE extends ACTIVITY {
instance(new SCOPE(faultHandlerActivity,faultHandlerScopeFrame, SCOPE.this._linkFrame));
object(new ReceiveProcess<ParentScope>(faultHandlerActivity.parent, new ParentScope() {
- public void compensate(OScope scope, SynchChannel ret) {
+ public void compensate(OScope scope, Synch ret) {
// This should never happen.
throw new AssertionError("received compensate request!");
}
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPEACT.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPEACT.java?rev=1434552&r1=1434551&r2=1434552&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPEACT.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SCOPEACT.java Thu Jan 17 04:37:00 2013
@@ -40,7 +40,6 @@ import org.apache.ode.bpel.runtime.chann
import org.apache.ode.jacob.ChannelListener;
import org.apache.ode.jacob.ReceiveProcess;
import org.apache.ode.jacob.Synch;
-import org.apache.ode.jacob.SynchChannel;
import org.apache.ode.jacob.Val;
import org.w3c.dom.Element;
@@ -59,7 +58,7 @@ public class SCOPEACT extends ACTIVITY {
public void run() {
if (((OScope) _self.o).isolatedScope) {
__log.debug("found ISOLATED scope, instance ISOLATEDGUARD");
- instance(new ISOLATEDGUARD(createLockList(), newChannel(SynchChannel.class)));
+ instance(new ISOLATEDGUARD(createLockList(), newChannel(Synch.class)));
} else {
ScopeFrame newFrame = new ScopeFrame((OScope) _self.o, getBpelRuntimeContext().createScopeInstance(
@@ -220,9 +219,9 @@ public class SCOPEACT extends ACTIVITY {
final LinkedList<IsolationLock> _locksAcquired = new LinkedList<IsolationLock>();
- final SynchChannel _synchChannel;
+ final Synch _synchChannel;
- ISOLATEDGUARD(List<IsolationLock> locks, SynchChannel synchChannel) {
+ ISOLATEDGUARD(List<IsolationLock> locks, Synch synchChannel) {
_locksNeeded = locks;
_synchChannel = synchChannel;
}
@@ -288,13 +287,13 @@ public class SCOPEACT extends ACTIVITY {
private final ParentScopeChannel _parent;
- private final SynchChannel _synchChannel;
+ private final Synch _synchChannel;
private final List<IsolationLock> _locks;
private final Val _linkStatusInterceptor;
- public UNLOCKER(ParentScopeChannel self, ParentScopeChannel parent, SynchChannel synchChannel,
+ public UNLOCKER(ParentScopeChannel self, ParentScopeChannel parent, Synch synchChannel,
List<IsolationLock> locksAcquired, Val linkStatusInterceptor) {
_self = self;
_parent = parent;
@@ -315,7 +314,7 @@ public class SCOPEACT extends ACTIVITY {
// no more listening.
}
- public void compensate(OScope scope, SynchChannel ret) {
+ public void compensate(OScope scope, Synch ret) {
_parent.compensate(scope, ret);
// keep listening
instance(UNLOCKER.this);
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SEQUENCE.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SEQUENCE.java?rev=1434552&r1=1434551&r2=1434552&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SEQUENCE.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/SEQUENCE.java Thu Jan 17 04:37:00 2013
@@ -34,7 +34,7 @@ import org.apache.ode.bpel.runtime.chann
import org.apache.ode.bpel.runtime.channels.Termination;
import org.apache.ode.bpel.runtime.channels.TerminationChannel;
import org.apache.ode.jacob.ReceiveProcess;
-import org.apache.ode.jacob.SynchChannel;
+import org.apache.ode.jacob.Synch;
import org.w3c.dom.Element;
/**
@@ -92,7 +92,7 @@ class SEQUENCE extends ACTIVITY {
}) {
private static final long serialVersionUID = -2680515407515637639L;
}.or(new ReceiveProcess<ParentScope>(_child.parent, new ParentScope() {
- public void compensate(OScope scope, SynchChannel ret) {
+ public void compensate(OScope scope, Synch ret) {
_self.parent.compensate(scope,ret);
instance(ACTIVE.this);
}
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WHILE.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WHILE.java?rev=1434552&r1=1434551&r2=1434552&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WHILE.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WHILE.java Thu Jan 17 04:37:00 2013
@@ -33,7 +33,7 @@ import org.apache.ode.bpel.runtime.chann
import org.apache.ode.bpel.runtime.channels.Termination;
import org.apache.ode.bpel.runtime.channels.TerminationChannel;
import org.apache.ode.jacob.ReceiveProcess;
-import org.apache.ode.jacob.SynchChannel;
+import org.apache.ode.jacob.Synch;
import org.w3c.dom.Element;
/**
@@ -123,7 +123,7 @@ class WHILE extends ACTIVITY {
}) {
private static final long serialVersionUID = -5471984635653784051L;
}.or(new ReceiveProcess<ParentScope>(_child.parent, new ParentScope() {
- public void compensate(OScope scope, SynchChannel ret) {
+ public void compensate(OScope scope, Synch ret) {
_self.parent.compensate(scope,ret);
instance(WAITER.this);
}
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/Compensation.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/Compensation.java?rev=1434552&r1=1434551&r2=1434552&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/Compensation.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/Compensation.java Thu Jan 17 04:37:00 2013
@@ -19,12 +19,12 @@
package org.apache.ode.bpel.runtime.channels;
import org.apache.ode.jacob.Channel;
-import org.apache.ode.jacob.SynchChannel;
+import org.apache.ode.jacob.Synch;
public interface Compensation extends Channel {
public void forget();
- public void compensate(SynchChannel ret);
+ public void compensate(Synch ret);
}
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ParentScope.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ParentScope.java?rev=1434552&r1=1434551&r2=1434552&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ParentScope.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ParentScope.java Thu Jan 17 04:37:00 2013
@@ -23,7 +23,7 @@ import java.util.Set;
import org.apache.ode.bpel.o.OScope;
import org.apache.ode.bpel.runtime.CompensationHandler;
import org.apache.ode.jacob.Channel;
-import org.apache.ode.jacob.SynchChannel;
+import org.apache.ode.jacob.Synch;
import org.w3c.dom.Element;
@@ -32,7 +32,7 @@ import org.w3c.dom.Element;
*/
public interface ParentScope extends Channel {
- void compensate(OScope scope, SynchChannel ret);
+ void compensate(OScope scope, Synch ret);
void completed(FaultData faultData, Set<CompensationHandler> compensations);
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ReadWriteLock.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ReadWriteLock.java?rev=1434552&r1=1434551&r2=1434552&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ReadWriteLock.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ReadWriteLock.java Thu Jan 17 04:37:00 2013
@@ -19,14 +19,14 @@
package org.apache.ode.bpel.runtime.channels;
import org.apache.ode.jacob.Channel;
-import org.apache.ode.jacob.SynchChannel;
+import org.apache.ode.jacob.Synch;
public interface ReadWriteLock extends Channel {
- public void readLock(SynchChannel s);
+ public void readLock(Synch s);
- public void writeLock(SynchChannel s);
+ public void writeLock(Synch s);
- public void unlock(SynchChannel s);
+ public void unlock(Synch s);
}
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java?rev=1434552&r1=1434551&r2=1434552&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java Thu Jan 17 04:37:00 2013
@@ -30,7 +30,7 @@ import org.apache.ode.jacob.JacobObject;
import org.apache.ode.jacob.JacobRunnable;
import org.apache.ode.jacob.JacobThread;
import org.apache.ode.jacob.ReceiveProcess;
-import org.apache.ode.jacob.SynchChannel;
+import org.apache.ode.jacob.Synch;
import org.apache.ode.jacob.soup.CommChannel;
import org.apache.ode.jacob.soup.CommGroup;
import org.apache.ode.jacob.soup.CommRecv;
@@ -279,14 +279,14 @@ public final class JacobVPU {
_statistics.messagesSent++;
- SynchChannel replyChannel = null;
+ Synch replyChannel = null;
// Check for synchronous methods; create a synchronization channel
if (method.getReturnType() != void.class) {
- if (method.getReturnType() != SynchChannel.class) {
+ if (method.getReturnType() != Synch.class) {
throw new IllegalStateException(
- "ChannelListener method can only return SynchChannel: " + method);
+ "Channel method '" + method + "' must only return void or Synch");
}
- replyChannel = (SynchChannel) newChannel(SynchChannel.class, "", "Reply Channel");
+ replyChannel = (Synch) newChannel(Synch.class, "", "Reply Channel");
Object[] newArgs = new Object[args.length + 1];
System.arraycopy(args, 0, newArgs, 0, args.length);
newArgs[args.length] = replyChannel;
@@ -386,11 +386,11 @@ public final class JacobVPU {
LOG.trace(">> [{}] : {}", _cycle, _source);
Object[] args;
- SynchChannel synchChannel;
+ Synch synchChannel;
if (_method.getReturnType() != void.class) {
args = new Object[_args.length - 1];
System.arraycopy(_args, 0, args, 0, args.length);
- synchChannel = (SynchChannel) _args[args.length];
+ synchChannel = (Synch)_args[args.length];
} else {
args = _args;
synchChannel = null;
Modified: ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStream.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStream.java?rev=1434552&r1=1434551&r2=1434552&view=diff
==============================================================================
--- ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStream.java (original)
+++ ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStream.java Thu Jan 17 04:37:00 2013
@@ -20,7 +20,7 @@ package org.apache.ode.jacob.examples.er
import org.apache.ode.jacob.Channel;
-import org.apache.ode.jacob.SynchChannel;
+import org.apache.ode.jacob.Synch;
/**
* DOCUMENTME.
@@ -31,6 +31,6 @@ import org.apache.ode.jacob.SynchChannel
*/
public interface NaturalNumberStream extends Channel {
- public void val(int n, SynchChannel ret);
+ public void val(int n, Synch ret);
}
Modified: ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/eratosthenes/Sieve.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/eratosthenes/Sieve.java?rev=1434552&r1=1434551&r2=1434552&view=diff
==============================================================================
--- ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/eratosthenes/Sieve.java (original)
+++ ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/eratosthenes/Sieve.java Thu Jan 17 04:37:00 2013
@@ -21,7 +21,6 @@ package org.apache.ode.jacob.examples.er
import org.apache.ode.jacob.JacobRunnable;
import org.apache.ode.jacob.ReceiveProcess;
import org.apache.ode.jacob.Synch;
-import org.apache.ode.jacob.SynchChannel;
import org.apache.ode.jacob.vpu.ExecutionQueueImpl;
import org.apache.ode.jacob.vpu.JacobVPU;
@@ -71,7 +70,7 @@ public class Sieve extends JacobRunnable
}
public void run() {
- _out.val(_n, (SynchChannel)object(new ReceiveProcess<Synch>(newChannel(SynchChannel.class), new Synch() {
+ _out.val(_n, (Synch)object(new ReceiveProcess<Synch>(newChannel(Synch.class), new Synch() {
public void ret() {
instance(new Counter(_out, _n+1));
}
@@ -104,8 +103,8 @@ public class Sieve extends JacobRunnable
public void run() {
object(new ReceiveProcess<NaturalNumberStream>(_in, new NaturalNumberStream() {
- public void val(final int n, final SynchChannel ret) {
- _primes.val(n, (SynchChannel)object(new ReceiveProcess<Synch>(newChannel(SynchChannel.class), new Synch() {
+ public void val(final int n, final Synch ret) {
+ _primes.val(n, (Synch)object(new ReceiveProcess<Synch>(newChannel(Synch.class), new Synch() {
public void ret() {
NaturalNumberStream x = newChannel(NaturalNumberStream.class);
instance(new PrimeFilter(n, _in, x));
@@ -131,7 +130,7 @@ public class Sieve extends JacobRunnable
}
public void run() {
object(true, new ReceiveProcess<NaturalNumberStream>(_in, new NaturalNumberStream(){
- public void val(int n, SynchChannel ret) {
+ public void val(int n, Synch ret) {
_cnt ++;
_last = n;
System.out.println("PRIME: " + n);
@@ -165,9 +164,9 @@ public class Sieve extends JacobRunnable
}
public void run() {
object(true, new ReceiveProcess<NaturalNumberStream>(_in, new NaturalNumberStream() {
- public void val(int n, final SynchChannel ret) {
+ public void val(int n, final Synch ret) {
if (n % _prime != 0) {
- _out.val(n, (SynchChannel)object(new ReceiveProcess<Synch>(newChannel(SynchChannel.class), new Synch() {
+ _out.val(n, (Synch)object(new ReceiveProcess<Synch>(newChannel(Synch.class), new Synch() {
public void ret() {
ret.ret();
}
Modified: ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/helloworld/HelloWorld.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/helloworld/HelloWorld.java?rev=1434552&r1=1434551&r2=1434552&view=diff
==============================================================================
--- ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/helloworld/HelloWorld.java (original)
+++ ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/helloworld/HelloWorld.java Thu Jan 17 04:37:00 2013
@@ -22,7 +22,6 @@ import org.apache.ode.jacob.Channel;
import org.apache.ode.jacob.JacobRunnable;
import org.apache.ode.jacob.ReceiveProcess;
import org.apache.ode.jacob.Synch;
-import org.apache.ode.jacob.SynchChannel;
import org.apache.ode.jacob.Val;
import org.apache.ode.jacob.examples.sequence.Sequence;
import org.apache.ode.jacob.vpu.ExecutionQueueImpl;
@@ -176,7 +175,7 @@ public class HelloWorld extends JacobRun
final String[] greeting = {"Hello", "World"};
instance(new Sequence(greeting.length, null) {
@Override
- protected JacobRunnable doStep(final int step, final SynchChannel done) {
+ protected JacobRunnable doStep(final int step, final Synch done) {
return new JacobRunnable() {
@Override
public void run() {
Modified: ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/sequence/Sequence.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/sequence/Sequence.java?rev=1434552&r1=1434551&r2=1434552&view=diff
==============================================================================
--- ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/sequence/Sequence.java (original)
+++ ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/sequence/Sequence.java Thu Jan 17 04:37:00 2013
@@ -21,7 +21,6 @@ package org.apache.ode.jacob.examples.se
import org.apache.ode.jacob.JacobRunnable;
import org.apache.ode.jacob.ReceiveProcess;
import org.apache.ode.jacob.Synch;
-import org.apache.ode.jacob.SynchChannel;
/**
* Abstract process that executes a number of steps sequentially.
@@ -30,7 +29,7 @@ import org.apache.ode.jacob.SynchChannel
public abstract class Sequence extends JacobRunnable {
private int _steps;
private int _current;
- private SynchChannel _done;
+ private Synch _done;
/**
* Create a {@link Sequence} with a number of steps.
@@ -38,7 +37,7 @@ public abstract class Sequence extends J
* @param steps number of steps
* @param done synchronous callback
*/
- public Sequence(int steps, SynchChannel done) {
+ public Sequence(int steps, Synch done) {
_steps = steps;
_current = 0;
_done = done;
@@ -53,7 +52,7 @@ public abstract class Sequence extends J
_done.ret();
}
} else {
- SynchChannel r = newChannel(SynchChannel.class);
+ Synch r = newChannel(Synch.class);
object(new ReceiveProcess<Synch>(r, new Synch() {
public void ret() {
++_current;
@@ -72,5 +71,5 @@ public abstract class Sequence extends J
* @param done notification after step completion
* @return runnable process
*/
- protected abstract JacobRunnable doStep(int step, SynchChannel done);
+ protected abstract JacobRunnable doStep(int step, Synch done);
}
Modified: ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrint.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrint.java?rev=1434552&r1=1434551&r2=1434552&view=diff
==============================================================================
--- ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrint.java (original)
+++ ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrint.java Thu Jan 17 04:37:00 2013
@@ -19,7 +19,7 @@
package org.apache.ode.jacob.examples.synch;
import org.apache.ode.jacob.Channel;
-import org.apache.ode.jacob.SynchChannel;
+import org.apache.ode.jacob.Synch;
/**
* DOCUMENTME.
@@ -29,6 +29,6 @@ import org.apache.ode.jacob.SynchChannel
*/
public interface SynchPrint extends Channel {
- public SynchChannel print(String msg);
+ public Synch print(String msg);
}
Modified: ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrinter.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrinter.java?rev=1434552&r1=1434551&r2=1434552&view=diff
==============================================================================
--- ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrinter.java (original)
+++ ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrinter.java Thu Jan 17 04:37:00 2013
@@ -21,7 +21,6 @@ package org.apache.ode.jacob.examples.sy
import org.apache.ode.jacob.JacobRunnable;
import org.apache.ode.jacob.ReceiveProcess;
import org.apache.ode.jacob.Synch;
-import org.apache.ode.jacob.SynchChannel;
import org.apache.ode.jacob.vpu.ExecutionQueueImpl;
import org.apache.ode.jacob.vpu.JacobVPU;
@@ -43,7 +42,7 @@ public class SynchPrinter {
public void run() {
object(true, new ReceiveProcess<SynchPrint>(_self, new SynchPrint() {
- public SynchChannel print(String msg) {
+ public Synch print(String msg) {
System.out.println(msg);
return null; // Synch channel automatically created by JacobVPU
}