Author: hadrian
Date: Wed Jan 16 21:55:11 2013
New Revision: 1434430
URL: http://svn.apache.org/viewvc?rev=1434430&view=rev
Log:
ODE-987. Rename ExportableChannel to a more expressive ChannelProxy
Added:
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ChannelProxy.java
(contents, props changed)
- copied, changed from r1434384,
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ExportableChannel.java
Removed:
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ExportableChannel.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/ClassUtil.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ProcessUtil.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/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=1434430&r1=1434429&r2=1434430&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 21:55:11 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.ExportableChannel,
+ extends org.apache.ode.jacob.ChannelProxy,
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=1434430&r1=1434429&r2=1434430&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 21:55:11 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.ExportableChannel,
+ extends org.apache.ode.jacob.ChannelProxy,
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=1434430&r1=1434429&r2=1434430&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 21:55:11 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.ExportableChannel,
+ extends org.apache.ode.jacob.ChannelProxy,
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=1434430&r1=1434429&r2=1434430&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 21:55:11 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.ExportableChannel,
+ extends org.apache.ode.jacob.ChannelProxy,
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=1434430&r1=1434429&r2=1434430&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 21:55:11 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.ExportableChannel,
+ extends org.apache.ode.jacob.ChannelProxy,
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=1434430&r1=1434429&r2=1434430&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 21:55:11 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.ExportableChannel,
+ extends org.apache.ode.jacob.ChannelProxy,
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=1434430&r1=1434429&r2=1434430&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 21:55:11 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.ExportableChannel,
+ org.apache.ode.jacob.ChannelProxy,
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=1434430&r1=1434429&r2=1434430&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 21:55:11 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.ExportableChannel,
+ extends org.apache.ode.jacob.ChannelProxy,
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=1434430&r1=1434429&r2=1434430&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 21:55:11 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.ExportableChannel,
+ extends org.apache.ode.jacob.ChannelProxy,
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=1434430&r1=1434429&r2=1434430&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 21:55:11 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.ExportableChannel,
+ extends org.apache.ode.jacob.ChannelProxy,
org.apache.ode.bpel.runtime.channels.TimerResponse
{}
Copied: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ChannelProxy.java
(from r1434384,
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ExportableChannel.java)
URL:
http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ChannelProxy.java?p2=ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ChannelProxy.java&p1=ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ExportableChannel.java&r1=1434384&r2=1434430&rev=1434430&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ExportableChannel.java
(original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ChannelProxy.java Wed
Jan 16 21:55:11 2013
@@ -23,6 +23,8 @@ import java.io.Serializable;
/**
* Interface implemented by channel proxies.
*/
-public interface ExportableChannel extends Serializable {
+public interface ChannelProxy extends Serializable {
+
public String export();
+
}
Propchange: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ChannelProxy.java
------------------------------------------------------------------------------
svn:eol-style = native
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=1434430&r1=1434429&r2=1434430&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 21:55:11 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 != ExportableChannel.class) {
+ if (iface != ChannelProxy.class) {
for (Method method : iface.getDeclaredMethods()) {
methods.add(method);
}
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=1434430&r1=1434429&r2=1434430&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 21:55:11 2013
@@ -25,8 +25,8 @@ public final class ProcessUtil {
}
public static String exportChannel(Channel channel) {
- if (channel != null && channel instanceof ExportableChannel) {
- return ((ExportableChannel)channel).export();
+ if (channel != null && channel instanceof ChannelProxy) {
+ return ((ChannelProxy)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/SynchChannel.java
URL:
http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/SynchChannel.java?rev=1434430&r1=1434429&r2=1434430&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 21:55:11 2013
@@ -15,6 +15,6 @@ package org.apache.ode.jacob;
* @see org.apache.ode.jacob.Synch
*/
public interface SynchChannel
- extends org.apache.ode.jacob.ExportableChannel,
+ extends org.apache.ode.jacob.ChannelProxy,
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=1434430&r1=1434429&r2=1434430&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 21:55:11 2013
@@ -15,6 +15,6 @@ package org.apache.ode.jacob;
* @see org.apache.ode.jacob.Val
*/
public interface ValChannel
- extends org.apache.ode.jacob.ExportableChannel,
+ extends org.apache.ode.jacob.ChannelProxy,
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=1434430&r1=1434429&r2=1434430&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 21:55:11 2013
@@ -23,7 +23,7 @@ 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.ChannelProxy;
import org.apache.ode.jacob.soup.CommChannel;
public class ChannelFactory {
@@ -39,7 +39,7 @@ public class ChannelFactory {
}
try {
- METHOD_CHANNEL_EXPORT =
ExportableChannel.class.getMethod("export", new Class[] {});
+ METHOD_CHANNEL_EXPORT = ChannelProxy.class.getMethod("export", new
Class[] {});
} catch (Exception e) {
throw new AssertionError("No export() method on Object!");
}
@@ -52,8 +52,8 @@ public class ChannelFactory {
public static Channel createChannel(CommChannel backend, Class<?> type) {
InvocationHandler h = new ChannelInvocationHandler(backend);
- Class<?>[] ifaces = new Class[] { ExportableChannel.class, type };
- Object proxy =
Proxy.newProxyInstance(ExportableChannel.class.getClassLoader(), ifaces, h);
+ Class<?>[] ifaces = new Class[] { ChannelProxy.class, type };
+ Object proxy =
Proxy.newProxyInstance(ChannelProxy.class.getClassLoader(), ifaces, h);
return (Channel) proxy;
}
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=1434430&r1=1434429&r2=1434430&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 21:55:11 2013
@@ -661,10 +661,11 @@ public class ExecutionQueueImpl implemen
* @throws IOException
*/
protected Object replaceObject(Object obj) throws IOException {
- if (!Serializable.class.isAssignableFrom(obj.getClass()))
- return null;
+ if (!Serializable.class.isAssignableFrom(obj.getClass())) {
+ throw new IllegalArgumentException("Cannot replace non
Serializable instance of " + obj.getClass());
+ }
- if (obj instanceof org.apache.ode.jacob.ExportableChannel) {
+ if (obj instanceof org.apache.ode.jacob.ChannelProxy) {
CommChannel commChannel = (CommChannel)
ChannelFactory.getBackend((Channel)obj);
_serializedChannels.add(commChannel.getId());
return new ChannelRef(commChannel.getType(), (Integer)
commChannel.getId());
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=1434430&r1=1434429&r2=1434430&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 21:55:11 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.ExportableChannel,
+ extends org.apache.ode.jacob.ChannelProxy,
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=1434430&r1=1434429&r2=1434430&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 21:55:11 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.ExportableChannel,
+ extends org.apache.ode.jacob.ChannelProxy,
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=1434430&r1=1434429&r2=1434430&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 21:55:11 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.ExportableChannel,
+ extends org.apache.ode.jacob.ChannelProxy,
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=1434430&r1=1434429&r2=1434430&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 21:55:11 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.ExportableChannel;
+import org.apache.ode.jacob.ChannelProxy;
import org.apache.ode.jacob.Channel;
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<?>[] {ExportableChannel.class, Greeter.class}, new
GreeterInvocationHandler(new GreeterImpl()));
+ new Class<?>[] {ChannelProxy.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(ExportableChannel.class.getMethod("export", new
Class[] {}))) {
+ if (method.equals(ChannelProxy.class.getMethod("export", new
Class[] {}))) {
return "Implemented by InvocationHandler";
}
return method.invoke(greeter, args);
