Repository: qpid-proton Updated Branches: refs/heads/master cd6eac857 -> 2f25cc0e8
fixed some colliding imports and added some misshing shim and java API bits Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/2f25cc0e Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/2f25cc0e Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/2f25cc0e Branch: refs/heads/master Commit: 2f25cc0e855b67acc277060a5f6c45f9c8ac5aaa Parents: cd6eac8 Author: Rafael Schloming <[email protected]> Authored: Tue Jan 27 11:09:55 2015 -0500 Committer: Rafael Schloming <[email protected]> Committed: Tue Jan 27 11:10:13 2015 -0500 ---------------------------------------------------------------------- .../org/apache/qpid/proton/engine/Connection.java | 2 ++ .../qpid/proton/engine/impl/ConnectionImpl.java | 6 ++++++ proton-j/src/main/resources/cengine.py | 16 +++++++++++----- proton-j/src/main/resources/csasl.py | 6 ++++++ 4 files changed, 25 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/2f25cc0e/proton-j/src/main/java/org/apache/qpid/proton/engine/Connection.java ---------------------------------------------------------------------- diff --git a/proton-j/src/main/java/org/apache/qpid/proton/engine/Connection.java b/proton-j/src/main/java/org/apache/qpid/proton/engine/Connection.java index e025356..5547a57 100644 --- a/proton-j/src/main/java/org/apache/qpid/proton/engine/Connection.java +++ b/proton-j/src/main/java/org/apache/qpid/proton/engine/Connection.java @@ -88,6 +88,8 @@ public interface Connection extends Endpoint public void setContainer(String container); + public String getContainer(); + public void setHostname(String hostname); public String getHostname(); http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/2f25cc0e/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java ---------------------------------------------------------------------- diff --git a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java index eb68f42..68907d5 100644 --- a/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java +++ b/proton-j/src/main/java/org/apache/qpid/proton/engine/impl/ConnectionImpl.java @@ -296,6 +296,12 @@ public class ConnectionImpl extends EndpointImpl implements ProtonJConnection } @Override + public String getContainer() + { + return _localContainerId; + } + + @Override public void setHostname(String hostname) { _localHostname = hostname; http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/2f25cc0e/proton-j/src/main/resources/cengine.py ---------------------------------------------------------------------- diff --git a/proton-j/src/main/resources/cengine.py b/proton-j/src/main/resources/cengine.py index c7b6a7f..ae49a22 100644 --- a/proton-j/src/main/resources/cengine.py +++ b/proton-j/src/main/resources/cengine.py @@ -25,7 +25,7 @@ from org.apache.qpid.proton.amqp.transaction import Coordinator from org.apache.qpid.proton.amqp.transport import ErrorCondition, \ SenderSettleMode, ReceiverSettleMode from org.apache.qpid.proton.engine import EndpointState, Sender, \ - Receiver, Transport, TransportException + Receiver, Transport as _Transport, TransportException from java.util import EnumSet from jarray import array, zeros @@ -72,10 +72,10 @@ PN_REJECTED = (0x0000000000000025) PN_RELEASED = (0x0000000000000026) PN_MODIFIED = (0x0000000000000027) -PN_TRACE_OFF = Transport.TRACE_OFF -PN_TRACE_RAW = Transport.TRACE_RAW -PN_TRACE_FRM = Transport.TRACE_FRM -PN_TRACE_DRV = Transport.TRACE_DRV +PN_TRACE_OFF = _Transport.TRACE_OFF +PN_TRACE_RAW = _Transport.TRACE_RAW +PN_TRACE_FRM = _Transport.TRACE_FRM +PN_TRACE_DRV = _Transport.TRACE_DRV def wrap(obj, wrapper): if obj: @@ -220,6 +220,9 @@ def pn_connection_attachments(conn): def pn_connection_set_container(conn, name): conn.impl.setContainer(name) +def pn_connection_get_container(conn): + return conn.impl.getContainer() + def pn_connection_remote_container(conn): return conn.impl.getRemoteContainer() @@ -892,6 +895,9 @@ def pn_transport_get_channel_max(trans): def pn_transport_remote_channel_max(trans): return trans.impl.getRemoteChannelMax() +def pn_transport_tick(trans, now): + return 0 + def pn_transport_bind(trans, conn): trans.impl.bind(conn.impl) return 0 http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/2f25cc0e/proton-j/src/main/resources/csasl.py ---------------------------------------------------------------------- diff --git a/proton-j/src/main/resources/csasl.py b/proton-j/src/main/resources/csasl.py index fe184d8..93df589 100644 --- a/proton-j/src/main/resources/csasl.py +++ b/proton-j/src/main/resources/csasl.py @@ -72,6 +72,12 @@ SASL_OUTCOMES_J2P = { Sasl.PN_SASL_SKIPPED: PN_SASL_SKIPPED } +def pn_sasl_client(sasl): + sasl.client() + +def pn_sasl_server(sasl): + sasl.server() + def pn_sasl_state(sasl): return SASL_STATES[sasl.getState()] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
