Author: hadrian
Date: Tue Jan 15 22:38:40 2013
New Revision: 1433714
URL: http://svn.apache.org/viewvc?rev=1433714&view=rev
Log:
ODE-987. Simplify the ReceiveProcess api by removing one generic arg
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/INVOKE.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/PICK.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/WAIT.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WHILE.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ReceiveProcess.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/cell/CELL_.java
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/JacobCellTest.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/sequence/Sequence.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=1433714&r1=1433713&r2=1433714&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
Tue Jan 15 22:38:40 2013
@@ -45,11 +45,9 @@ import org.apache.ode.bpel.runtime.chann
import org.apache.ode.bpel.runtime.channels.ActivityRecoveryChannel;
import org.apache.ode.bpel.runtime.channels.FaultData;
import org.apache.ode.bpel.runtime.channels.LinkStatus;
-import org.apache.ode.bpel.runtime.channels.LinkStatusChannel;
import org.apache.ode.bpel.runtime.channels.ParentScope;
import org.apache.ode.bpel.runtime.channels.ParentScopeChannel;
import org.apache.ode.bpel.runtime.channels.Termination;
-import org.apache.ode.bpel.runtime.channels.TerminationChannel;
import org.apache.ode.bpel.runtime.channels.TimerResponse;
import org.apache.ode.bpel.runtime.channels.TimerResponseChannel;
import org.apache.ode.jacob.ChannelListener;
@@ -109,7 +107,7 @@ class ACTIVITYGUARD extends ACTIVITY {
}
} else /* don't know all our links statuses */ {
Set<ChannelListener> mlset = new HashSet<ChannelListener>();
- mlset.add(new ReceiveProcess<TerminationChannel,
Termination>(_self.self, new Termination() {
+ mlset.add(new ReceiveProcess<Termination>(_self.self, new
Termination() {
public void terminate() {
// Complete immediately, without faulting or registering
any comps.
_self.parent.completed(null,
CompensationHandler.emptySet());
@@ -120,7 +118,7 @@ class ACTIVITYGUARD extends ACTIVITY {
private static final long serialVersionUID =
5094153128476008961L;
});
for (final OLink link : _oactivity.targetLinks) {
- mlset.add(new ReceiveProcess<LinkStatusChannel,
LinkStatus>(_linkFrame.resolve(link).sub, new LinkStatus() {
+ mlset.add(new
ReceiveProcess<LinkStatus>(_linkFrame.resolve(link).sub, new LinkStatus() {
public void linkStatus(boolean value) {
_linkVals.put(link, Boolean.valueOf(value));
instance(ACTIVITYGUARD.this);
@@ -202,7 +200,7 @@ class ACTIVITYGUARD extends ACTIVITY {
}
public void run() {
- object(new ReceiveProcess<ParentScopeChannel, ParentScope>(_in,
new ParentScope() {
+ object(new ReceiveProcess<ParentScope>(_in, new ParentScope() {
public void compensate(OScope scope, SynchChannel ret) {
_self.parent.compensate(scope,ret);
instance(TCONDINTERCEPT.this);
@@ -276,7 +274,7 @@ class ACTIVITYGUARD extends ACTIVITY {
(failureHandling == null ? 0L :
failureHandling.retryDelay * 1000));
final TimerResponseChannel timerChannel =
newChannel(TimerResponseChannel.class);
getBpelRuntimeContext().registerTimer(timerChannel,
future);
- object(false, new ReceiveProcess<TimerResponseChannel,
TimerResponse>(timerChannel, new TimerResponse() {
+ object(false, new
ReceiveProcess<TimerResponse>(timerChannel, new TimerResponse() {
public void onTimeout() {
++_failure.retryCount;
startGuardedActivity();
@@ -297,7 +295,7 @@ class ACTIVITYGUARD extends ACTIVITY {
getBpelRuntimeContext().registerActivityForRecovery(
recoveryChannel, _self.aId, _failure.reason,
_failure.dateTime, _failure.data,
new String[] { "retry", "cancel", "fault" },
_failure.retryCount);
- object(false, new ReceiveProcess<ActivityRecoveryChannel,
ActivityRecovery>(recoveryChannel, new ActivityRecovery() {
+ object(false, new
ReceiveProcess<ActivityRecovery>(recoveryChannel, new ActivityRecovery() {
public void retry() {
if (__log.isDebugEnabled())
__log.debug("ActivityRecovery: Retrying
activity " + _self.aId + " (user initiated)");
@@ -324,7 +322,7 @@ class ACTIVITYGUARD extends ACTIVITY {
}
}){
private static final long serialVersionUID =
8397883882810521685L;
- }.or(new ReceiveProcess<TerminationChannel,
Termination>(_self.self, new Termination() {
+ }.or(new ReceiveProcess<Termination>(_self.self, new
Termination() {
public void terminate() {
if (__log.isDebugEnabled())
__log.debug("ActivityRecovery: Cancelling
activity " + _self.aId + " (terminated by scope)");
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=1433714&r1=1433713&r2=1433714&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
Tue Jan 15 22:38:40 2013
@@ -41,7 +41,7 @@ class COMPENSATE extends ACTIVITY {
OScope scopeToCompensate = _ocompact.compensatedScope;
SynchChannel sc = newChannel(SynchChannel.class);
_self.parent.compensate(scopeToCompensate,sc);
- object(new ReceiveProcess<SynchChannel, Synch>(sc, new Synch() {
+ object(new ReceiveProcess<Synch>(sc, new Synch() {
public void ret() {
_self.parent.completed(null, CompensationHandler.emptySet());
}
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=1433714&r1=1433713&r2=1433714&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
Tue Jan 15 22:38:40 2013
@@ -25,7 +25,6 @@ import org.apache.ode.bpel.evt.Compensat
import org.apache.ode.bpel.evt.ScopeEvent;
import org.apache.ode.bpel.o.OScope;
import org.apache.ode.bpel.runtime.channels.Compensation;
-import org.apache.ode.bpel.runtime.channels.CompensationChannel;
import org.apache.ode.bpel.runtime.channels.FaultData;
import org.apache.ode.bpel.runtime.channels.ParentScope;
import org.apache.ode.bpel.runtime.channels.ParentScopeChannel;
@@ -49,7 +48,7 @@ class COMPENSATIONHANDLER_ extends BpelJ
public void run() {
sendEvent(new CompensationHandlerRegistered());
- object(new ReceiveProcess<CompensationChannel,
Compensation>(_self.compChannel, new Compensation() {
+ object(new ReceiveProcess<Compensation>(_self.compChannel, new
Compensation() {
public void forget() {
// Tell all our completed children to forget.
for (Iterator<CompensationHandler> i =
_completedChildren.iterator(); i.hasNext(); )
@@ -74,7 +73,7 @@ class COMPENSATIONHANDLER_ extends BpelJ
// Create the compensation handler scope.
instance(new SCOPE(ai,compHandlerScopeFrame, new
LinkFrame(null)));
- object(new ReceiveProcess<ParentScopeChannel,
ParentScope>(ai.parent, new ParentScope() {
+ object(new ReceiveProcess<ParentScope>(ai.parent, new
ParentScope() {
public void compensate(OScope scope, SynchChannel 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=1433714&r1=1433713&r2=1433714&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
Tue Jan 15 22:38:40 2013
@@ -131,14 +131,14 @@ class EH_ALARM extends BpelJacobRunnable
public void run() {
Calendar now = Calendar.getInstance();
- Set<ChannelListener> listeners = new
ReceiveProcess<EventHandlerControlChannel, EventHandlerControl>(_cc, new
EventHandlerControl() {
+ Set<ChannelListener> listeners = new
ReceiveProcess<EventHandlerControl>(_cc, new EventHandlerControl() {
public void stop() {
_psc.completed(null, _comps);
}
}){
private static final long serialVersionUID =
-7750428941445331236L;
- }.or(new ReceiveProcess<TerminationChannel, Termination>(_tc, new
Termination() {
+ }.or(new ReceiveProcess<Termination>(_tc, new Termination() {
public void terminate() {
_psc.completed(null, _comps);
}
@@ -152,7 +152,7 @@ class EH_ALARM extends BpelJacobRunnable
TimerResponseChannel trc =
newChannel(TimerResponseChannel.class);
getBpelRuntimeContext().registerTimer(trc,_alarm.getTime());
- listeners.add(new ReceiveProcess<TimerResponseChannel,
TimerResponse>(trc, new TimerResponse(){
+ listeners.add(new ReceiveProcess<TimerResponse>(trc, new
TimerResponse(){
public void onTimeout() {
// This is what we are waiting for, fire the activity
instance(new FIRE());
@@ -208,7 +208,7 @@ class EH_ALARM extends BpelJacobRunnable
}
public void run() {
- object(false,new ReceiveProcess<ParentScopeChannel,
ParentScope>(_activity.parent, new ParentScope() {
+ object(false,new ReceiveProcess<ParentScope>(_activity.parent, new
ParentScope() {
public void compensate(OScope scope, SynchChannel ret) {
_psc.compensate(scope,ret);
instance(ACTIVE.this);
@@ -242,14 +242,14 @@ class EH_ALARM extends BpelJacobRunnable
public void failure(String reason, Element data) {
completed(null, CompensationHandler.emptySet()); }
}){
private static final long serialVersionUID =
-3357030137175178040L;
- }.or(new ReceiveProcess<EventHandlerControlChannel,
EventHandlerControl>(_cc, new EventHandlerControl() {
+ }.or(new ReceiveProcess<EventHandlerControl>(_cc, new
EventHandlerControl() {
public void stop() {
_stopped = true;
instance(ACTIVE.this);
}
}){
private static final long serialVersionUID =
-3873619538789039424L;
- }.or(new ReceiveProcess<TerminationChannel, Termination>(_tc, new
Termination() {
+ }.or(new ReceiveProcess<Termination>(_tc, new Termination() {
public void terminate() {
replication(_activity.self).terminate();
_stopped = true;
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=1433714&r1=1433713&r2=1433714&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
Tue Jan 15 22:38:40 2013
@@ -164,7 +164,7 @@ class EH_EVENT extends BpelJacobRunnable
HashSet<ChannelListener> mlset = new
HashSet<ChannelListener>();
if (!_terminated) {
- mlset.add(new ReceiveProcess<TerminationChannel,
Termination>(_tc, new Termination() {
+ mlset.add(new ReceiveProcess<Termination>(_tc, new
Termination() {
public void terminate() {
terminateActive();
_terminated = true;
@@ -178,7 +178,7 @@ class EH_EVENT extends BpelJacobRunnable
}
if (!_stopped) {
- mlset.add(new ReceiveProcess<EventHandlerControlChannel,
EventHandlerControl>(_ehc, new EventHandlerControl() {
+ mlset.add(new ReceiveProcess<EventHandlerControl>(_ehc,
new EventHandlerControl() {
public void stop() {
_stopped = true;
if (_pickResponseChannel != null)
@@ -191,7 +191,7 @@ class EH_EVENT extends BpelJacobRunnable
}
for (final ActivityInfo ai : _active) {
- mlset.add(new ReceiveProcess<ParentScopeChannel,
ParentScope>(ai.parent, new ParentScope() {
+ mlset.add(new ReceiveProcess<ParentScope>(ai.parent, new
ParentScope() {
public void compensate(OScope scope, SynchChannel ret)
{
_psc.compensate(scope, ret);
instance(WAITING.this);
@@ -219,7 +219,7 @@ class EH_EVENT extends BpelJacobRunnable
}
if (_pickResponseChannel != null)
- mlset.add(new ReceiveProcess<PickResponseChannel,
PickResponse>(_pickResponseChannel, new PickResponse() {
+ mlset.add(new
ReceiveProcess<PickResponse>(_pickResponseChannel, new PickResponse() {
public void onRequestRcvd(int selectorIdx, String
mexId) {
// The receipt of the message causes a new scope
to be created:
ScopeFrame ehScopeFrame = new ScopeFrame(_oevent,
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=1433714&r1=1433713&r2=1433714&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
Tue Jan 15 22:38:40 2013
@@ -80,7 +80,7 @@ class FLOW extends ACTIVITY {
Iterator<ChildInfo> active = active();
if (active.hasNext()) {
Set<ChannelListener> mlSet = new HashSet<ChannelListener>();
- mlSet.add(new ReceiveProcess<TerminationChannel,
Termination>(_self.self, new Termination() {
+ mlSet.add(new ReceiveProcess<Termination>(_self.self, new
Termination() {
public void terminate() {
for (Iterator<ChildInfo> i = active(); i.hasNext(); )
replication(i.next().activity.self).terminate();
@@ -92,7 +92,7 @@ class FLOW extends ACTIVITY {
for (;active.hasNext();) {
final ChildInfo child = active.next();
- mlSet.add(new ReceiveProcess<ParentScopeChannel,
ParentScope>(child.activity.parent, new ParentScope() {
+ mlSet.add(new
ReceiveProcess<ParentScope>(child.activity.parent, new ParentScope() {
public void completed(FaultData faultData,
Set<CompensationHandler> compensations) {
child.completed = true;
_compensations.addAll(compensations);
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=1433714&r1=1433713&r2=1433714&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
Tue Jan 15 22:38:40 2013
@@ -114,7 +114,7 @@ public class FOREACH extends ACTIVITY {
if (active().hasNext()) {
Set<ChannelListener> mlSet = new HashSet<ChannelListener>();
- mlSet.add(new ReceiveProcess<TerminationChannel,
Termination>(_self.self, new Termination() {
+ mlSet.add(new ReceiveProcess<Termination>(_self.self, new
Termination() {
public void terminate() {
// Terminating all children before sepuku
for (Iterator<ChildInfo> i = active(); i.hasNext(); )
@@ -128,7 +128,7 @@ public class FOREACH extends ACTIVITY {
for (;active.hasNext();) {
// Checking out our children
final ChildInfo child = active.next();
- mlSet.add(new ReceiveProcess<ParentScopeChannel,
ParentScope>(child.activity.parent, new ParentScope() {
+ mlSet.add(new
ReceiveProcess<ParentScope>(child.activity.parent, new ParentScope() {
public void compensate(OScope scope, SynchChannel ret)
{
// Forward compensation to parent
_self.parent.compensate(scope, ret);
Modified:
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/INVOKE.java
URL:
http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/INVOKE.java?rev=1433714&r1=1433713&r2=1433714&view=diff
==============================================================================
---
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/INVOKE.java
(original)
+++
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/INVOKE.java
Tue Jan 15 22:38:40 2013
@@ -34,7 +34,6 @@ import org.apache.ode.bpel.runtime.chann
import org.apache.ode.bpel.runtime.channels.InvokeResponse;
import org.apache.ode.bpel.runtime.channels.InvokeResponseChannel;
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.utils.DOMUtils;
import org.w3c.dom.Element;
@@ -98,7 +97,7 @@ public class INVOKE extends ACTIVITY {
_scopeFrame.resolve(_oinvoke.partnerLink),
_oinvoke.operation,
outboundMsg, invokeResponseChannel);
- object(false, new ReceiveProcess<InvokeResponseChannel,
InvokeResponse>(invokeResponseChannel, new InvokeResponse() {
+ object(false, new
ReceiveProcess<InvokeResponse>(invokeResponseChannel, new InvokeResponse() {
public void onResponse() {
// we don't have to write variable data -> this already
// happened in the nativeAPI impl
@@ -192,7 +191,7 @@ public class INVOKE extends ACTIVITY {
}){
private static final long serialVersionUID =
4496880438819196765L;
- }.or(new ReceiveProcess<TerminationChannel,
Termination>(_self.self, new Termination() {
+ }.or(new ReceiveProcess<Termination>(_self.self, new
Termination() {
public void terminate() {
_self.parent.completed(null,
CompensationHandler.emptySet());
}
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=1433714&r1=1433713&r2=1433714&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
Tue Jan 15 22:38:40 2013
@@ -50,7 +50,7 @@ class ORDEREDCOMPENSATOR extends BpelJac
SynchChannel r = newChannel(SynchChannel.class);
CompensationHandler cdata = _compensations.remove(0);
cdata.compChannel.compensate(r);
- object(new ReceiveProcess<SynchChannel, Synch>(r, new Synch() {
+ object(new ReceiveProcess<Synch>(r, new Synch() {
public void ret() {
instance(ORDEREDCOMPENSATOR.this);
}
Modified:
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PICK.java
URL:
http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PICK.java?rev=1433714&r1=1433713&r2=1433714&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PICK.java
(original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/PICK.java
Tue Jan 15 22:38:40 2013
@@ -44,7 +44,6 @@ import org.apache.ode.bpel.runtime.chann
import org.apache.ode.bpel.runtime.channels.PickResponse;
import org.apache.ode.bpel.runtime.channels.PickResponseChannel;
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.utils.DOMUtils;
import org.apache.ode.utils.xsd.Duration;
@@ -280,7 +279,7 @@ class PICK extends ACTIVITY {
}
public void run() {
- object(false, new ReceiveProcess<PickResponseChannel,
PickResponse>(_pickResponseChannel, new PickResponse() {
+ object(false, new
ReceiveProcess<PickResponse>(_pickResponseChannel, new PickResponse() {
public void onRequestRcvd(int selectorIdx, String mexId) {
OPickReceive.OnMessage onMessage =
_opick.onMessages.get(selectorIdx);
@@ -374,7 +373,7 @@ class PICK extends ACTIVITY {
}){
private static final long serialVersionUID =
-8237296827418738011L;
- }.or(new ReceiveProcess<TerminationChannel,
Termination>(_self.self, new Termination() {
+ }.or(new ReceiveProcess<Termination>(_self.self, new Termination()
{
public void terminate() {
getBpelRuntimeContext().cancel(_pickResponseChannel);
instance(WAITING.this);
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=1433714&r1=1433713&r2=1433714&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
Tue Jan 15 22:38:40 2013
@@ -60,7 +60,7 @@ public class PROCESS extends BpelJacobRu
ScopeFrame processFrame = new ScopeFrame(_oprocess.procesScope,
scopeInstanceId, null, null,_globals);
instance(new SCOPE(child, processFrame, new LinkFrame(null)));
- object(new ReceiveProcess<ParentScopeChannel,
ParentScope>(child.parent, new ParentScope() {
+ object(new ReceiveProcess<ParentScope>(child.parent, new ParentScope()
{
public void compensate(OScope scope, SynchChannel 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=1433714&r1=1433713&r2=1433714&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
Tue Jan 15 22:38:40 2013
@@ -56,7 +56,7 @@ public class READWRITELOCK extends Jacob
@Override
public void run() {
- object(new ReceiveProcess<ReadWriteLockChannel, ReadWriteLock>(_self,
new ReadWriteLock() {
+ object(new ReceiveProcess<ReadWriteLock>(_self, new ReadWriteLock() {
public void readLock(SynchChannel s) {
switch (_status) {
case UNLOCKED:
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=1433714&r1=1433713&r2=1433714&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
Tue Jan 15 22:38:40 2013
@@ -96,7 +96,7 @@ public class REPEATUNTIL extends ACTIVIT
}
public void run() {
- object(false, new ReceiveProcess<TerminationChannel,
Termination>(_self.self, new Termination() {
+ object(false, new ReceiveProcess<Termination>(_self.self, new
Termination() {
public void terminate() {
_terminated = true;
replication(_child.self).terminate();
@@ -104,7 +104,7 @@ public class REPEATUNTIL extends ACTIVIT
}
}) {
private static final long serialVersionUID =
-5471984635653784051L;
- }.or(new ReceiveProcess<ParentScopeChannel,
ParentScope>(_child.parent, new ParentScope() {
+ }.or(new ReceiveProcess<ParentScope>(_child.parent, new
ParentScope() {
public void compensate(OScope scope, SynchChannel 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=1433714&r1=1433713&r2=1433714&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
Tue Jan 15 22:38:40 2013
@@ -143,7 +143,7 @@ class SCOPE extends ACTIVITY {
HashSet<ChannelListener> mlSet = new
HashSet<ChannelListener>();
// Listen to messages from our parent.
- mlSet.add(new ReceiveProcess<TerminationChannel,
Termination>(_self.self, new Termination() {
+ mlSet.add(new ReceiveProcess<Termination>(_self.self, new
Termination() {
public void terminate() {
_terminated = true;
@@ -164,7 +164,7 @@ class SCOPE extends ACTIVITY {
// Handle messages from the child if it is still alive
if (_child != null) {
- mlSet.add(new ReceiveProcess<ParentScopeChannel,
ParentScope>(_child.parent, new ParentScope() {
+ mlSet.add(new ReceiveProcess<ParentScope>(_child.parent,
new ParentScope() {
public void compensate(OScope scope, SynchChannel ret)
{
// If this scope does not have available
compensations, defer to
// parent scope, otherwise do compensation.
@@ -219,7 +219,7 @@ class SCOPE extends ACTIVITY {
for (Iterator<EventHandlerInfo> i =
_eventHandlers.iterator();i.hasNext();) {
final EventHandlerInfo ehi = i.next();
- mlSet.add(new ReceiveProcess<ParentScopeChannel,
ParentScope>(ehi.psc, new ParentScope() {
+ mlSet.add(new ReceiveProcess<ParentScope>(ehi.psc, new
ParentScope() {
public void compensate(OScope scope, SynchChannel ret)
{
// ACTIVE scopes do not compensate, send request
up to parent.
_self.parent.compensate(scope, ret);
@@ -294,7 +294,7 @@ class SCOPE extends ACTIVITY {
// Create the temination handler scope.
instance(new
SCOPE(terminationHandlerActivity,terminationHandlerScopeFrame,
SCOPE.this._linkFrame));
- object(new ReceiveProcess<ParentScopeChannel,
ParentScope>(terminationHandlerActivity.parent, new ParentScope() {
+ object(new
ReceiveProcess<ParentScope>(terminationHandlerActivity.parent, new
ParentScope() {
public void compensate(OScope scope, SynchChannel
ret) {
// This should never happen.
throw new AssertionError("received compensate
request!");
@@ -373,7 +373,7 @@ class SCOPE extends ACTIVITY {
// Create the fault handler scope.
instance(new
SCOPE(faultHandlerActivity,faultHandlerScopeFrame, SCOPE.this._linkFrame));
- object(new ReceiveProcess<ParentScopeChannel,
ParentScope>(faultHandlerActivity.parent, new ParentScope() {
+ object(new
ReceiveProcess<ParentScope>(faultHandlerActivity.parent, new ParentScope() {
public void compensate(OScope scope, SynchChannel
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=1433714&r1=1433713&r2=1433714&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
Tue Jan 15 22:38:40 2013
@@ -154,7 +154,7 @@ public class SCOPEACT extends ACTIVITY {
Set<ChannelListener> mlset = new HashSet<ChannelListener>();
if (_status == null)
- mlset.add(new ReceiveProcess<ValChannel, Val>(_self, new Val()
{
+ mlset.add(new ReceiveProcess<Val>(_self, new Val() {
/** Our owner will notify us when it becomes clear what to
do with the links. */
public void val(Object retVal) {
if (__log.isDebugEnabled()) {
@@ -178,7 +178,7 @@ public class SCOPEACT extends ACTIVITY {
if (_statuses.containsKey(m.getKey()))
continue;
- mlset.add(new ReceiveProcess<LinkStatusChannel,
LinkStatus>(m.getValue().pub, new LinkStatus() {
+ mlset.add(new ReceiveProcess<LinkStatus>(m.getValue().pub, new
LinkStatus() {
public void linkStatus(boolean value) {
_statuses.put(m.getKey(), value);
if (_status != null)
@@ -262,7 +262,7 @@ public class SCOPEACT extends ACTIVITY {
else
il.lockChannel.readLock(_synchChannel);
- object(new ReceiveProcess<SynchChannel, Synch>(_synchChannel,
new Synch() {
+ object(new ReceiveProcess<Synch>(_synchChannel, new Synch() {
public void ret() {
__log.debug("ISOLATIONGUARD: got lock: " +
_locksNeeded.get(0));
_locksAcquired.add(_locksNeeded.remove(0));
@@ -310,7 +310,7 @@ public class SCOPEACT extends ACTIVITY {
public void run() {
__log.debug("running UNLOCKER");
- object(new ReceiveProcess<ParentScopeChannel, ParentScope>(_self,
new ParentScope() {
+ object(new ReceiveProcess<ParentScope>(_self, new ParentScope() {
public void cancelled() {
_parent.cancelled();
unlockAll();
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=1433714&r1=1433713&r2=1433714&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
Tue Jan 15 22:38:40 2013
@@ -77,7 +77,7 @@ class SEQUENCE extends ACTIVITY {
}
public void run() {
- object(false, new ReceiveProcess<TerminationChannel,
Termination>(_self.self, new Termination() {
+ object(false, new ReceiveProcess<Termination>(_self.self, new
Termination() {
public void terminate() {
replication(_child.self).terminate();
@@ -91,7 +91,7 @@ class SEQUENCE extends ACTIVITY {
}
}) {
private static final long serialVersionUID =
-2680515407515637639L;
- }.or(new ReceiveProcess<ParentScopeChannel,
ParentScope>(_child.parent, new ParentScope() {
+ }.or(new ReceiveProcess<ParentScope>(_child.parent, new
ParentScope() {
public void compensate(OScope scope, SynchChannel ret) {
_self.parent.compensate(scope,ret);
instance(ACTIVE.this);
Modified:
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WAIT.java
URL:
http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WAIT.java?rev=1433714&r1=1433713&r2=1433714&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WAIT.java
(original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/WAIT.java
Tue Jan 15 22:38:40 2013
@@ -28,7 +28,6 @@ import org.apache.ode.bpel.explang.Evalu
import org.apache.ode.bpel.explang.EvaluationException;
import org.apache.ode.bpel.o.OWait;
import org.apache.ode.bpel.runtime.channels.Termination;
-import org.apache.ode.bpel.runtime.channels.TerminationChannel;
import org.apache.ode.bpel.runtime.channels.TimerResponse;
import org.apache.ode.bpel.runtime.channels.TimerResponseChannel;
import org.apache.ode.jacob.ReceiveProcess;
@@ -68,7 +67,7 @@ class WAIT extends ACTIVITY {
final TimerResponseChannel timerChannel =
newChannel(TimerResponseChannel.class);
getBpelRuntimeContext().registerTimer(timerChannel, dueDate);
- object(false, new ReceiveProcess<TimerResponseChannel,
TimerResponse>(timerChannel, new TimerResponse() {
+ object(false, new ReceiveProcess<TimerResponse>(timerChannel, new
TimerResponse() {
public void onTimeout() {
_self.parent.completed(null,
CompensationHandler.emptySet());
}
@@ -78,10 +77,10 @@ class WAIT extends ACTIVITY {
}
}){
private static final long serialVersionUID =
3120518305645437327L;
- }.or(new ReceiveProcess<TerminationChannel,
Termination>(_self.self, new Termination() {
+ }.or(new ReceiveProcess<Termination>(_self.self, new Termination()
{
public void terminate() {
_self.parent.completed(null,
CompensationHandler.emptySet());
- object(new ReceiveProcess<TimerResponseChannel,
TimerResponse>(timerChannel, new TimerResponse() {
+ object(new ReceiveProcess<TimerResponse>(timerChannel, new
TimerResponse() {
public void onTimeout() {
//ignore
}
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=1433714&r1=1433713&r2=1433714&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
Tue Jan 15 22:38:40 2013
@@ -114,7 +114,7 @@ class WHILE extends ACTIVITY {
}
public void run() {
- object(false, new ReceiveProcess<TerminationChannel,
Termination>(_self.self, new Termination() {
+ object(false, new ReceiveProcess<Termination>(_self.self, new
Termination() {
public void terminate() {
_terminated = true;
replication(_child.self).terminate();
@@ -122,7 +122,7 @@ class WHILE extends ACTIVITY {
}
}) {
private static final long serialVersionUID =
-5471984635653784051L;
- }.or(new ReceiveProcess<ParentScopeChannel,
ParentScope>(_child.parent, new ParentScope() {
+ }.or(new ReceiveProcess<ParentScope>(_child.parent, new
ParentScope() {
public void compensate(OScope scope, SynchChannel ret) {
_self.parent.compensate(scope,ret);
instance(WAITER.this);
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ReceiveProcess.java
URL:
http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ReceiveProcess.java?rev=1433714&r1=1433713&r2=1433714&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ReceiveProcess.java
(original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ReceiveProcess.java Tue
Jan 15 22:38:40 2013
@@ -25,11 +25,11 @@ import java.util.Set;
@SuppressWarnings("serial")
-public abstract class ReceiveProcess<C extends Channel, R> extends
ChannelListener {
+public abstract class ReceiveProcess<R> extends ChannelListener {
private transient Set<Method> _implementedMethods;
private R receiver;
- protected ReceiveProcess(C channel, R receiver) throws
IllegalStateException {
+ protected ReceiveProcess(Channel channel, R receiver) throws
IllegalStateException {
super(channel);
this.receiver = receiver;
}
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=1433714&r1=1433713&r2=1433714&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 Tue
Jan 15 22:38:40 2013
@@ -401,7 +401,7 @@ public final class JacobVPU {
long ctime = System.currentTimeMillis();
try {
_method.invoke(_methodBody instanceof ReceiveProcess ?
- ((ReceiveProcess<?, ?>)_methodBody).receiver() :
_methodBody, args);
+ ((ReceiveProcess<?>)_methodBody).receiver() : _methodBody,
args);
if (synchChannel != null) {
synchChannel.ret();
}
Modified:
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/CELL_.java
URL:
http://svn.apache.org/viewvc/ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/CELL_.java?rev=1433714&r1=1433713&r2=1433714&view=diff
==============================================================================
--- ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/CELL_.java
(original)
+++ ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/CELL_.java
Tue Jan 15 22:38:40 2013
@@ -44,7 +44,7 @@ public class CELL_<T> extends JacobRunna
public void run() {
// INSTANTIATION{Cell(run,val)}
// ==> run ? [ read(r)={...} & write(newVal)={...} ]
- object(new ReceiveProcess<CellChannel, Cell>(_self, new Cell() {
+ object(new ReceiveProcess<Cell>(_self, new Cell() {
public void read(Val r) {
// COMMUNICATION{x & [read... & ... ] | x ! read} ==>
Cell(run, val) ...
instance(new CELL_<T>(_self, _val));
Modified:
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/JacobCellTest.java
URL:
http://svn.apache.org/viewvc/ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/JacobCellTest.java?rev=1433714&r1=1433713&r2=1433714&view=diff
==============================================================================
---
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/JacobCellTest.java
(original)
+++
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/JacobCellTest.java
Tue Jan 15 22:38:40 2013
@@ -65,7 +65,7 @@ static class CellTest1 extends JacobRunn
ValChannel retChannel = newChannel(ValChannel.class, "val");
instance(new CELL_<String>(cellChannel, "foo"));
- object(new ReceiveProcess<ValChannel, Val>(retChannel, new Val() {
+ object(new ReceiveProcess<Val>(retChannel, new Val() {
public void val(Object retVal) {
_val = retVal;
}
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=1433714&r1=1433713&r2=1433714&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
Tue Jan 15 22:38:40 2013
@@ -71,7 +71,7 @@ public class Sieve extends JacobRunnable
}
public void run() {
- _out.val(_n, (SynchChannel)object(new ReceiveProcess<SynchChannel,
Synch>(newChannel(SynchChannel.class), new Synch() {
+ _out.val(_n, (SynchChannel)object(new
ReceiveProcess<Synch>(newChannel(SynchChannel.class), new Synch() {
public void ret() {
instance(new Counter(_out, _n+1));
}
@@ -103,9 +103,9 @@ public class Sieve extends JacobRunnable
}
public void run() {
- object(new ReceiveProcess<NaturalNumberStreamChannel,
NaturalNumberStream>(_in, new NaturalNumberStream() {
+ object(new ReceiveProcess<NaturalNumberStream>(_in, new
NaturalNumberStream() {
public void val(final int n, final SynchChannel ret) {
- _primes.val(n, (SynchChannel)object(new ReceiveProcess<SynchChannel,
Synch>(newChannel(SynchChannel.class), new Synch() {
+ _primes.val(n, (SynchChannel)object(new
ReceiveProcess<Synch>(newChannel(SynchChannel.class), new Synch() {
public void ret() {
NaturalNumberStreamChannel x =
newChannel(NaturalNumberStreamChannel.class);
instance(new PrimeFilter(n, _in, x));
@@ -130,7 +130,7 @@ public class Sieve extends JacobRunnable
_in = in;
}
public void run() {
- object(true, new ReceiveProcess<NaturalNumberStreamChannel,
NaturalNumberStream>(_in, new NaturalNumberStream(){
+ object(true, new ReceiveProcess<NaturalNumberStream>(_in, new
NaturalNumberStream(){
public void val(int n, SynchChannel ret) {
_cnt ++;
_last = n;
@@ -164,10 +164,10 @@ public class Sieve extends JacobRunnable
_out = out;
}
public void run() {
- object(true, new ReceiveProcess<NaturalNumberStreamChannel,
NaturalNumberStream>(_in, new NaturalNumberStream() {
+ object(true, new ReceiveProcess<NaturalNumberStream>(_in, new
NaturalNumberStream() {
public void val(int n, final SynchChannel ret) {
if (n % _prime != 0) {
- _out.val(n, (SynchChannel)object(new
ReceiveProcess<SynchChannel, Synch>(newChannel(SynchChannel.class), new Synch()
{
+ _out.val(n, (SynchChannel)object(new
ReceiveProcess<Synch>(newChannel(SynchChannel.class), new Synch() {
public void ret() {
ret.ret();
}
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=1433714&r1=1433713&r2=1433714&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
Tue Jan 15 22:38:40 2013
@@ -54,7 +54,7 @@ public abstract class Sequence extends J
}
} else {
SynchChannel r = newChannel(SynchChannel.class);
- object(new ReceiveProcess<SynchChannel, Synch>(r, new Synch() {
+ object(new ReceiveProcess<Synch>(r, new Synch() {
public void ret() {
++_current;
instance(Sequence.this);
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=1433714&r1=1433713&r2=1433714&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
Tue Jan 15 22:38:40 2013
@@ -42,7 +42,7 @@ public class SynchPrinter {
}
public void run() {
- object(true, new ReceiveProcess<SynchPrintChannel,
SynchPrint>(_self, new SynchPrint() {
+ object(true, new ReceiveProcess<SynchPrint>(_self, new
SynchPrint() {
public SynchChannel print(String msg) {
System.out.println(msg);
return null; // SynchChannel automatically created by
JacobVPU
@@ -60,11 +60,11 @@ public class SynchPrinter {
public void run() {
final SynchPrintChannel p = newChannel(SynchPrintChannel.class);
instance(new SystemPrinter(p));
- object(new ReceiveProcess<SynchChannel, Synch>(p.print("1"), new
Synch() {
+ object(new ReceiveProcess<Synch>(p.print("1"), new Synch() {
public void ret() {
- object(new ReceiveProcess<SynchChannel,
Synch>(p.print("2"), new Synch() {
+ object(new ReceiveProcess<Synch>(p.print("2"), new Synch()
{
public void ret() {
- object(new ReceiveProcess<SynchChannel,
Synch>(p.print("3"), new Synch() {
+ object(new ReceiveProcess<Synch>(p.print("3"), new
Synch() {
public void ret() {
}
}) {});
