Google Git
Sign in
apache/ode-jacob/f01f92b2ec5ef7d8d0f249d14cb4ecfb6bcaf588^!/.
commit
f01f92b2ec5ef7d8d0f249d14cb4ecfb6bcaf588
[log]
author
Hadrian Zbarcea <hzbarcea@gmail.com>
Thu Jul 25 20:12:08 2013 -0400
committer
Hadrian Zbarcea <hzbarcea@gmail.com>
Thu Jul 25 20:12:08 2013 -0400
tree
a5143ac6d445ef9b72894c453548a925075dbb67
parent
a5c5ae75c1949f00ac5b7dd1e08307b7dae174d9 [diff]
Move classes related to OO mapping of pi calculus concepts to separate package

diff --git a/src/main/java/org/apache/ode/jacob/IndexedObject.java b/src/main/java/org/apache/ode/jacob/IndexedObject.java
index 6cd6be7..5d2edde 100644
--- a/src/main/java/org/apache/ode/jacob/IndexedObject.java
+++ b/src/main/java/org/apache/ode/jacob/IndexedObject.java

@@ -22,7 +22,7 @@
  * Interface implemented by JACOB objects that are to be indexed. Indexed objects have the nice feature that they
  * can be retrieved from the execution queue by their index key. This is handy for introspecting the state of
  * the execution queue. Note that indexed objects are made available so long as they are referenced in some way by
- * objects in the queue. The reference does not need to be direct; e.g. if a {@link org.apache.ode.jacob.ChannelListener}
+ * objects in the queue. The reference does not need to be direct; e.g. if a {@link org.apache.ode.jacob.oo.ChannelListener}
  * in the execution queue references an indexed object, that indexed object will be indexed.
  *
  * @author Maciej Szefler - m s z e f l e r @ g m a i l . c o m

diff --git a/src/main/java/org/apache/ode/jacob/JacobObject.java b/src/main/java/org/apache/ode/jacob/JacobObject.java
index c39d03a..bc0eb61 100644
--- a/src/main/java/org/apache/ode/jacob/JacobObject.java
+++ b/src/main/java/org/apache/ode/jacob/JacobObject.java

@@ -22,6 +22,8 @@
 import java.lang.reflect.Method;
 import java.util.Set;
 
+import org.apache.ode.jacob.oo.Channel;
+import org.apache.ode.jacob.oo.ChannelListener;
 import org.apache.ode.jacob.vpu.JacobVPU;
 
 /**

diff --git a/src/main/java/org/apache/ode/jacob/JacobThread.java b/src/main/java/org/apache/ode/jacob/JacobThread.java
index 4c06133..a33f5dc 100644
--- a/src/main/java/org/apache/ode/jacob/JacobThread.java
+++ b/src/main/java/org/apache/ode/jacob/JacobThread.java

@@ -20,6 +20,9 @@
 
 import java.lang.reflect.Method;
 
+import org.apache.ode.jacob.oo.Channel;
+import org.apache.ode.jacob.oo.ChannelListener;
+
 /**
  * Class exposing the JACOB operations.
  * <p>

diff --git a/src/main/java/org/apache/ode/jacob/ProcessUtil.java b/src/main/java/org/apache/ode/jacob/ProcessUtil.java
deleted file mode 100644
index d6f8691..0000000
--- a/src/main/java/org/apache/ode/jacob/ProcessUtil.java
+++ /dev/null

@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *    http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.ode.jacob;
-
-import org.apache.ode.jacob.vpu.JacobVPU;
-
-
-public final class ProcessUtil {
-    private ProcessUtil() {
-        // Utility class
-    }
-
-    public static String exportChannel(Channel channel) {
-    	if (channel != null && channel instanceof ChannelProxy) {
-            // TODO: replace the brute force call on the activeThread with
-            //  something that doesn't expose the implementation once the
-            //  cleaner refactored api becomes available
-            return JacobVPU.activeJacobThread().exportChannel(channel);
-    	}
-        throw new IllegalArgumentException("Invalid proxy type: "
-    	    + channel == null ? "<null>" : channel.getClass().toString());
-    }
-    
-    public static CompositeProcess compose(ReceiveProcess process) {
-        CompositeProcess result = new CompositeProcess();
-        return result.or(process);
-    }
-
-    @SuppressWarnings("serial")
-	public static <T extends Channel> ChannelListener receive(T proxy, T listener) {
-    	// TODO: NOTE: this *only* works when the listnere doesn't need to be Serialiazble really
-    	//  because we cannot declare a staic serialVersionUID like this
-    	//  once we fix serialization, this can be simplified significantly via a dsl
-    	return new ReceiveProcess() {}.setChannel(proxy).setReceiver(listener);
-    }
-}

diff --git a/src/main/java/org/apache/ode/jacob/Synch.java b/src/main/java/org/apache/ode/jacob/Synch.java
index c6a9f1d..4057e69 100644
--- a/src/main/java/org/apache/ode/jacob/Synch.java
+++ b/src/main/java/org/apache/ode/jacob/Synch.java

@@ -18,6 +18,8 @@
  */
 package org.apache.ode.jacob;
 
+import org.apache.ode.jacob.oo.Channel;
+
 
 /**
  * Synch represents a synchronous invocation callback notification.

diff --git a/src/main/java/org/apache/ode/jacob/Val.java b/src/main/java/org/apache/ode/jacob/Val.java
index 8d93d28..e541706 100644
--- a/src/main/java/org/apache/ode/jacob/Val.java
+++ b/src/main/java/org/apache/ode/jacob/Val.java

@@ -18,6 +18,8 @@
  */
 package org.apache.ode.jacob;
 
+import org.apache.ode.jacob.oo.Channel;
+
 
 /**
  * Generic return-value channel type.

diff --git a/src/main/java/org/apache/ode/jacob/Channel.java b/src/main/java/org/apache/ode/jacob/oo/Channel.java
similarity index 96%
rename from src/main/java/org/apache/ode/jacob/Channel.java
rename to src/main/java/org/apache/ode/jacob/oo/Channel.java
index 5b9211c..ac351e0 100644
--- a/src/main/java/org/apache/ode/jacob/Channel.java
+++ b/src/main/java/org/apache/ode/jacob/oo/Channel.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.ode.jacob;
+package org.apache.ode.jacob.oo;
 
 import java.io.Serializable;
 

diff --git a/src/main/java/org/apache/ode/jacob/ChannelListener.java b/src/main/java/org/apache/ode/jacob/oo/ChannelListener.java
similarity index 93%
rename from src/main/java/org/apache/ode/jacob/ChannelListener.java
rename to src/main/java/org/apache/ode/jacob/oo/ChannelListener.java
index b308981..a8df5f9 100644
--- a/src/main/java/org/apache/ode/jacob/ChannelListener.java
+++ b/src/main/java/org/apache/ode/jacob/oo/ChannelListener.java

@@ -16,9 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.ode.jacob;
+package org.apache.ode.jacob.oo;
 
 
+import org.apache.ode.jacob.JacobObject;
+
 
 /**
  * Base-class for method-list objects. Method-lists objects should extends this

diff --git a/src/main/java/org/apache/ode/jacob/ChannelProxy.java b/src/main/java/org/apache/ode/jacob/oo/ChannelProxy.java
similarity index 96%
rename from src/main/java/org/apache/ode/jacob/ChannelProxy.java
rename to src/main/java/org/apache/ode/jacob/oo/ChannelProxy.java
index 24e8a2b..6451168 100644
--- a/src/main/java/org/apache/ode/jacob/ChannelProxy.java
+++ b/src/main/java/org/apache/ode/jacob/oo/ChannelProxy.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.ode.jacob;
+package org.apache.ode.jacob.oo;
 
 
 /**

diff --git a/src/main/java/org/apache/ode/jacob/ClassUtil.java b/src/main/java/org/apache/ode/jacob/oo/ClassUtil.java
similarity index 97%
rename from src/main/java/org/apache/ode/jacob/ClassUtil.java
rename to src/main/java/org/apache/ode/jacob/oo/ClassUtil.java
index c08d2a2..992d123 100644
--- a/src/main/java/org/apache/ode/jacob/ClassUtil.java
+++ b/src/main/java/org/apache/ode/jacob/oo/ClassUtil.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.ode.jacob;
+package org.apache.ode.jacob.oo;
 
 import java.lang.reflect.Method;
 import java.util.Set;

diff --git a/src/main/java/org/apache/ode/jacob/CompositeProcess.java b/src/main/java/org/apache/ode/jacob/oo/CompositeProcess.java
similarity index 98%
rename from src/main/java/org/apache/ode/jacob/CompositeProcess.java
rename to src/main/java/org/apache/ode/jacob/oo/CompositeProcess.java
index 785fed0..4066854 100644
--- a/src/main/java/org/apache/ode/jacob/CompositeProcess.java
+++ b/src/main/java/org/apache/ode/jacob/oo/CompositeProcess.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.ode.jacob;
+package org.apache.ode.jacob.oo;
 
 import java.lang.reflect.Method;
 import java.util.Collections;

diff --git a/src/main/java/org/apache/ode/jacob/ReceiveProcess.java b/src/main/java/org/apache/ode/jacob/oo/ReceiveProcess.java
similarity index 98%
rename from src/main/java/org/apache/ode/jacob/ReceiveProcess.java
rename to src/main/java/org/apache/ode/jacob/oo/ReceiveProcess.java
index 70f9191..5dc0a05 100644
--- a/src/main/java/org/apache/ode/jacob/ReceiveProcess.java
+++ b/src/main/java/org/apache/ode/jacob/oo/ReceiveProcess.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.ode.jacob;
+package org.apache.ode.jacob.oo;
 
 import java.lang.reflect.Method;
 import java.util.Collections;
@@ -24,6 +24,7 @@
 import java.util.Set;
 
 
+
 @SuppressWarnings("serial")
 public abstract class ReceiveProcess extends ChannelListener {
     private transient Set<Method> _implementedMethods;

diff --git a/src/main/java/org/apache/ode/jacob/soup/CommRecv.java b/src/main/java/org/apache/ode/jacob/soup/CommRecv.java
index 4395fef..c8b5ac7 100644
--- a/src/main/java/org/apache/ode/jacob/soup/CommRecv.java
+++ b/src/main/java/org/apache/ode/jacob/soup/CommRecv.java

@@ -18,7 +18,7 @@
  */
 package org.apache.ode.jacob.soup;
 
-import org.apache.ode.jacob.ChannelListener;
+import org.apache.ode.jacob.oo.ChannelListener;
 
 /**
  * Persistent store representation of an object (i.e. channel read) waiting for

diff --git a/src/main/java/org/apache/ode/jacob/soup/jackson/ChannelProxyDeserializer.java b/src/main/java/org/apache/ode/jacob/soup/jackson/ChannelProxyDeserializer.java
index dc4b5f3..7c55998 100644
--- a/src/main/java/org/apache/ode/jacob/soup/jackson/ChannelProxyDeserializer.java
+++ b/src/main/java/org/apache/ode/jacob/soup/jackson/ChannelProxyDeserializer.java

@@ -20,7 +20,7 @@
 
 import java.io.IOException;
 
-import org.apache.ode.jacob.Channel;
+import org.apache.ode.jacob.oo.Channel;
 import org.apache.ode.jacob.soup.CommChannel;
 import org.apache.ode.jacob.vpu.ChannelFactory;
 

diff --git a/src/main/java/org/apache/ode/jacob/soup/jackson/ChannelProxySerializer.java b/src/main/java/org/apache/ode/jacob/soup/jackson/ChannelProxySerializer.java
index 133b189..c28ad23 100644
--- a/src/main/java/org/apache/ode/jacob/soup/jackson/ChannelProxySerializer.java
+++ b/src/main/java/org/apache/ode/jacob/soup/jackson/ChannelProxySerializer.java

@@ -22,8 +22,8 @@
 import java.util.LinkedHashSet;
 import java.util.Set;
 
-import org.apache.ode.jacob.Channel;
-import org.apache.ode.jacob.ChannelProxy;
+import org.apache.ode.jacob.oo.Channel;
+import org.apache.ode.jacob.oo.ChannelProxy;
 import org.apache.ode.jacob.soup.CommChannel;
 import org.apache.ode.jacob.vpu.ChannelFactory;
 

diff --git a/src/main/java/org/apache/ode/jacob/soup/jackson/JacobModule.java b/src/main/java/org/apache/ode/jacob/soup/jackson/JacobModule.java
index e71f26f..8ddf203 100644
--- a/src/main/java/org/apache/ode/jacob/soup/jackson/JacobModule.java
+++ b/src/main/java/org/apache/ode/jacob/soup/jackson/JacobModule.java

@@ -18,8 +18,8 @@
  */

 package org.apache.ode.jacob.soup.jackson;

 

-import org.apache.ode.jacob.Channel;

-import org.apache.ode.jacob.ChannelProxy;

+import org.apache.ode.jacob.oo.Channel;

+import org.apache.ode.jacob.oo.ChannelProxy;

 import org.apache.ode.jacob.soup.Continuation;

 import org.apache.ode.jacob.soup.jackson.JacksonExecutionQueueImpl.ExecutionQueueImplDeserializer;

 import org.apache.ode.jacob.soup.jackson.JacksonExecutionQueueImpl.ExecutionQueueImplSerializer;


diff --git a/src/main/java/org/apache/ode/jacob/soup/jackson/JacobTypeResolverBuilder.java b/src/main/java/org/apache/ode/jacob/soup/jackson/JacobTypeResolverBuilder.java
index c2b2181..66520eb 100644
--- a/src/main/java/org/apache/ode/jacob/soup/jackson/JacobTypeResolverBuilder.java
+++ b/src/main/java/org/apache/ode/jacob/soup/jackson/JacobTypeResolverBuilder.java

@@ -20,9 +20,9 @@
 
 import java.util.Collection;
 
-import org.apache.ode.jacob.Channel;
-import org.apache.ode.jacob.ChannelProxy;
 import org.apache.ode.jacob.JacobObject;
+import org.apache.ode.jacob.oo.Channel;
+import org.apache.ode.jacob.oo.ChannelProxy;
 import org.apache.ode.jacob.soup.CommChannel;
 import org.apache.ode.jacob.vpu.ChannelFactory;
 

diff --git a/src/main/java/org/apache/ode/jacob/vpu/ChannelFactory.java b/src/main/java/org/apache/ode/jacob/vpu/ChannelFactory.java
index a45822f..7fa9e00 100644
--- a/src/main/java/org/apache/ode/jacob/vpu/ChannelFactory.java
+++ b/src/main/java/org/apache/ode/jacob/vpu/ChannelFactory.java

@@ -22,8 +22,8 @@
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 
-import org.apache.ode.jacob.Channel;
-import org.apache.ode.jacob.ChannelProxy;
+import org.apache.ode.jacob.oo.Channel;
+import org.apache.ode.jacob.oo.ChannelProxy;
 import org.apache.ode.jacob.soup.CommChannel;
 
 public class ChannelFactory {

diff --git a/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java b/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java
index a6c0837..c9b24f5 100644
--- a/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java
+++ b/src/main/java/org/apache/ode/jacob/vpu/ExecutionQueueImpl.java

@@ -41,10 +41,10 @@
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
-import org.apache.ode.jacob.Channel;
-import org.apache.ode.jacob.ChannelListener;
 import org.apache.ode.jacob.IndexedObject;
 import org.apache.ode.jacob.JacobObject;
+import org.apache.ode.jacob.oo.Channel;
+import org.apache.ode.jacob.oo.ChannelListener;
 import org.apache.ode.jacob.soup.Comm;
 import org.apache.ode.jacob.soup.CommChannel;
 import org.apache.ode.jacob.soup.CommGroup;
@@ -685,7 +685,7 @@
                 throw new IllegalArgumentException("Cannot replace non Serializable instance of " + obj.getClass());
             }
 
-            if (obj instanceof org.apache.ode.jacob.ChannelProxy) {
+            if (obj instanceof org.apache.ode.jacob.oo.ChannelProxy) {
                 CommChannel commChannel = (CommChannel) ChannelFactory.getBackend((Channel)obj);
                 _serializedChannels.add(commChannel.getId());
                 return new ChannelRef(commChannel.getType(), (Integer) commChannel.getId());

diff --git a/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java b/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java
index 81c4992..423891b 100644
--- a/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java
+++ b/src/main/java/org/apache/ode/jacob/vpu/JacobVPU.java

@@ -24,14 +24,14 @@
 import java.util.Map;
 import java.util.Stack;
 
-import org.apache.ode.jacob.Channel;
-import org.apache.ode.jacob.ChannelListener;
-import org.apache.ode.jacob.CompositeProcess;
 import org.apache.ode.jacob.JacobObject;
 import org.apache.ode.jacob.JacobRunnable;
 import org.apache.ode.jacob.JacobThread;
-import org.apache.ode.jacob.ReceiveProcess;
 import org.apache.ode.jacob.Synch;
+import org.apache.ode.jacob.oo.Channel;
+import org.apache.ode.jacob.oo.ChannelListener;
+import org.apache.ode.jacob.oo.CompositeProcess;
+import org.apache.ode.jacob.oo.ReceiveProcess;
 import org.apache.ode.jacob.soup.CommChannel;
 import org.apache.ode.jacob.soup.CommGroup;
 import org.apache.ode.jacob.soup.CommRecv;

diff --git a/src/test/java/org/apache/ode/jacob/examples/cell/CELL_.java b/src/test/java/org/apache/ode/jacob/examples/cell/CELL_.java
index 0234370..d697f94 100644
--- a/src/test/java/org/apache/ode/jacob/examples/cell/CELL_.java
+++ b/src/test/java/org/apache/ode/jacob/examples/cell/CELL_.java

@@ -19,8 +19,8 @@
 package org.apache.ode.jacob.examples.cell;
 
 import org.apache.ode.jacob.JacobRunnable;
-import org.apache.ode.jacob.ReceiveProcess;
 import org.apache.ode.jacob.Val;
+import org.apache.ode.jacob.oo.ReceiveProcess;
 
 /**
  * Cell process template Java representation. This class is equivalent to the

diff --git a/src/test/java/org/apache/ode/jacob/examples/cell/Cell.java b/src/test/java/org/apache/ode/jacob/examples/cell/Cell.java
index 71568ae..38f86f3 100644
--- a/src/test/java/org/apache/ode/jacob/examples/cell/Cell.java
+++ b/src/test/java/org/apache/ode/jacob/examples/cell/Cell.java

@@ -19,8 +19,8 @@
 package org.apache.ode.jacob.examples.cell;
 
 
-import org.apache.ode.jacob.Channel;
 import org.apache.ode.jacob.Val;
+import org.apache.ode.jacob.oo.Channel;
 
 /**
  * Channel type for a cell. The channel allows reading of and setting the values of a cell.

diff --git a/src/test/java/org/apache/ode/jacob/examples/cell/JacobCellTest.java b/src/test/java/org/apache/ode/jacob/examples/cell/JacobCellTest.java
index 519394f..02d8000 100644
--- a/src/test/java/org/apache/ode/jacob/examples/cell/JacobCellTest.java
+++ b/src/test/java/org/apache/ode/jacob/examples/cell/JacobCellTest.java

@@ -18,7 +18,7 @@
  */
 package org.apache.ode.jacob.examples.cell;
 
-import static org.apache.ode.jacob.ProcessUtil.receive;
+import static org.apache.ode.jacob.oo.ProcessUtil.receive;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;

diff --git a/src/test/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStream.java b/src/test/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStream.java
index a32965e..e586a30 100644
--- a/src/test/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStream.java
+++ b/src/test/java/org/apache/ode/jacob/examples/eratosthenes/NaturalNumberStream.java

@@ -19,8 +19,8 @@
 package org.apache.ode.jacob.examples.eratosthenes;
 
 
-import org.apache.ode.jacob.Channel;
 import org.apache.ode.jacob.Synch;
+import org.apache.ode.jacob.oo.Channel;
 
 /**
  * DOCUMENTME.

diff --git a/src/test/java/org/apache/ode/jacob/examples/eratosthenes/Sieve.java b/src/test/java/org/apache/ode/jacob/examples/eratosthenes/Sieve.java
index fd4b083..5601d6d 100644
--- a/src/test/java/org/apache/ode/jacob/examples/eratosthenes/Sieve.java
+++ b/src/test/java/org/apache/ode/jacob/examples/eratosthenes/Sieve.java

@@ -19,8 +19,8 @@
 package org.apache.ode.jacob.examples.eratosthenes;
 
 import org.apache.ode.jacob.JacobRunnable;
-import org.apache.ode.jacob.ReceiveProcess;
 import org.apache.ode.jacob.Synch;
+import org.apache.ode.jacob.oo.ReceiveProcess;
 import org.apache.ode.jacob.vpu.ExecutionQueueImpl;
 import org.apache.ode.jacob.vpu.JacobVPU;
 

diff --git a/src/test/java/org/apache/ode/jacob/examples/helloworld/HelloWorld.java b/src/test/java/org/apache/ode/jacob/examples/helloworld/HelloWorld.java
index 3d21c4f..8ecfe31 100644
--- a/src/test/java/org/apache/ode/jacob/examples/helloworld/HelloWorld.java
+++ b/src/test/java/org/apache/ode/jacob/examples/helloworld/HelloWorld.java

@@ -18,12 +18,12 @@
  */
 package org.apache.ode.jacob.examples.helloworld;
 
-import org.apache.ode.jacob.Channel;
 import org.apache.ode.jacob.JacobRunnable;
-import org.apache.ode.jacob.ReceiveProcess;
 import org.apache.ode.jacob.Synch;
 import org.apache.ode.jacob.Val;
 import org.apache.ode.jacob.examples.sequence.Sequence;
+import org.apache.ode.jacob.oo.Channel;
+import org.apache.ode.jacob.oo.ReceiveProcess;
 import org.apache.ode.jacob.soup.jackson.JacksonExecutionQueueImpl;
 import org.apache.ode.jacob.soup.jackson.JacobModule;
 import org.apache.ode.jacob.vpu.JacobVPU;

diff --git a/src/test/java/org/apache/ode/jacob/examples/sequence/Sequence.java b/src/test/java/org/apache/ode/jacob/examples/sequence/Sequence.java
index 9921267..7cee53a 100644
--- a/src/test/java/org/apache/ode/jacob/examples/sequence/Sequence.java
+++ b/src/test/java/org/apache/ode/jacob/examples/sequence/Sequence.java

@@ -19,8 +19,8 @@
 package org.apache.ode.jacob.examples.sequence;
 
 import org.apache.ode.jacob.JacobRunnable;
-import org.apache.ode.jacob.ReceiveProcess;
 import org.apache.ode.jacob.Synch;
+import org.apache.ode.jacob.oo.ReceiveProcess;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

diff --git a/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrint.java b/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrint.java
index 2c38a43..2496fdf 100644
--- a/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrint.java
+++ b/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrint.java

@@ -18,8 +18,8 @@
  */
 package org.apache.ode.jacob.examples.synch;
 
-import org.apache.ode.jacob.Channel;
 import org.apache.ode.jacob.Synch;
+import org.apache.ode.jacob.oo.Channel;
 
 /**
  * DOCUMENTME.

diff --git a/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrinter.java b/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrinter.java
index 37c2183..fcf8242 100644
--- a/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrinter.java
+++ b/src/test/java/org/apache/ode/jacob/examples/synch/SynchPrinter.java

@@ -19,12 +19,12 @@
 package org.apache.ode.jacob.examples.synch;
 
 import org.apache.ode.jacob.JacobRunnable;
-import org.apache.ode.jacob.ReceiveProcess;
 import org.apache.ode.jacob.Synch;
+import org.apache.ode.jacob.oo.ReceiveProcess;
 import org.apache.ode.jacob.vpu.ExecutionQueueImpl;
 import org.apache.ode.jacob.vpu.JacobVPU;
 
-import static org.apache.ode.jacob.ProcessUtil.receive;
+import static org.apache.ode.jacob.oo.ProcessUtil.receive;
 
 /**
  * Example JACOB process illustrating the use of {@link SynchPrint}

diff --git a/src/test/java/org/apache/ode/jacob/vpu/ProxyConstructorTimingTest.java b/src/test/java/org/apache/ode/jacob/vpu/ProxyConstructorTimingTest.java
index 8948306..d1284dc 100644
--- a/src/test/java/org/apache/ode/jacob/vpu/ProxyConstructorTimingTest.java
+++ b/src/test/java/org/apache/ode/jacob/vpu/ProxyConstructorTimingTest.java

@@ -24,8 +24,8 @@
 
 import junit.framework.TestCase;
 
-import org.apache.ode.jacob.Channel;
-import org.apache.ode.jacob.ChannelProxy;
+import org.apache.ode.jacob.oo.Channel;
+import org.apache.ode.jacob.oo.ChannelProxy;
 
 
 public class ProxyConstructorTimingTest extends TestCase {