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/16 21:52:04 UTC
svn commit: r1434382 - in
/ode/trunk/jacob/src/main/java/org/apache/ode/jacob: ChannelListener.java
JacobObject.java ReceiveProcess.java vpu/ChannelFactory.java
vpu/ExecutionQueueImpl.java vpu/JacobVPU.java
Author: hadrian
Date: Wed Jan 16 20:52:04 2013
New Revision: 1434382
URL: http://svn.apache.org/viewvc?rev=1434382&view=rev
Log:
ODE-987. Eliminate explicit dependency on ExportableChannel
Modified:
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ChannelListener.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobObject.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ReceiveProcess.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ChannelFactory.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ChannelListener.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ChannelListener.java?rev=1434382&r1=1434381&r2=1434382&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ChannelListener.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ChannelListener.java Wed Jan 16 20:52:04 2013
@@ -31,9 +31,9 @@ import java.util.Set;
@SuppressWarnings("serial")
public abstract class ChannelListener extends JacobObject {
private transient Set<Method> _implementedMethods;
- private transient ExportableChannel _channel;
+ private transient Channel _channel;
- protected ChannelListener(ExportableChannel channel) throws IllegalStateException {
+ protected ChannelListener(Channel channel) throws IllegalStateException {
assert getClass().getSuperclass().getSuperclass() == ChannelListener.class :
"Inheritance in ChannelListener classes not allowed!";
if (channel == null) {
@@ -42,11 +42,11 @@ public abstract class ChannelListener ex
_channel = channel;
}
- public ExportableChannel getChannel() {
+ public Channel getChannel() {
return _channel;
}
- public void setChannel(ExportableChannel channel) {
+ public void setChannel(Channel channel) {
_channel = channel;
}
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobObject.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobObject.java?rev=1434382&r1=1434381&r2=1434382&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobObject.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobObject.java Wed Jan 16 20:52:04 2013
@@ -84,7 +84,7 @@ public abstract class JacobObject implem
*/
protected static ExportableChannel object(ChannelListener methodList) {
JacobVPU.activeJacobThread().object(false, methodList);
- return methodList.getChannel();
+ return (ExportableChannel)methodList.getChannel();
}
protected static void object(boolean replication, ChannelListener methodList) {
@@ -102,7 +102,7 @@ public abstract class JacobObject implem
protected static ExportableChannel replication(ChannelListener methodList) {
JacobVPU.activeJacobThread().object(true, methodList);
- return methodList.getChannel();
+ return (ExportableChannel)methodList.getChannel();
}
/**
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=1434382&r1=1434381&r2=1434382&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 Wed Jan 16 20:52:04 2013
@@ -29,7 +29,7 @@ public abstract class ReceiveProcess<R>
private transient Set<Method> _implementedMethods;
private R receiver;
- protected ReceiveProcess(ExportableChannel 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/ChannelFactory.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ChannelFactory.java?rev=1434382&r1=1434381&r2=1434382&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ChannelFactory.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ChannelFactory.java Wed Jan 16 20:52:04 2013
@@ -22,6 +22,7 @@ import java.lang.reflect.InvocationHandl
import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
+import org.apache.ode.jacob.Channel;
import org.apache.ode.jacob.ExportableChannel;
import org.apache.ode.jacob.soup.CommChannel;
@@ -44,7 +45,7 @@ public class ChannelFactory {
}
}
- public static Object getBackend(ExportableChannel channel) {
+ public static Object getBackend(Channel channel) {
ChannelInvocationHandler cih = (ChannelInvocationHandler) Proxy.getInvocationHandler(channel);
return cih._backend;
}
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java?rev=1434382&r1=1434381&r2=1434382&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java Wed Jan 16 20:52:04 2013
@@ -40,6 +40,7 @@ import java.util.concurrent.ConcurrentHa
import java.util.zip.GZIPInputStream;
import java.util.zip.GZIPOutputStream;
+import org.apache.ode.jacob.Channel;
import org.apache.ode.jacob.ExportableChannel;
import org.apache.ode.jacob.ChannelListener;
import org.apache.ode.jacob.IndexedObject;
@@ -665,7 +666,7 @@ public class ExecutionQueueImpl implemen
return null;
if (obj instanceof org.apache.ode.jacob.ExportableChannel) {
- CommChannel commChannel = (CommChannel) ChannelFactory.getBackend((ExportableChannel) obj);
+ CommChannel commChannel = (CommChannel) ChannelFactory.getBackend((Channel)obj);
_serializedChannels.add(commChannel.getId());
return new ChannelRef(commChannel.getType(), (Integer) commChannel.getId());
} else if (_replacementMap != null && _replacementMap.isReplaceable(obj)) {
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=1434382&r1=1434381&r2=1434382&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 Wed Jan 16 20:52:04 2013
@@ -24,6 +24,7 @@ import java.util.HashMap;
import java.util.Map;
import java.util.Stack;
+import org.apache.ode.jacob.Channel;
import org.apache.ode.jacob.ExportableChannel;
import org.apache.ode.jacob.ChannelListener;
import org.apache.ode.jacob.JacobObject;
@@ -293,7 +294,7 @@ public final class JacobVPU {
newArgs[args.length] = replyChannel;
args = newArgs;
}
- CommChannel chnl = (CommChannel) ChannelFactory.getBackend(channel);
+ CommChannel chnl = (CommChannel) ChannelFactory.getBackend((Channel)channel);
CommGroup grp = new CommGroup(false);
CommSend send = new CommSend(chnl, method, args);
grp.add(send);
@@ -316,7 +317,7 @@ public final class JacobVPU {
public String exportChannel(ExportableChannel channel) {
LOG.trace(">> [{}] : export<{}>", _cycle, channel);
- CommChannel chnl = (CommChannel) ChannelFactory.getBackend(channel);
+ CommChannel chnl = (CommChannel)ChannelFactory.getBackend((Channel)channel);
return _executionQueue.createExport(chnl);
}
@@ -344,8 +345,7 @@ public final class JacobVPU {
CommGroup grp = new CommGroup(replicate);
for (int i = 0; i < ml.length; ++i) {
- CommChannel chnl = (CommChannel) ChannelFactory
- .getBackend(ml[i].getChannel());
+ CommChannel chnl = (CommChannel) ChannelFactory.getBackend(ml[i].getChannel());
// TODO see below..
// oframe.setDebugInfo(fillDebugInfo());
CommRecv recv = new CommRecv(chnl, ml[i]);