Keith and I have just merged the jni-binding branch to trunk. We've tested our changes using the Python test suite and by running the release.sh script. Nevertheless, this is quite a big commit so some perturbation of your work is possible.
Let us know if you have any questions. For your convenience, here is the commit message: ------------------------------------------------------------------------ r1441401 | philharveyonline | 2013-02-01 11:54:38 +0000 (Fri, 01 Feb 2013) | 12 lines PROTON-191, PROTON-192, PROTON-193, PROTON-194, PROTON-210: merged jni-binding branch to trunk, containing the following changes in descending order of impact: - PROTON-194: modified CMake and Maven build systems to operate from the top level. CMake now also builds Java. - PROTON-192: added JNI bindings for proton-c - PROTON-210: simplifications to release.sh because we now release a single tarball from the top level - PROTON-193: Add setPeerHostname/getPeerHostname to Proton Java API - PROTON-191: added API reconciliation tool in design/ folder to assist our harmonisation efforts. Merge command was: $ svn merge --reintegrate https://svn.apache.org/repos/asf/qpid/proton/branches/jni-binding Phil
