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/04/16 22:49:58 UTC

[1/2] git commit: Fix minor build issue

Updated Branches:
  refs/heads/master 814217258 -> 0adeaf11d


Fix minor build issue


Project: http://git-wip-us.apache.org/repos/asf/ode-jacob/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode-jacob/commit/6b8d1991
Tree: http://git-wip-us.apache.org/repos/asf/ode-jacob/tree/6b8d1991
Diff: http://git-wip-us.apache.org/repos/asf/ode-jacob/diff/6b8d1991

Branch: refs/heads/master
Commit: 6b8d19916b54846cca54aec2004d01733740cec8
Parents: 0f02193
Author: Hadrian Zbarcea <hz...@gmail.com>
Authored: Tue Apr 16 16:49:15 2013 -0400
Committer: Hadrian Zbarcea <hz...@gmail.com>
Committed: Tue Apr 16 16:49:15 2013 -0400

----------------------------------------------------------------------
 .../ode/jacob/examples/cell/JacobCellTest.java     |    5 ++---
 .../ode/jacob/examples/helloworld/HelloWorld.java  |    1 -
 .../ode/jacob/vpu/ProxyConstructorTimingTest.java  |    7 +++----
 3 files changed, 5 insertions(+), 8 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ode-jacob/blob/6b8d1991/src/test/java/org/apache/ode/jacob/examples/cell/JacobCellTest.java
----------------------------------------------------------------------
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 0f9d171..519394f 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,19 +18,18 @@
  */
 package org.apache.ode.jacob.examples.cell;
 
+import static org.apache.ode.jacob.ProcessUtil.receive;
+
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 
 import junit.framework.TestCase;
 
 import org.apache.ode.jacob.JacobRunnable;
-import org.apache.ode.jacob.ReceiveProcess;
 import org.apache.ode.jacob.Val;
 import org.apache.ode.jacob.vpu.ExecutionQueueImpl;
 import org.apache.ode.jacob.vpu.JacobVPU;
 
-import static org.apache.ode.jacob.ProcessUtil.receive;
-
 
 public class JacobCellTest extends TestCase {
   private static Object _val;

http://git-wip-us.apache.org/repos/asf/ode-jacob/blob/6b8d1991/src/test/java/org/apache/ode/jacob/examples/helloworld/HelloWorld.java
----------------------------------------------------------------------
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 5fb0b70..524d350 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
@@ -91,7 +91,6 @@ public class HelloWorld extends JacobRunnable {
                 this.str = str;
             }
 
-            @Override
             public void ret() {
                 System.out.println(str + " ACKed");
             }

http://git-wip-us.apache.org/repos/asf/ode-jacob/blob/6b8d1991/src/test/java/org/apache/ode/jacob/vpu/ProxyConstructorTimingTest.java
----------------------------------------------------------------------
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 110baf9..8948306 100644
--- a/src/test/java/org/apache/ode/jacob/vpu/ProxyConstructorTimingTest.java
+++ b/src/test/java/org/apache/ode/jacob/vpu/ProxyConstructorTimingTest.java
@@ -22,12 +22,11 @@ import java.lang.reflect.InvocationHandler;
 import java.lang.reflect.Method;
 import java.lang.reflect.Proxy;
 
-import org.apache.ode.jacob.ChannelProxy;
-import org.apache.ode.jacob.Channel;
-import org.apache.ode.jacob.ProcessUtil;
-
 import junit.framework.TestCase;
 
+import org.apache.ode.jacob.Channel;
+import org.apache.ode.jacob.ChannelProxy;
+
 
 public class ProxyConstructorTimingTest extends TestCase {
     private static final long COUNT = 1000000L;


[2/2] git commit: Merge branch 'master' of http://git-wip-us.apache.org/repos/asf/ode-jacob

Posted by ha...@apache.org.
Merge branch 'master' of http://git-wip-us.apache.org/repos/asf/ode-jacob


Project: http://git-wip-us.apache.org/repos/asf/ode-jacob/repo
Commit: http://git-wip-us.apache.org/repos/asf/ode-jacob/commit/0adeaf11
Tree: http://git-wip-us.apache.org/repos/asf/ode-jacob/tree/0adeaf11
Diff: http://git-wip-us.apache.org/repos/asf/ode-jacob/diff/0adeaf11

Branch: refs/heads/master
Commit: 0adeaf11d3b0cb5c25bbe49d8489f81dbdfbba20
Parents: 6b8d199 8142172
Author: Hadrian Zbarcea <hz...@gmail.com>
Authored: Tue Apr 16 16:49:36 2013 -0400
Committer: Hadrian Zbarcea <hz...@gmail.com>
Committed: Tue Apr 16 16:49:36 2013 -0400

----------------------------------------------------------------------

----------------------------------------------------------------------