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 02:53:02 UTC
svn commit: r1434537 - in
/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime:
FLOW.java InstanceGlobals.java LinkInfo.java PROCESS.java
READWRITELOCK.java SCOPEACT.java
Author: hadrian
Date: Thu Jan 17 01:53:02 2013
New Revision: 1434537
URL: http://svn.apache.org/viewvc?rev=1434537&view=rev
Log:
ODE-987. Remove use of even more *Channels...
Modified:
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/InstanceGlobals.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/LinkInfo.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/SCOPEACT.java
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=1434537&r1=1434536&r2=1434537&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 01:53:02 2013
@@ -27,7 +27,7 @@ import org.apache.ode.bpel.o.OFlow;
import org.apache.ode.bpel.o.OLink;
import org.apache.ode.bpel.o.OScope;
import org.apache.ode.bpel.runtime.channels.FaultData;
-import org.apache.ode.bpel.runtime.channels.LinkStatusChannel;
+import org.apache.ode.bpel.runtime.channels.LinkStatus;
import org.apache.ode.bpel.runtime.channels.ParentScope;
import org.apache.ode.bpel.runtime.channels.ParentScopeChannel;
import org.apache.ode.bpel.runtime.channels.Termination;
@@ -55,7 +55,7 @@ class FLOW extends ACTIVITY {
LinkFrame myLinkFrame = new LinkFrame(_linkFrame);
for (Iterator<OLink> i = _oflow.localLinks.iterator(); i.hasNext(); ) {
OLink link = i.next();
- LinkStatusChannel lsc = newChannel(LinkStatusChannel.class);
+ LinkStatus lsc = newChannel(LinkStatus.class);
myLinkFrame.links.put(link,new LinkInfo(link,lsc,lsc));
}
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/InstanceGlobals.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/InstanceGlobals.java?rev=1434537&r1=1434536&r2=1434537&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/InstanceGlobals.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/InstanceGlobals.java Thu Jan 17 01:53:02 2013
@@ -23,7 +23,7 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.ode.bpel.o.OScope;
-import org.apache.ode.bpel.runtime.channels.ReadWriteLockChannel;
+import org.apache.ode.bpel.runtime.channels.ReadWriteLock;
/**
@@ -34,5 +34,5 @@ import org.apache.ode.bpel.runtime.chann
public class InstanceGlobals implements Serializable {
/** Variable locks. Used by isolated scopes. */
- Map<OScope.Variable, ReadWriteLockChannel> _varLocks = new HashMap<OScope.Variable, ReadWriteLockChannel>();
+ Map<OScope.Variable, ReadWriteLock> _varLocks = new HashMap<OScope.Variable, ReadWriteLock>();
}
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/LinkInfo.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/LinkInfo.java?rev=1434537&r1=1434536&r2=1434537&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/LinkInfo.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/LinkInfo.java Thu Jan 17 01:53:02 2013
@@ -18,11 +18,11 @@
*/
package org.apache.ode.bpel.runtime;
-import org.apache.ode.bpel.o.OLink;
-import org.apache.ode.bpel.runtime.channels.LinkStatusChannel;
-
import java.io.Serializable;
+import org.apache.ode.bpel.o.OLink;
+import org.apache.ode.bpel.runtime.channels.LinkStatus;
+
/**
* Run-time represetation of the link data.
*/
@@ -31,17 +31,16 @@ class LinkInfo implements Serializable {
final OLink olink;
- /** Channel to be used for link status publisher. */
- final LinkStatusChannel pub;
-
- /** Channel to be used for link status listener. */
- final LinkStatusChannel sub;
+ /** Channel to be used for link status publisher. */
+ final LinkStatus pub;
+ /** Channel to be used for link status listener. */
+ final LinkStatus sub;
- LinkInfo(OLink olink, LinkStatusChannel pub, LinkStatusChannel sub) {
- this.olink = olink;
- this.pub = pub;
- this.sub = sub;
- }
+ LinkInfo(OLink olink, LinkStatus pub, LinkStatus sub) {
+ this.olink = olink;
+ this.pub = pub;
+ this.sub = sub;
+ }
}
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=1434537&r1=1434536&r2=1434537&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 01:53:02 2013
@@ -29,7 +29,7 @@ import org.apache.ode.bpel.o.OScope.Vari
import org.apache.ode.bpel.runtime.channels.FaultData;
import org.apache.ode.bpel.runtime.channels.ParentScope;
import org.apache.ode.bpel.runtime.channels.ParentScopeChannel;
-import org.apache.ode.bpel.runtime.channels.ReadWriteLockChannel;
+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;
@@ -91,13 +91,13 @@ public class PROCESS extends BpelJacobRu
_globals = new InstanceGlobals();
// For each variable, we create a lock.
- for (OBase child : _oprocess.getChildren())
+ for (OBase child : _oprocess.getChildren()) {
if (child instanceof OScope.Variable) {
OScope.Variable var = (Variable) child;
- ReadWriteLockChannel vlock = newChannel(ReadWriteLockChannel.class);
+ ReadWriteLock vlock = newChannel(ReadWriteLock.class);
instance(new READWRITELOCK(vlock));
_globals._varLocks.put(var, vlock);
-
}
+ }
}
}
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=1434537&r1=1434536&r2=1434537&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 01:53:02 2013
@@ -23,7 +23,6 @@ import java.util.Iterator;
import java.util.LinkedList;
import org.apache.ode.bpel.runtime.channels.ReadWriteLock;
-import org.apache.ode.bpel.runtime.channels.ReadWriteLockChannel;
import org.apache.ode.jacob.JacobRunnable;
import org.apache.ode.jacob.ReceiveProcess;
import org.apache.ode.jacob.SynchChannel;
@@ -48,9 +47,9 @@ public class READWRITELOCK extends Jacob
private Status _status = Status.UNLOCKED;
- private ReadWriteLockChannel _self;
+ private ReadWriteLock _self;
- public READWRITELOCK(ReadWriteLockChannel self) {
+ public READWRITELOCK(ReadWriteLock self) {
_self = self;
}
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=1434537&r1=1434536&r2=1434537&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 01:53:02 2013
@@ -34,10 +34,9 @@ import org.apache.ode.bpel.o.OScope;
import org.apache.ode.bpel.o.OScope.Variable;
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.ReadWriteLockChannel;
+import org.apache.ode.bpel.runtime.channels.ReadWriteLock;
import org.apache.ode.jacob.ChannelListener;
import org.apache.ode.jacob.ReceiveProcess;
import org.apache.ode.jacob.Synch;
@@ -114,7 +113,7 @@ public class SCOPEACT extends ACTIVITY {
LinkFrame newframe = new LinkFrame(_linkFrame);
for (OLink outlink : _self.o.outgoingLinks) {
LinkInfo original = _linkFrame.resolve(outlink);
- LinkStatusChannel newchannel = newChannel(LinkStatusChannel.class);
+ LinkStatus newchannel = newChannel(LinkStatus.class);
newframe.links.put(original.olink, new LinkInfo(original.olink, newchannel, newchannel));
}
return newframe;
@@ -372,9 +371,9 @@ public class SCOPEACT extends ACTIVITY {
boolean writeLock;
- ReadWriteLockChannel lockChannel;
+ ReadWriteLock lockChannel;
- public IsolationLock(OScope.Variable go, boolean writeLock, ReadWriteLockChannel channel) {
+ public IsolationLock(OScope.Variable go, boolean writeLock, ReadWriteLock channel) {
this.guardedObject = go;
this.writeLock = writeLock;
this.lockChannel = channel;
@@ -383,6 +382,5 @@ public class SCOPEACT extends ACTIVITY {
public int compareTo(IsolationLock o) {
return guardedObject.getId() - o.guardedObject.getId();
}
-
}
}