tree f53eb76bbdbf2a8fb5204f6c595ef6eed3e44944
parent d1f19b86e70f5090e3bcd029567e7912d032d726
parent 140518696fe9b339ab1194553768ffa1c98517ee
author philharveyonline <philharveyonline@unknown> 1359717089 +0000
committer philharveyonline <philharveyonline@unknown> 1359717089 +0000

NO-JIRA: Merged latest from trunk to this branch jni-binding with commands:

$ svn merge https://svn.apache.org/repos/asf/qpid/proton/trunk .                                                                                            
--- Merging r1441000 through r1441381 into '.':
U    proton-j/proton/src/main/java/org/apache/qpid/proton/engine/impl/DeliveryImpl.java
U    proton-j/proton/src/main/java/org/apache/qpid/proton/messenger/impl/MessengerImpl.java
U    proton-j/proton/src/main/java/org/apache/qpid/proton/driver/impl/ConnectorImpl.java
   C proton-j/proton/src/main/scripts
U    proton-j/proton-api/src/main/java/org/apache/qpid/proton/engine/Delivery.java
--- Recording mergeinfo for merge of r1421251 through r1441381 into '.':
 U   .
Summary of conflicts:
  Tree conflicts: 1

$ svn merge -c 1441176 https://svn.apache.org/repos/asf/qpid/proton/trunk/proton-j/proton/src/main/scripts/proton.py ./proton-j/proton-api/src/main/resources/proton.py
--- Merging r1441176 into 'proton-j/proton-api/src/main/resources/proton.py':
U    proton-j/proton-api/src/main/resources/proton.py
--- Recording mergeinfo for merge of r1441176 into 'proton-j/proton-api/src/main/resources/proton.py':
 U   proton-j/proton-api/src/main/resources/proton.py


To resolve conflicts, we had to add JNIDelivery.isPartial(), use MessengerFactory in Java proton.py, and catch ProtonUnsupportedOperation in Messenger test.


git-svn-id: https://svn.apache.org/repos/asf/qpid/proton/branches/jni-binding@1441385 13f79535-47bb-0310-9956-ffa450edef68