Merge branch 'master' into cjansen-cpp-client
Project: http://git-wip-us.apache.org/repos/asf/qpid-proton/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-proton/commit/6498cf6d Tree: http://git-wip-us.apache.org/repos/asf/qpid-proton/tree/6498cf6d Diff: http://git-wip-us.apache.org/repos/asf/qpid-proton/diff/6498cf6d Branch: refs/heads/cjansen-cpp-client Commit: 6498cf6d0836c80fe9fe0164f14f51f5338b5513 Parents: 377fd55 246007f Author: Alan Conway <[email protected]> Authored: Thu Jul 9 18:06:04 2015 -0400 Committer: Alan Conway <[email protected]> Committed: Thu Jul 9 18:06:04 2015 -0400 ---------------------------------------------------------------------- .travis.yml | 15 +- DEVELOPERS.md | 26 + bin/jenkins-proton-c-build.sh | 17 + examples/java/reactor/.gitignore | 1 + examples/java/reactor/README.md | 55 ++ examples/java/reactor/pom.xml | 41 ++ examples/java/reactor/run | 4 + .../apache/qpid/proton/example/reactor/Cat.java | 99 +++ .../proton/example/reactor/CountRandomly.java | 105 ++++ .../qpid/proton/example/reactor/Counter.java | 84 +++ .../qpid/proton/example/reactor/Delegates.java | 68 +++ .../qpid/proton/example/reactor/Echo.java | 98 +++ .../example/reactor/EchoInputStreamWrapper.java | 76 +++ .../proton/example/reactor/GlobalLogger.java | 75 +++ .../proton/example/reactor/GoodbyeWorld.java | 60 ++ .../qpid/proton/example/reactor/HelloWorld.java | 59 ++ .../qpid/proton/example/reactor/README.md | 31 + .../proton/example/reactor/ReactorLogger.java | 69 +++ .../qpid/proton/example/reactor/Recv.java | 79 +++ .../qpid/proton/example/reactor/Scheduling.java | 71 +++ .../qpid/proton/example/reactor/Send.java | 142 +++++ .../qpid/proton/example/reactor/Unhandled.java | 46 ++ examples/python/abstract_server.py | 3 +- examples/python/client.py | 3 +- examples/python/client_http.py | 3 +- examples/python/db_common.py | 6 +- examples/python/db_ctrl.py | 7 +- examples/python/db_recv.py | 3 +- examples/python/db_send.py | 18 +- examples/python/direct_recv.py | 3 +- examples/python/direct_send.py | 3 +- examples/python/helloworld.py | 5 +- examples/python/helloworld_blocking.py | 5 +- examples/python/helloworld_direct.py | 5 +- examples/python/helloworld_direct_tornado.py | 5 +- examples/python/helloworld_tornado.py | 5 +- examples/python/messenger/async.py | 5 +- examples/python/messenger/client.py | 7 +- examples/python/messenger/recv.py | 7 +- examples/python/messenger/recv_async.py | 11 +- examples/python/messenger/send.py | 5 +- examples/python/messenger/send_async.py | 9 +- examples/python/messenger/server.py | 5 +- examples/python/proton_server.py | 3 +- examples/python/queue_browser.py | 3 +- examples/python/reactor/cat.py | 3 +- examples/python/reactor/count-randomly.py | 9 +- examples/python/reactor/counter.py | 7 +- examples/python/reactor/delegates.py | 5 +- examples/python/reactor/echo.py | 5 +- examples/python/reactor/global-logger.py | 9 +- examples/python/reactor/goodbye-world.py | 5 +- examples/python/reactor/handlers.py | 7 +- examples/python/reactor/hello-world.py | 3 +- examples/python/reactor/reactor-logger.py | 7 +- examples/python/reactor/recv.py | 3 +- examples/python/reactor/scheduling.py | 7 +- examples/python/reactor/tornado-hello-world.py | 3 +- examples/python/reactor/unhandled.py | 3 +- examples/python/recurring_timer.py | 5 +- examples/python/recurring_timer_tornado.py | 5 +- examples/python/selected_recv.py | 5 +- examples/python/server.py | 5 +- examples/python/server_direct.py | 7 +- examples/python/server_tx.py | 5 +- examples/python/simple_recv.py | 3 +- examples/python/simple_send.py | 3 +- examples/python/sync_client.py | 3 +- examples/python/test_examples.py | 55 +- examples/python/tx_recv.py | 3 +- examples/python/tx_recv_interactive.py | 11 +- examples/python/tx_send.py | 3 +- pom.xml | 5 +- proton-c/CMakeLists.txt | 23 +- proton-c/bindings/javascript/CMakeLists.txt | 1 + proton-c/bindings/python/CMakeLists.txt | 1 + proton-c/bindings/python/cproton.i | 116 +++- proton-c/bindings/python/proton/__init__.py | 127 ++-- proton-c/bindings/python/proton/_compat.py | 84 +++ proton-c/bindings/python/proton/handlers.py | 3 +- proton-c/bindings/python/proton/reactor.py | 32 +- proton-c/bindings/python/proton/utils.py | 14 +- proton-c/bindings/python/proton/wrapper.py | 12 +- proton-c/bindings/python/setup.py | 55 +- proton-c/bindings/python/setuputils/misc.py | 64 +- proton-c/bindings/python/tox.ini | 23 +- proton-c/bindings/ruby/lib/codec/data.rb | 16 +- proton-c/bindings/ruby/lib/core/message.rb | 6 +- proton-c/bindings/ruby/lib/core/url.rb | 2 +- .../bindings/ruby/lib/messenger/messenger.rb | 4 +- proton-c/bindings/ruby/lib/reactor/container.rb | 2 +- proton-c/bindings/ruby/lib/types/array.rb | 10 +- proton-c/bindings/ruby/lib/types/described.rb | 2 +- proton-c/bindings/ruby/lib/types/hash.rb | 4 +- proton-c/bindings/ruby/lib/util/wrapper.rb | 12 +- proton-c/bindings/ruby/ruby.i | 46 +- .../ruby/spec/qpid/proton/array_spec.rb | 4 +- .../bindings/ruby/spec/qpid/proton/data_spec.rb | 12 +- .../spec/qpid/proton/exception_handling_spec.rb | 2 +- .../bindings/ruby/spec/qpid/proton/hash_spec.rb | 2 +- .../ruby/spec/qpid/proton/message_spec.rb | 8 +- .../ruby/spec/qpid/proton/messenger_spec.rb | 8 +- proton-c/bindings/ruby/spec/spec_helper.rb | 10 +- proton-c/include/proton/reactor.h | 1 + proton-c/include/proton/session.h | 16 + proton-c/include/proton/ssl.h | 4 + proton-c/mllib/__init__.py | 40 +- proton-c/mllib/dom.py | 16 +- proton-c/mllib/parsers.py | 40 +- proton-c/mllib/transforms.py | 8 +- proton-c/src/codec/encodings.h.py | 17 +- proton-c/src/config.h | 8 +- proton-c/src/engine/engine-internal.h | 1 + proton-c/src/engine/engine.c | 21 + proton-c/src/messenger/messenger.c | 11 + proton-c/src/protocol.h.py | 91 +-- proton-c/src/reactor/timer.c | 25 +- proton-c/src/sasl/cyrus_sasl.c | 81 ++- proton-c/src/sasl/none_sasl.c | 20 + proton-c/src/sasl/sasl-internal.h | 23 +- proton-c/src/sasl/sasl.c | 494 ++++++++------- proton-c/src/ssl/PLATFORM_NOTES.md | 82 +++ proton-c/src/tests/reactor.c | 15 + proton-c/src/transport/transport.c | 86 ++- proton-c/src/windows/io.c | 1 - proton-c/src/windows/iocp.c | 1 - proton-c/src/windows/selector.c | 1 - proton-c/src/windows/write_pipeline.c | 1 - proton-j/CMakeLists.txt | 2 +- .../java/org/apache/qpid/proton/Proton.java | 20 +- .../apache/qpid/proton/engine/BaseHandler.java | 45 ++ .../apache/qpid/proton/engine/Collector.java | 1 + .../apache/qpid/proton/engine/Connection.java | 9 +- .../org/apache/qpid/proton/engine/Delivery.java | 2 +- .../org/apache/qpid/proton/engine/Endpoint.java | 3 +- .../org/apache/qpid/proton/engine/Event.java | 14 +- .../apache/qpid/proton/engine/Extendable.java | 34 ++ .../org/apache/qpid/proton/engine/Handler.java | 18 + .../qpid/proton/engine/HandlerException.java | 39 ++ .../org/apache/qpid/proton/engine/Link.java | 3 +- .../org/apache/qpid/proton/engine/Record.java | 36 ++ .../org/apache/qpid/proton/engine/Session.java | 8 + .../qpid/proton/engine/impl/CollectorImpl.java | 10 +- .../qpid/proton/engine/impl/ConnectionImpl.java | 32 +- .../qpid/proton/engine/impl/DeliveryImpl.java | 7 + .../qpid/proton/engine/impl/EndpointImpl.java | 7 + .../qpid/proton/engine/impl/EventImpl.java | 296 ++++++--- .../impl/HandshakeSniffingTransportWrapper.java | 182 ++++++ .../qpid/proton/engine/impl/LinkImpl.java | 28 +- .../qpid/proton/engine/impl/RecordImpl.java | 54 ++ .../qpid/proton/engine/impl/SaslImpl.java | 16 +- .../qpid/proton/engine/impl/SaslSniffer.java | 53 ++ .../qpid/proton/engine/impl/SessionImpl.java | 30 +- .../qpid/proton/engine/impl/TransportImpl.java | 57 +- .../proton/engine/impl/TransportSession.java | 21 +- .../SslHandshakeSniffingTransportWrapper.java | 170 +----- .../qpid/proton/message/impl/MessageImpl.java | 20 + .../apache/qpid/proton/reactor/Acceptor.java | 39 ++ .../qpid/proton/reactor/FlowController.java | 76 +++ .../apache/qpid/proton/reactor/Handshaker.java | 79 +++ .../org/apache/qpid/proton/reactor/Reactor.java | 280 +++++++++ .../qpid/proton/reactor/ReactorChild.java | 31 + .../apache/qpid/proton/reactor/Selectable.java | 221 +++++++ .../apache/qpid/proton/reactor/Selector.java | 111 ++++ .../org/apache/qpid/proton/reactor/Task.java | 50 ++ .../qpid/proton/reactor/impl/AcceptorImpl.java | 132 ++++ .../org/apache/qpid/proton/reactor/impl/IO.java | 44 ++ .../qpid/proton/reactor/impl/IOHandler.java | 347 +++++++++++ .../apache/qpid/proton/reactor/impl/IOImpl.java | 52 ++ .../qpid/proton/reactor/impl/ReactorImpl.java | 434 ++++++++++++++ .../reactor/impl/ReactorInternalException.java | 44 ++ .../proton/reactor/impl/SelectableImpl.java | 246 ++++++++ .../qpid/proton/reactor/impl/SelectorImpl.java | 209 +++++++ .../qpid/proton/reactor/impl/TaskImpl.java | 85 +++ .../apache/qpid/proton/reactor/impl/Timer.java | 83 +++ proton-j/src/main/resources/ccodec.py | 2 +- proton-j/src/main/resources/cengine.py | 57 +- proton-j/src/main/resources/chandlers.py | 21 +- proton-j/src/main/resources/cmessage.py | 5 +- proton-j/src/main/resources/cobject.py | 36 +- proton-j/src/main/resources/compat.py | 8 + proton-j/src/main/resources/cproton.py | 1 + proton-j/src/main/resources/creactor.py | 75 ++- proton-j/src/main/resources/csasl.py | 4 +- proton-j/src/main/resources/ctypes.py | 21 + .../apache/qpid/proton/reactor/ReactorTest.java | 596 +++++++++++++++++++ .../proton/reactor/impl/AcceptorImplTest.java | 87 +++ .../proton/reactor/impl/LeakTestReactor.java | 118 ++++ .../java/org/apache/qpid/proton/JythonTest.java | 14 + .../org/apache/qpid/proton/ProtonJInterop.java | 203 +++++++ tests/java/pythonTests.ignore | 1 + tests/pom.xml | 1 + tests/python/proton-test | 32 +- tests/python/proton_tests/__init__.py | 1 + tests/python/proton_tests/codec.py | 32 +- tests/python/proton_tests/common.py | 35 +- tests/python/proton_tests/engine.py | 194 +++--- tests/python/proton_tests/interop.py | 8 +- tests/python/proton_tests/message.py | 9 +- tests/python/proton_tests/messenger.py | 15 +- tests/python/proton_tests/reactor.py | 80 ++- tests/python/proton_tests/reactor_interop.py | 164 +++++ tests/python/proton_tests/sasl.py | 39 +- tests/python/proton_tests/soak.py | 3 +- tests/python/proton_tests/ssl.py | 56 +- tests/python/proton_tests/transport.py | 66 +- tests/python/proton_tests/url.py | 3 +- tests/python/proton_tests/utils.py | 2 +- tests/ruby/proton_tests/interop.rb | 62 +- tests/ruby/proton_tests/smoke.rb | 2 +- tests/smoke/recv.py | 3 +- tests/smoke/send.py | 5 +- tests/tools/apps/python/msgr-recv.py | 6 + tests/tools/apps/python/msgr-send.py | 6 + tests/tools/soak-check | 5 +- 215 files changed, 8050 insertions(+), 1261 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-proton/blob/6498cf6d/proton-c/CMakeLists.txt ---------------------------------------------------------------------- --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
