Author: hadrian
Date: Wed Jan 16 16:19:30 2013
New Revision: 1434015
URL: http://svn.apache.org/viewvc?rev=1434015&view=rev
Log:
ODE-987. Rename the Channel interface for now. It may go away eventually, as
exportChannel could be directly invoked by ProcUtil
Removed:
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/Channel.java
Modified:
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ActivityRecoveryChannel.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/CompensationChannel.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/EventHandlerControlChannel.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/InvokeResponseChannel.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/LinkStatusChannel.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ParentScopeChannel.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/PickResponseChannel.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ReadWriteLockChannel.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TerminationChannel.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TimerResponseChannel.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ChannelListener.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ClassUtil.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobObject.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobThread.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ProcessUtil.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ReceiveProcess.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/SynchChannel.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ValChannel.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
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/CellChannel.java
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStreamChannel.java
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrintChannel.java
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/vpu/ProxyConstructorTimingTest.java
Modified:
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ActivityRecoveryChannel.java
URL:
http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ActivityRecoveryChannel.java?rev=1434015&r1=1434014&r2=1434015&view=diff
==============================================================================
---
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ActivityRecoveryChannel.java
(original)
+++
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ActivityRecoveryChannel.java
Wed Jan 16 16:19:30 2013
@@ -15,6 +15,6 @@ package org.apache.ode.bpel.runtime.chan
* @see org.apache.ode.bpel.runtime.channels.ActivityRecovery
*/
public interface ActivityRecoveryChannel
- extends org.apache.ode.jacob.Channel,
+ extends org.apache.ode.jacob.ExportableChannel,
org.apache.ode.bpel.runtime.channels.ActivityRecovery
{}
Modified:
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/CompensationChannel.java
URL:
http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/CompensationChannel.java?rev=1434015&r1=1434014&r2=1434015&view=diff
==============================================================================
---
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/CompensationChannel.java
(original)
+++
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/CompensationChannel.java
Wed Jan 16 16:19:30 2013
@@ -15,6 +15,6 @@ package org.apache.ode.bpel.runtime.chan
* @see org.apache.ode.bpel.runtime.channels.Compensation
*/
public interface CompensationChannel
- extends org.apache.ode.jacob.Channel,
+ extends org.apache.ode.jacob.ExportableChannel,
org.apache.ode.bpel.runtime.channels.Compensation
{}
Modified:
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/EventHandlerControlChannel.java
URL:
http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/EventHandlerControlChannel.java?rev=1434015&r1=1434014&r2=1434015&view=diff
==============================================================================
---
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/EventHandlerControlChannel.java
(original)
+++
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/EventHandlerControlChannel.java
Wed Jan 16 16:19:30 2013
@@ -15,6 +15,6 @@ package org.apache.ode.bpel.runtime.chan
* @see org.apache.ode.bpel.runtime.channels.EventHandlerControl
*/
public interface EventHandlerControlChannel
- extends org.apache.ode.jacob.Channel,
+ extends org.apache.ode.jacob.ExportableChannel,
org.apache.ode.bpel.runtime.channels.EventHandlerControl
{}
Modified:
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/InvokeResponseChannel.java
URL:
http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/InvokeResponseChannel.java?rev=1434015&r1=1434014&r2=1434015&view=diff
==============================================================================
---
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/InvokeResponseChannel.java
(original)
+++
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/InvokeResponseChannel.java
Wed Jan 16 16:19:30 2013
@@ -15,6 +15,6 @@ package org.apache.ode.bpel.runtime.chan
* @see org.apache.ode.bpel.runtime.channels.InvokeResponse
*/
public interface InvokeResponseChannel
- extends org.apache.ode.jacob.Channel,
+ extends org.apache.ode.jacob.ExportableChannel,
org.apache.ode.bpel.runtime.channels.InvokeResponse
{}
Modified:
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/LinkStatusChannel.java
URL:
http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/LinkStatusChannel.java?rev=1434015&r1=1434014&r2=1434015&view=diff
==============================================================================
---
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/LinkStatusChannel.java
(original)
+++
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/LinkStatusChannel.java
Wed Jan 16 16:19:30 2013
@@ -15,6 +15,6 @@ package org.apache.ode.bpel.runtime.chan
* @see org.apache.ode.bpel.runtime.channels.LinkStatus
*/
public interface LinkStatusChannel
- extends org.apache.ode.jacob.Channel,
+ extends org.apache.ode.jacob.ExportableChannel,
org.apache.ode.bpel.runtime.channels.LinkStatus
{}
Modified:
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ParentScopeChannel.java
URL:
http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ParentScopeChannel.java?rev=1434015&r1=1434014&r2=1434015&view=diff
==============================================================================
---
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ParentScopeChannel.java
(original)
+++
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ParentScopeChannel.java
Wed Jan 16 16:19:30 2013
@@ -15,6 +15,6 @@ package org.apache.ode.bpel.runtime.chan
* @see org.apache.ode.bpel.runtime.channels.ParentScope
*/
public interface ParentScopeChannel
- extends org.apache.ode.jacob.Channel,
+ extends org.apache.ode.jacob.ExportableChannel,
org.apache.ode.bpel.runtime.channels.ParentScope
{}
Modified:
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/PickResponseChannel.java
URL:
http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/PickResponseChannel.java?rev=1434015&r1=1434014&r2=1434015&view=diff
==============================================================================
---
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/PickResponseChannel.java
(original)
+++
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/PickResponseChannel.java
Wed Jan 16 16:19:30 2013
@@ -16,6 +16,6 @@ package org.apache.ode.bpel.runtime.chan
*/
public interface PickResponseChannel
extends
org.apache.ode.bpel.runtime.channels.TimerResponseChannel,
- org.apache.ode.jacob.Channel,
+ org.apache.ode.jacob.ExportableChannel,
org.apache.ode.bpel.runtime.channels.PickResponse
{}
Modified:
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ReadWriteLockChannel.java
URL:
http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ReadWriteLockChannel.java?rev=1434015&r1=1434014&r2=1434015&view=diff
==============================================================================
---
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ReadWriteLockChannel.java
(original)
+++
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ReadWriteLockChannel.java
Wed Jan 16 16:19:30 2013
@@ -15,6 +15,6 @@ package org.apache.ode.bpel.runtime.chan
* @see org.apache.ode.bpel.runtime.channels.ReadWriteLock
*/
public interface ReadWriteLockChannel
- extends org.apache.ode.jacob.Channel,
+ extends org.apache.ode.jacob.ExportableChannel,
org.apache.ode.bpel.runtime.channels.ReadWriteLock
{}
Modified:
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TerminationChannel.java
URL:
http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TerminationChannel.java?rev=1434015&r1=1434014&r2=1434015&view=diff
==============================================================================
---
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TerminationChannel.java
(original)
+++
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TerminationChannel.java
Wed Jan 16 16:19:30 2013
@@ -15,6 +15,6 @@ package org.apache.ode.bpel.runtime.chan
* @see org.apache.ode.bpel.runtime.channels.Termination
*/
public interface TerminationChannel
- extends org.apache.ode.jacob.Channel,
+ extends org.apache.ode.jacob.ExportableChannel,
org.apache.ode.bpel.runtime.channels.Termination
{}
Modified:
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TimerResponseChannel.java
URL:
http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TimerResponseChannel.java?rev=1434015&r1=1434014&r2=1434015&view=diff
==============================================================================
---
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TimerResponseChannel.java
(original)
+++
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TimerResponseChannel.java
Wed Jan 16 16:19:30 2013
@@ -15,6 +15,6 @@ package org.apache.ode.bpel.runtime.chan
* @see org.apache.ode.bpel.runtime.channels.TimerResponse
*/
public interface TimerResponseChannel
- extends org.apache.ode.jacob.Channel,
+ extends org.apache.ode.jacob.ExportableChannel,
org.apache.ode.bpel.runtime.channels.TimerResponse
{}
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=1434015&r1=1434014&r2=1434015&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 16:19:30 2013
@@ -31,9 +31,9 @@ import java.util.Set;
@SuppressWarnings("serial")
public abstract class ChannelListener extends JacobObject {
private transient Set<Method> _implementedMethods;
- private transient Channel _channel;
+ private transient ExportableChannel _channel;
- protected ChannelListener(Channel channel) throws IllegalStateException {
+ protected ChannelListener(ExportableChannel 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 Channel getChannel() {
+ public ExportableChannel getChannel() {
return _channel;
}
- public void setChannel(Channel channel) {
+ public void setChannel(ExportableChannel channel) {
_channel = channel;
}
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ClassUtil.java
URL:
http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ClassUtil.java?rev=1434015&r1=1434014&r2=1434015&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ClassUtil.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ClassUtil.java Wed Jan
16 16:19:30 2013
@@ -33,7 +33,7 @@ public final class ClassUtil {
Class<?>[] interfaces = clazz.getInterfaces();
for (Class<?> iface : interfaces) {
// TODO: the test below could be more generic...
- if (iface != Channel.class) {
+ if (iface != ExportableChannel.class) {
for (Method method : iface.getDeclaredMethods()) {
methods.add(method);
}
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=1434015&r1=1434014&r2=1434015&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 16:19:30 2013
@@ -44,7 +44,7 @@ public abstract class JacobObject implem
}
@SuppressWarnings("unchecked")
- protected static <T extends Channel> T importChannel(String channelId,
Class<T> channelClass) {
+ protected static <T extends ExportableChannel> T importChannel(String
channelId, Class<T> channelClass) {
return (T) JacobVPU.activeJacobThread().importChannel(channelId,
channelClass);
}
@@ -58,7 +58,7 @@ public abstract class JacobObject implem
JacobVPU.activeJacobThread().instance(concretion);
}
- protected <T extends Channel> T newChannel(Class<T> channelType)
+ protected <T extends ExportableChannel> T newChannel(Class<T> channelType)
throws IllegalArgumentException
{
return newChannel(channelType, null);
@@ -69,7 +69,7 @@ public abstract class JacobObject implem
* is equivalent to <code>(new x) ... </code> in the process calculus.
*/
@SuppressWarnings("unchecked")
- protected <T extends Channel> T newChannel(Class<T> channelType, String
description)
+ protected <T extends ExportableChannel> T newChannel(Class<T> channelType,
String description)
throws IllegalArgumentException
{
return (T) JacobVPU.activeJacobThread().newChannel(channelType,
getClassName(), description);
@@ -82,7 +82,7 @@ public abstract class JacobObject implem
* @param methodList method list for the communication reduction
* @see JacobThread#object
*/
- protected static Channel object(ChannelListener methodList) {
+ protected static ExportableChannel object(ChannelListener methodList) {
JacobVPU.activeJacobThread().object(false, methodList);
return methodList.getChannel();
}
@@ -100,7 +100,7 @@ public abstract class JacobObject implem
methodLists.toArray(new ChannelListener[methodLists.size()]));
}
- protected static Channel replication(ChannelListener methodList) {
+ protected static ExportableChannel replication(ChannelListener methodList)
{
JacobVPU.activeJacobThread().object(true, methodList);
return methodList.getChannel();
}
@@ -111,7 +111,7 @@ public abstract class JacobObject implem
* @param channel target channel
* @return replicated channel broadcaster
*/
- protected static <T extends Channel> T replication(T channel) {
+ protected static <T extends ExportableChannel> T replication(T channel) {
// TODO: we should create a replicated wrapper here.
return channel;
}
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobThread.java
URL:
http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobThread.java?rev=1434015&r1=1434014&r2=1434015&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobThread.java
(original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/JacobThread.java Wed Jan
16 16:19:30 2013
@@ -32,9 +32,9 @@ import java.lang.reflect.Method;
public interface JacobThread {
public Object getExtension(Class<?> extensionClass);
- public String exportChannel(Channel channel);
+ public String exportChannel(ExportableChannel channel);
- public Channel importChannel(String channelId, Class<?> channelClass);
+ public ExportableChannel importChannel(String channelId, Class<?>
channelClass);
/**
* Create a process instance i.e. a concretion of a process abstraction.
@@ -43,7 +43,7 @@ public interface JacobThread {
/**
* Send a message (object invocation). This method shouldn't really be used
- * as {@link Channel} objects may be used as proxies in this respect.
+ * as {@link ExportableChannel} objects may be used as proxies in this
respect.
*
* @param channel
* channel on which to send the message
@@ -52,12 +52,12 @@ public interface JacobThread {
* @param args
* arguments
*/
- public Channel message(Channel channel, Method method, Object[] args);
+ public ExportableChannel message(ExportableChannel channel, Method method,
Object[] args);
/**
* Create a new channel.
*/
- public Channel newChannel(Class<?> channelType, String creator, String
description);
+ public ExportableChannel newChannel(Class<?> channelType, String creator,
String description);
/**
* <p>
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ProcessUtil.java
URL:
http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ProcessUtil.java?rev=1434015&r1=1434014&r2=1434015&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ProcessUtil.java
(original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ProcessUtil.java Wed Jan
16 16:19:30 2013
@@ -25,8 +25,8 @@ public final class ProcessUtil {
}
public static String exportChannel(ChannelType channel) {
- if (channel != null && channel instanceof Channel) {
- return ((Channel)channel).export();
+ if (channel != null && channel instanceof ExportableChannel) {
+ return ((ExportableChannel)channel).export();
}
throw new IllegalArgumentException("Invalid proxy type: "
+ channel == null ? "<null>" : channel.getClass().toString());
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=1434015&r1=1434014&r2=1434015&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 16:19:30 2013
@@ -29,7 +29,7 @@ public abstract class ReceiveProcess<R>
private transient Set<Method> _implementedMethods;
private R receiver;
- protected ReceiveProcess(Channel channel, R receiver) throws
IllegalStateException {
+ protected ReceiveProcess(ExportableChannel channel, R receiver) throws
IllegalStateException {
super(channel);
this.receiver = receiver;
}
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/SynchChannel.java
URL:
http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/SynchChannel.java?rev=1434015&r1=1434014&r2=1434015&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/SynchChannel.java
(original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/SynchChannel.java Wed
Jan 16 16:19:30 2013
@@ -15,6 +15,6 @@ package org.apache.ode.jacob;
* @see org.apache.ode.jacob.Synch
*/
public interface SynchChannel
- extends org.apache.ode.jacob.Channel,
+ extends org.apache.ode.jacob.ExportableChannel,
org.apache.ode.jacob.Synch
{}
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ValChannel.java
URL:
http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ValChannel.java?rev=1434015&r1=1434014&r2=1434015&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ValChannel.java
(original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ValChannel.java Wed Jan
16 16:19:30 2013
@@ -15,6 +15,6 @@ package org.apache.ode.jacob;
* @see org.apache.ode.jacob.Val
*/
public interface ValChannel
- extends org.apache.ode.jacob.Channel,
+ extends org.apache.ode.jacob.ExportableChannel,
org.apache.ode.jacob.Val
{}
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=1434015&r1=1434014&r2=1434015&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 16:19:30 2013
@@ -22,7 +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;
public class ChannelFactory {
@@ -38,22 +38,22 @@ public class ChannelFactory {
}
try {
- METHOD_CHANNEL_EXPORT = Channel.class.getMethod("export", new
Class[] {});
+ METHOD_CHANNEL_EXPORT =
ExportableChannel.class.getMethod("export", new Class[] {});
} catch (Exception e) {
throw new AssertionError("No export() method on Object!");
}
}
- public static Object getBackend(Channel channel) {
+ public static Object getBackend(ExportableChannel channel) {
ChannelInvocationHandler cih = (ChannelInvocationHandler)
Proxy.getInvocationHandler(channel);
return cih._backend;
}
- public static Channel createChannel(CommChannel backend, Class<?> type) {
+ public static ExportableChannel createChannel(CommChannel backend,
Class<?> type) {
InvocationHandler h = new ChannelInvocationHandler(backend);
- Class<?>[] ifaces = new Class[] { Channel.class, type };
- Object proxy = Proxy.newProxyInstance(Channel.class.getClassLoader(),
ifaces, h);
- return (Channel) proxy;
+ Class<?>[] ifaces = new Class[] { ExportableChannel.class, type };
+ Object proxy =
Proxy.newProxyInstance(ExportableChannel.class.getClassLoader(), ifaces, h);
+ return (ExportableChannel) proxy;
}
public static final class ChannelInvocationHandler implements
InvocationHandler {
@@ -83,9 +83,9 @@ public class ChannelFactory {
return method.invoke(this, args);
}
if (method.equals(METHOD_CHANNEL_EXPORT)) {
- return JacobVPU.activeJacobThread().exportChannel((Channel)
proxy);
+ return
JacobVPU.activeJacobThread().exportChannel((ExportableChannel) proxy);
}
- return JacobVPU.activeJacobThread().message((Channel) proxy,
method, args);
+ return JacobVPU.activeJacobThread().message((ExportableChannel)
proxy, method, args);
}
} // class ChannelInvocationHandler
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=1434015&r1=1434014&r2=1434015&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 16:19:30 2013
@@ -40,7 +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;
import org.apache.ode.jacob.JacobObject;
@@ -664,8 +664,8 @@ public class ExecutionQueueImpl implemen
if (!Serializable.class.isAssignableFrom(obj.getClass()))
return null;
- if (obj instanceof org.apache.ode.jacob.Channel) {
- CommChannel commChannel = (CommChannel)
ChannelFactory.getBackend((Channel) obj);
+ if (obj instanceof org.apache.ode.jacob.ExportableChannel) {
+ CommChannel commChannel = (CommChannel)
ChannelFactory.getBackend((ExportableChannel) 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=1434015&r1=1434014&r2=1434015&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 16:19:30 2013
@@ -24,7 +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;
import org.apache.ode.jacob.JacobRunnable;
@@ -274,7 +274,7 @@ public final class JacobVPU {
LOG.isInfoEnabled() ? template.toString() : null);
}
- public Channel message(Channel channel, Method method, Object[] args) {
+ public ExportableChannel message(ExportableChannel channel, Method
method, Object[] args) {
LOG.trace(">> [{}] : {} ! {} ({})", _cycle, channel,
method.getName(),
LOG.isTraceEnabled() ? stringify(args) : null);
@@ -301,26 +301,26 @@ public final class JacobVPU {
return replyChannel;
}
- public Channel newChannel(Class<?> channelType, String creator, String
description) {
+ public ExportableChannel newChannel(Class<?> channelType, String
creator, String description) {
CommChannel chnl = new CommChannel(channelType);
chnl.setDescription(description);
_executionQueue.add(chnl);
- Channel ret = ChannelFactory.createChannel(chnl, channelType);
+ ExportableChannel ret = ChannelFactory.createChannel(chnl,
channelType);
LOG.trace(">> [{}] : new {}", _cycle, ret);
_statistics.channelsCreated++;
return ret;
}
- public String exportChannel(Channel channel) {
+ public String exportChannel(ExportableChannel channel) {
LOG.trace(">> [{}] : export<{}>", _cycle, channel);
CommChannel chnl = (CommChannel)
ChannelFactory.getBackend(channel);
return _executionQueue.createExport(chnl);
}
- public Channel importChannel(String channelId, Class<?> channelType) {
+ public ExportableChannel importChannel(String channelId, Class<?>
channelType) {
CommChannel cframe = _executionQueue.consumeExport(channelId);
return ChannelFactory.createChannel(cframe, channelType);
}
Modified:
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/CellChannel.java
URL:
http://svn.apache.org/viewvc/ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/CellChannel.java?rev=1434015&r1=1434014&r2=1434015&view=diff
==============================================================================
---
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/CellChannel.java
(original)
+++
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/cell/CellChannel.java
Wed Jan 16 16:19:30 2013
@@ -15,6 +15,6 @@ package org.apache.ode.jacob.examples.ce
* @see org.apache.ode.jacob.examples.cell.Cell
*/
public interface CellChannel
- extends org.apache.ode.jacob.Channel,
+ extends org.apache.ode.jacob.ExportableChannel,
org.apache.ode.jacob.examples.cell.Cell
{}
Modified:
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStreamChannel.java
URL:
http://svn.apache.org/viewvc/ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStreamChannel.java?rev=1434015&r1=1434014&r2=1434015&view=diff
==============================================================================
---
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStreamChannel.java
(original)
+++
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStreamChannel.java
Wed Jan 16 16:19:30 2013
@@ -15,6 +15,6 @@ package org.apache.ode.jacob.examples.er
* @see org.apache.ode.jacob.examples.eratosthenes.NaturalNumberStream
*/
public interface NaturalNumberStreamChannel
- extends org.apache.ode.jacob.Channel,
+ extends org.apache.ode.jacob.ExportableChannel,
org.apache.ode.jacob.examples.eratosthenes.NaturalNumberStream
{}
Modified:
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrintChannel.java
URL:
http://svn.apache.org/viewvc/ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrintChannel.java?rev=1434015&r1=1434014&r2=1434015&view=diff
==============================================================================
---
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrintChannel.java
(original)
+++
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrintChannel.java
Wed Jan 16 16:19:30 2013
@@ -15,6 +15,6 @@ package org.apache.ode.jacob.examples.sy
* @see org.apache.ode.jacob.examples.synch.SynchPrint
*/
public interface SynchPrintChannel
- extends org.apache.ode.jacob.Channel,
+ extends org.apache.ode.jacob.ExportableChannel,
org.apache.ode.jacob.examples.synch.SynchPrint
{}
Modified:
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/vpu/ProxyConstructorTimingTest.java
URL:
http://svn.apache.org/viewvc/ode/trunk/jacob/src/test/java/org/apache/ode/jacob/vpu/ProxyConstructorTimingTest.java?rev=1434015&r1=1434014&r2=1434015&view=diff
==============================================================================
---
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/vpu/ProxyConstructorTimingTest.java
(original)
+++
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/vpu/ProxyConstructorTimingTest.java
Wed Jan 16 16:19:30 2013
@@ -22,7 +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.ChannelType;
import org.apache.ode.jacob.ProcessUtil;
@@ -37,7 +37,7 @@ public class ProxyConstructorTimingTest
public void testDoNothing() throws Exception {
Greeter gp = (Greeter)
Proxy.newProxyInstance(Greeter.class.getClassLoader(),
- new Class<?>[] {Channel.class, Greeter.class}, new
GreeterInvocationHandler(new GreeterImpl()));
+ new Class<?>[] {ExportableChannel.class, Greeter.class}, new
GreeterInvocationHandler(new GreeterImpl()));
assertEquals("Hello World", gp.hello("World"));
assertEquals("Implemented by InvocationHandler",
ProcessUtil.exportChannel(gp));
}
@@ -145,7 +145,7 @@ public class ProxyConstructorTimingTest
throw new IllegalStateException(String.valueOf(method));
}
}
- if (method.equals(Channel.class.getMethod("export", new Class[]
{}))) {
+ if (method.equals(ExportableChannel.class.getMethod("export", new
Class[] {}))) {
return "Implemented by InvocationHandler";
}
return method.invoke(greeter, args);
