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 17:52:38 UTC
svn commit: r1434033 - in /ode/trunk:
bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/
jacob/src/main/java/org/apache/ode/jacob/
jacob/src/test/java/org/apache/ode/jacob/examples/cell/
jacob/src/test/java/org/apache/ode/jacob/examples/e...
Author: hadrian
Date: Wed Jan 16 16:52:37 2013
New Revision: 1434033
URL: http://svn.apache.org/viewvc?rev=1434033&view=rev
Log:
ODE-987. Rename marker interface to Channel for a cleaner api
Added:
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/Channel.java (contents, props changed)
- copied, changed from r1434016, ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ChannelType.java
Removed:
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ChannelType.java
Modified:
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ActivityRecovery.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/Compensation.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/EventHandlerControl.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/InvokeResponse.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/LinkStatus.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ParentScope.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ReadWriteLock.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/Termination.java
ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TimerResponse.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ProcessUtil.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/Synch.java
ode/trunk/jacob/src/main/java/org/apache/ode/jacob/Val.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/eratosthenes/NaturalNumberStream.java
ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrint.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/ActivityRecovery.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ActivityRecovery.java?rev=1434033&r1=1434032&r2=1434033&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ActivityRecovery.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ActivityRecovery.java Wed Jan 16 16:52:37 2013
@@ -19,9 +19,9 @@
package org.apache.ode.bpel.runtime.channels;
-import org.apache.ode.jacob.ChannelType;
+import org.apache.ode.jacob.Channel;
-public interface ActivityRecovery extends ChannelType {
+public interface ActivityRecovery extends Channel {
/**
* Retry the activity.
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/Compensation.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/Compensation.java?rev=1434033&r1=1434032&r2=1434033&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/Compensation.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/Compensation.java Wed Jan 16 16:52:37 2013
@@ -18,10 +18,10 @@
*/
package org.apache.ode.bpel.runtime.channels;
-import org.apache.ode.jacob.ChannelType;
+import org.apache.ode.jacob.Channel;
import org.apache.ode.jacob.SynchChannel;
-public interface Compensation extends ChannelType {
+public interface Compensation extends Channel {
public void forget();
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/EventHandlerControl.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/EventHandlerControl.java?rev=1434033&r1=1434032&r2=1434033&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/EventHandlerControl.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/EventHandlerControl.java Wed Jan 16 16:52:37 2013
@@ -18,12 +18,12 @@
*/
package org.apache.ode.bpel.runtime.channels;
-import org.apache.ode.jacob.ChannelType;
+import org.apache.ode.jacob.Channel;
/**
* Channel used to control processing of event handler activities.
*/
-public interface EventHandlerControl extends ChannelType {
+public interface EventHandlerControl extends Channel {
/**
* Finish up active events but stop processing any more.
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/InvokeResponse.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/InvokeResponse.java?rev=1434033&r1=1434032&r2=1434033&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/InvokeResponse.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/InvokeResponse.java Wed Jan 16 16:52:37 2013
@@ -18,12 +18,12 @@
*/
package org.apache.ode.bpel.runtime.channels;
-import org.apache.ode.jacob.ChannelType;
+import org.apache.ode.jacob.Channel;
/**
* Response channel for pick requests.
*/
-public interface InvokeResponse extends ChannelType {
+public interface InvokeResponse extends Channel {
public void onResponse();
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/LinkStatus.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/LinkStatus.java?rev=1434033&r1=1434032&r2=1434033&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/LinkStatus.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/LinkStatus.java Wed Jan 16 16:52:37 2013
@@ -18,11 +18,11 @@
*/
package org.apache.ode.bpel.runtime.channels;
-import org.apache.ode.jacob.ChannelType;
+import org.apache.ode.jacob.Channel;
/**
*/
-public interface LinkStatus extends ChannelType {
+public interface LinkStatus extends Channel {
void linkStatus(boolean value);
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ParentScope.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ParentScope.java?rev=1434033&r1=1434032&r2=1434033&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ParentScope.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ParentScope.java Wed Jan 16 16:52:37 2013
@@ -22,7 +22,7 @@ import java.util.Set;
import org.apache.ode.bpel.o.OScope;
import org.apache.ode.bpel.runtime.CompensationHandler;
-import org.apache.ode.jacob.ChannelType;
+import org.apache.ode.jacob.Channel;
import org.apache.ode.jacob.SynchChannel;
import org.w3c.dom.Element;
@@ -30,7 +30,7 @@ import org.w3c.dom.Element;
/**
* Channel used for child-to-parent scope communication.
*/
-public interface ParentScope extends ChannelType {
+public interface ParentScope extends Channel {
void compensate(OScope scope, SynchChannel ret);
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ReadWriteLock.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ReadWriteLock.java?rev=1434033&r1=1434032&r2=1434033&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ReadWriteLock.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/ReadWriteLock.java Wed Jan 16 16:52:37 2013
@@ -18,10 +18,10 @@
*/
package org.apache.ode.bpel.runtime.channels;
-import org.apache.ode.jacob.ChannelType;
+import org.apache.ode.jacob.Channel;
import org.apache.ode.jacob.SynchChannel;
-public interface ReadWriteLock extends ChannelType {
+public interface ReadWriteLock extends Channel {
public void readLock(SynchChannel s);
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/Termination.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/Termination.java?rev=1434033&r1=1434032&r2=1434033&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/Termination.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/Termination.java Wed Jan 16 16:52:37 2013
@@ -18,12 +18,12 @@
*/
package org.apache.ode.bpel.runtime.channels;
-import org.apache.ode.jacob.ChannelType;
+import org.apache.ode.jacob.Channel;
/**
* Channel used for parent-to-child scope communication.
*/
-public interface Termination extends ChannelType {
+public interface Termination extends Channel {
/**
* Stop processing immediately.
Modified: ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TimerResponse.java
URL: http://svn.apache.org/viewvc/ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TimerResponse.java?rev=1434033&r1=1434032&r2=1434033&view=diff
==============================================================================
--- ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TimerResponse.java (original)
+++ ode/trunk/bpel-runtime/src/main/java/org/apache/ode/bpel/runtime/channels/TimerResponse.java Wed Jan 16 16:52:37 2013
@@ -18,12 +18,12 @@
*/
package org.apache.ode.bpel.runtime.channels;
-import org.apache.ode.jacob.ChannelType;
+import org.apache.ode.jacob.Channel;
/**
* Channel for timer notification.
*/
-public interface TimerResponse extends ChannelType {
+public interface TimerResponse extends Channel {
/** timer event has occurred */
public void onTimeout();
Copied: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/Channel.java (from r1434016, ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ChannelType.java)
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/Channel.java?p2=ode/trunk/jacob/src/main/java/org/apache/ode/jacob/Channel.java&p1=ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ChannelType.java&r1=1434016&r2=1434033&rev=1434033&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/ChannelType.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/Channel.java Wed Jan 16 16:52:37 2013
@@ -24,5 +24,5 @@ import java.io.Serializable;
* Marker interface extended by channel interfaces.
* TODO: evaluate if an annotation, although slower, would offer a more elegant approach
*/
-public interface ChannelType extends Serializable {
+public interface Channel extends Serializable {
}
Propchange: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/Channel.java
------------------------------------------------------------------------------
svn:eol-style = native
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=1434033&r1=1434032&r2=1434033&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:52:37 2013
@@ -24,7 +24,7 @@ public final class ProcessUtil {
// Utility class
}
- public static String exportChannel(ChannelType channel) {
+ public static String exportChannel(Channel channel) {
if (channel != null && channel instanceof ExportableChannel) {
return ((ExportableChannel)channel).export();
}
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/Synch.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/Synch.java?rev=1434033&r1=1434032&r2=1434033&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/Synch.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/Synch.java Wed Jan 16 16:52:37 2013
@@ -27,7 +27,7 @@ package org.apache.ode.jacob;
* @author Maciej Szefler <a href="mailto:mbs@fivesight.com">mbs</a>
*/
-public interface Synch extends ChannelType {
+public interface Synch extends Channel {
public void ret();
Modified: ode/trunk/jacob/src/main/java/org/apache/ode/jacob/Val.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/main/java/org/apache/ode/jacob/Val.java?rev=1434033&r1=1434032&r2=1434033&view=diff
==============================================================================
--- ode/trunk/jacob/src/main/java/org/apache/ode/jacob/Val.java (original)
+++ ode/trunk/jacob/src/main/java/org/apache/ode/jacob/Val.java Wed Jan 16 16:52:37 2013
@@ -22,7 +22,7 @@ package org.apache.ode.jacob;
/**
* Generic return-value channel type.
*/
-public interface Val extends ChannelType {
+public interface Val extends Channel {
public void val(Object retVal);
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=1434033&r1=1434032&r2=1434033&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 Wed Jan 16 16:52:37 2013
@@ -19,13 +19,13 @@
package org.apache.ode.jacob.examples.cell;
-import org.apache.ode.jacob.ChannelType;
+import org.apache.ode.jacob.Channel;
import org.apache.ode.jacob.Val;
/**
* Channel type for a cell. The channel allows reading of and setting the values of a cell.
*/
-public interface Cell extends ChannelType {
+public interface Cell extends Channel {
/**
* Read the value of the cell.
Modified: ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStream.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStream.java?rev=1434033&r1=1434032&r2=1434033&view=diff
==============================================================================
--- ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStream.java (original)
+++ ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStream.java Wed Jan 16 16:52:37 2013
@@ -19,7 +19,7 @@
package org.apache.ode.jacob.examples.eratosthenes;
-import org.apache.ode.jacob.ChannelType;
+import org.apache.ode.jacob.Channel;
import org.apache.ode.jacob.SynchChannel;
/**
@@ -29,7 +29,7 @@ import org.apache.ode.jacob.SynchChannel
* @jacob.kind
* @author Maciej Szefler <a href="mailto:mbs@fivesight.com">mbs</a>
*/
-public interface NaturalNumberStream extends ChannelType {
+public interface NaturalNumberStream extends Channel {
public void val(int n, SynchChannel ret);
Modified: ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrint.java
URL: http://svn.apache.org/viewvc/ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrint.java?rev=1434033&r1=1434032&r2=1434033&view=diff
==============================================================================
--- ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrint.java (original)
+++ ode/trunk/jacob/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrint.java Wed Jan 16 16:52:37 2013
@@ -18,7 +18,7 @@
*/
package org.apache.ode.jacob.examples.synch;
-import org.apache.ode.jacob.ChannelType;
+import org.apache.ode.jacob.Channel;
import org.apache.ode.jacob.SynchChannel;
/**
@@ -27,7 +27,7 @@ import org.apache.ode.jacob.SynchChannel
*
* @author Maciej Szefler <a href="mailto:mbs@fivesight.com">mbs</a>
*/
-public interface SynchPrint extends ChannelType {
+public interface SynchPrint extends Channel {
public SynchChannel print(String msg);
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=1434033&r1=1434032&r2=1434033&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:52:37 2013
@@ -23,7 +23,7 @@ import java.lang.reflect.Method;
import java.lang.reflect.Proxy;
import org.apache.ode.jacob.ExportableChannel;
-import org.apache.ode.jacob.ChannelType;
+import org.apache.ode.jacob.Channel;
import org.apache.ode.jacob.ProcessUtil;
import junit.framework.TestCase;
@@ -106,7 +106,7 @@ public class ProxyConstructorTimingTest
});
}
- public interface Greeter extends ChannelType {
+ public interface Greeter extends Channel {
String hello(String name);
}