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

[vanto]

Updated Branches:
  refs/heads/master 548020cbd -> 05e07f7bd


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

Conflicts:
        src/test/java/org/apache/ode/jacob/examples/helloworld/HelloWorld.java


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

Branch: refs/heads/master
Commit: 05e07f7bd181710729940cb26ed65b36fdf7c328
Parents: 4513f0c 548020c
Author: Tammo van Lessen <tvanles...@gmail.com>
Authored: Mon Mar 4 20:43:32 2013 +0100
Committer: Tammo van Lessen <tvanles...@gmail.com>
Committed: Mon Mar 4 20:43:32 2013 +0100

----------------------------------------------------------------------
 .gitignore                                         |    1 +
 pom.xml                                            |    3 ++-
 .../soup/jackson/JacobTypeResolverBuilder.java     |    4 ----
 .../apache/ode/jacob/vpu/ExecutionQueueImpl.java   |    3 ---
 .../ode/jacob/examples/helloworld/HelloWorld.java  |    4 +---
 .../ode/jacob/examples/synch/SynchPrinter.java     |    1 -
 .../ode/jacob/vpu/ProxyConstructorTimingTest.java  |    3 ---
 7 files changed, 4 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/ode-jacob/blob/05e07f7b/src/test/java/org/apache/ode/jacob/examples/helloworld/HelloWorld.java
----------------------------------------------------------------------
diff --cc src/test/java/org/apache/ode/jacob/examples/helloworld/HelloWorld.java
index 1b1e565,84708dd..746f374
--- a/src/test/java/org/apache/ode/jacob/examples/helloworld/HelloWorld.java
+++ b/src/test/java/org/apache/ode/jacob/examples/helloworld/HelloWorld.java
@@@ -54,16 -54,14 +54,15 @@@ public class HelloWorld extends JacobRu
          }
  
          public void run() {
 -            object(true, new ReceiveProcess() {
 -                private static final long serialVersionUID = 1L;
 -            }.setChannel(in).setReceiver(new Callback<String, Synch>(){
 -                public void invoke(String value, Synch callback) {
 -                    System.out.println(value);
 -                    callback.ret();
 -                }
 -            }));
 +            object(true, new 
ReliablePrinterReceiveProcess().setChannel(in).setReceiver(new 
ReliablePrinterCallback()));
 +        }
 +
 +        static class ReliablePrinterReceiveProcess extends ReceiveProcess {}
 +        static class ReliablePrinterCallback implements Callback<String, 
Synch> {
-             @Override
 +            public void invoke(String value, Synch callback) {
 +                System.out.println(value);
 +                callback.ret();
 +            }
          }
      }
  
@@@ -251,7 -248,6 +249,7 @@@
          vpu.inject(new HelloWorld());
          while (vpu.execute()) {
              queue = loadAndRestoreQueue(mapper, queue);
-             //vpu.setContext(queue);
++            vpu.setContext(queue);
              System.out.println(vpu.isComplete() ? "<0>" : ".");
              //vpu.dumpState();
          }