Author: hadrian
Date: Thu Jan 17 01:53:15 2013
New Revision: 1434538
URL: http://svn.apache.org/viewvc?rev=1434538&view=rev
Log:
ODE-987. Remove use of a few more *Channels...
Modified:
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/SCOPE.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/synch/SynchPrinter.java
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=1434538&r1=1434537&r2=1434538&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 01:53:15 2013
@@ -18,12 +18,12 @@
*/
package org.apache.ode.bpel.runtime;
-import org.apache.ode.bpel.runtime.channels.CompensationChannel;
-
import java.io.Serializable;
import java.util.Collections;
import java.util.Set;
+import org.apache.ode.bpel.runtime.channels.Compensation;
+
/**
* A handle to a compensation handler.
@@ -35,7 +35,7 @@ public class CompensationHandler impleme
final ScopeFrame compensated;
/** Compensation activation channel. */
- final CompensationChannel compChannel;
+ final Compensation compChannel;
/** Time that the scope was started. */
final long scopeStartTime;
@@ -43,7 +43,7 @@ public class CompensationHandler impleme
/** Time that the scope was completed. */
final long scopeEndTime;
- CompensationHandler(ScopeFrame compensated, CompensationChannel compChannel,
long scopeStartTime, long scopeEndTime) {
+ CompensationHandler(ScopeFrame compensated, Compensation compChannel, long
scopeStartTime, long scopeEndTime) {
assert compChannel != null;
this.compensated = compensated;
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=1434538&r1=1434537&r2=1434538&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 01:53:15 2013
@@ -30,7 +30,6 @@ import org.apache.ode.bpel.explang.Evalu
import org.apache.ode.bpel.o.OEventHandler;
import org.apache.ode.bpel.o.OScope;
import org.apache.ode.bpel.runtime.channels.EventHandlerControl;
-import org.apache.ode.bpel.runtime.channels.EventHandlerControlChannel;
import org.apache.ode.bpel.runtime.channels.FaultData;
import org.apache.ode.bpel.runtime.channels.ParentScope;
import org.apache.ode.bpel.runtime.channels.ParentScopeChannel;
@@ -59,7 +58,7 @@ class EH_ALARM extends BpelJacobRunnable
private TerminationChannel _tc;
private OEventHandler.OAlarm _oalarm;
private ScopeFrame _scopeFrame;
- private EventHandlerControlChannel _cc;
+ private EventHandlerControl _cc;
private Set<CompensationHandler> _comps = new
HashSet<CompensationHandler>();
/**
@@ -70,7 +69,7 @@ class EH_ALARM extends BpelJacobRunnable
* @param o our prototype / compiled representation
* @param scopeFrame the {@link ScopeFrame} in which we are executing
*/
- EH_ALARM(ParentScopeChannel psc, TerminationChannel tc,
EventHandlerControlChannel cc, OEventHandler.OAlarm o, ScopeFrame scopeFrame) {
+ EH_ALARM(ParentScopeChannel psc, TerminationChannel tc,
EventHandlerControl cc, OEventHandler.OAlarm o, ScopeFrame scopeFrame) {
_psc = psc;
_tc = tc;
_cc = cc;
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=1434538&r1=1434537&r2=1434538&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 01:53:15 2013
@@ -30,7 +30,6 @@ import org.apache.ode.bpel.evt.VariableM
import org.apache.ode.bpel.o.OEventHandler;
import org.apache.ode.bpel.o.OScope;
import org.apache.ode.bpel.runtime.channels.EventHandlerControl;
-import org.apache.ode.bpel.runtime.channels.EventHandlerControlChannel;
import org.apache.ode.bpel.runtime.channels.FaultData;
import org.apache.ode.bpel.runtime.channels.ParentScope;
import org.apache.ode.bpel.runtime.channels.ParentScopeChannel;
@@ -54,7 +53,7 @@ class EH_EVENT extends BpelJacobRunnable
private static final Log __log = LogFactory.getLog(EH_EVENT.class);
- private EventHandlerControlChannel _ehc;
+ private EventHandlerControl _ehc;
private TerminationChannel _tc;
private ParentScopeChannel _psc;
private ScopeFrame _scopeFrame;
@@ -77,7 +76,7 @@ class EH_EVENT extends BpelJacobRunnable
private boolean _childrenTerminated;
- EH_EVENT(ParentScopeChannel psc,TerminationChannel tc,
EventHandlerControlChannel ehc, OEventHandler.OEvent o, ScopeFrame scopeFrame) {
+ EH_EVENT(ParentScopeChannel psc,TerminationChannel tc, EventHandlerControl
ehc, OEventHandler.OEvent o, ScopeFrame scopeFrame) {
_scopeFrame = scopeFrame;
_oevent = o;
_tc = tc;
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=1434538&r1=1434537&r2=1434538&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 01:53:15 2013
@@ -44,8 +44,8 @@ import org.apache.ode.bpel.o.OLink;
import org.apache.ode.bpel.o.OMessageVarType;
import org.apache.ode.bpel.o.OScope;
import org.apache.ode.bpel.o.OVarType;
-import org.apache.ode.bpel.runtime.channels.CompensationChannel;
-import org.apache.ode.bpel.runtime.channels.EventHandlerControlChannel;
+import org.apache.ode.bpel.runtime.channels.Compensation;
+import org.apache.ode.bpel.runtime.channels.EventHandlerControl;
import org.apache.ode.bpel.runtime.channels.FaultData;
import org.apache.ode.bpel.runtime.channels.ParentScope;
import org.apache.ode.bpel.runtime.channels.ParentScopeChannel;
@@ -87,7 +87,7 @@ class SCOPE extends ACTIVITY {
for (Iterator<OEventHandler.OAlarm> i =
_oscope.eventHandler.onAlarms.iterator(); i.hasNext(); ) {
OEventHandler.OAlarm alarm = i.next();
EventHandlerInfo ehi = new EventHandlerInfo(alarm,
- newChannel(EventHandlerControlChannel.class),
+ newChannel(EventHandlerControl.class),
newChannel(ParentScopeChannel.class),
newChannel(TerminationChannel.class));
_eventHandlers.add(ehi);
@@ -97,7 +97,7 @@ class SCOPE extends ACTIVITY {
for (Iterator<OEventHandler.OEvent> i =
_oscope.eventHandler.onMessages.iterator(); i.hasNext(); ) {
OEventHandler.OEvent event = i.next();
EventHandlerInfo ehi = new EventHandlerInfo(event,
- newChannel(EventHandlerControlChannel.class),
+ newChannel(EventHandlerControl.class),
newChannel(ParentScopeChannel.class),
newChannel(TerminationChannel.class));
_eventHandlers.add(ehi);
@@ -400,7 +400,7 @@ class SCOPE extends ACTIVITY {
if (_oscope.compensationHandler != null) {
CompensationHandler compensationHandler = new
CompensationHandler(
_scopeFrame,
- newChannel(CompensationChannel.class),
+ newChannel(Compensation.class),
_startTime,
System.currentTimeMillis());
_self.parent.completed(null,
Collections.singleton(compensationHandler));
@@ -500,13 +500,13 @@ class SCOPE extends ACTIVITY {
static final class EventHandlerInfo implements Serializable {
private static final long serialVersionUID = -9046603073542446478L;
final OBase o;
- final EventHandlerControlChannel cc;
+ final EventHandlerControl cc;
final ParentScopeChannel psc;
final TerminationChannel tc;
boolean terminateRequested;
boolean stopRequested;
- EventHandlerInfo(OBase o, EventHandlerControlChannel cc,
ParentScopeChannel psc, TerminationChannel tc) {
+ EventHandlerInfo(OBase o, EventHandlerControl cc, ParentScopeChannel
psc, TerminationChannel tc) {
this.o = o;
this.cc = cc;
this.psc = psc;
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=1434538&r1=1434537&r2=1434538&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 01:53:15 2013
@@ -44,8 +44,8 @@ public class Sieve extends JacobRunnable
private static int _last = 0;
public void run() {
- NaturalNumberStreamChannel integers =
newChannel(NaturalNumberStreamChannel.class);
- NaturalNumberStreamChannel primes =
newChannel(NaturalNumberStreamChannel.class);
+ NaturalNumberStream integers = newChannel(NaturalNumberStream.class);
+ NaturalNumberStream primes = newChannel(NaturalNumberStream.class);
instance(new Counter(integers,2));
instance(new Head(integers,primes));
instance(new Print(primes));
@@ -62,10 +62,10 @@ public class Sieve extends JacobRunnable
private static class Counter extends JacobRunnable {
private static final long serialVersionUID = 4739323750438991003L;
- private NaturalNumberStreamChannel _out;
+ private NaturalNumberStream _out;
private int _n;
- public Counter(NaturalNumberStreamChannel out, int n) {
+ public Counter(NaturalNumberStream out, int n) {
_out = out;
_n = n;
}
@@ -94,10 +94,10 @@ public class Sieve extends JacobRunnable
private static final class Head extends JacobRunnable {
private static final long serialVersionUID = 1791641314141082728L;
- NaturalNumberStreamChannel _in;
- NaturalNumberStreamChannel _primes;
+ NaturalNumberStream _in;
+ NaturalNumberStream _primes;
- public Head(NaturalNumberStreamChannel in, NaturalNumberStreamChannel
primes) {
+ public Head(NaturalNumberStream in, NaturalNumberStream primes) {
_in = in;
_primes = primes;
}
@@ -107,7 +107,7 @@ public class Sieve extends JacobRunnable
public void val(final int n, final SynchChannel ret) {
_primes.val(n, (SynchChannel)object(new
ReceiveProcess<Synch>(newChannel(SynchChannel.class), new Synch() {
public void ret() {
- NaturalNumberStreamChannel x =
newChannel(NaturalNumberStreamChannel.class);
+ NaturalNumberStream x = newChannel(NaturalNumberStream.class);
instance(new PrimeFilter(n, _in, x));
instance(new Head(x, _primes));
ret.ret();
@@ -125,8 +125,8 @@ public class Sieve extends JacobRunnable
private static final class Print extends JacobRunnable {
private static final long serialVersionUID = -3134193737519487672L;
- private NaturalNumberStreamChannel _in;
- public Print(NaturalNumberStreamChannel in) {
+ private NaturalNumberStream _in;
+ public Print(NaturalNumberStream in) {
_in = in;
}
public void run() {
@@ -155,10 +155,10 @@ public class Sieve extends JacobRunnable
private static final long serialVersionUID = 1569523200422202448L;
private int _prime;
- private NaturalNumberStreamChannel _in;
- private NaturalNumberStreamChannel _out;
+ private NaturalNumberStream _in;
+ private NaturalNumberStream _out;
- public PrimeFilter(int prime, NaturalNumberStreamChannel in,
NaturalNumberStreamChannel out) {
+ public PrimeFilter(int prime, NaturalNumberStream in, NaturalNumberStream
out) {
_prime = prime;
_in = in;
_out = out;
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=1434538&r1=1434537&r2=1434538&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 01:53:15 2013
@@ -35,9 +35,9 @@ public class SynchPrinter {
public static final class SystemPrinter extends JacobRunnable {
private static final long serialVersionUID = -8516348116865575605L;
- private SynchPrintChannel _self;
+ private SynchPrint _self;
- public SystemPrinter(SynchPrintChannel self) {
+ public SystemPrinter(SynchPrint self) {
_self = self;
}
@@ -45,7 +45,7 @@ public class SynchPrinter {
object(true, new ReceiveProcess<SynchPrint>(_self, new
SynchPrint() {
public SynchChannel print(String msg) {
System.out.println(msg);
- return null; // SynchChannel automatically created by
JacobVPU
+ return null; // Synch channel automatically created by
JacobVPU
}
}) {
private static final long serialVersionUID =
-1990741944766989782L;
@@ -58,7 +58,7 @@ public class SynchPrinter {
@SuppressWarnings("serial")
public void run() {
- final SynchPrintChannel p = newChannel(SynchPrintChannel.class);
+ final SynchPrint p = newChannel(SynchPrint.class);
instance(new SystemPrinter(p));
object(new ReceiveProcess<Synch>(p.print("1"), new Synch() {
public void ret() {
