This is an automated email from the ASF dual-hosted git repository.

reta pushed a change to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git


    from c980047209 Update Zipkin Brave to 2.24.1
     new 40f09e6a0d CXF-8606: Introduce HTTP/2 Transport: client-side support 
(#1017)
     new d75ff08d85 Recording .gitmergeinfo Changes

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .gitmergeinfo                                      |   2 +
 .../http/asyncclient/hc5/AsyncHTTPConduit.java     |  16 +
 .../asyncclient/hc5/AsyncHTTPConduitFactory.java   |  10 +-
 rt/transports/http-netty/netty-client/pom.xml      |   6 +
 .../client/NettyHttpClientPipelineFactory.java     | 201 +++++++++-
 .../http/netty/client/NettyHttpClientRequest.java  |  15 +-
 .../http/netty/client/NettyHttpConduit.java        |  45 ++-
 .../org/apache/cxf/transport/http/HTTPConduit.java |   1 -
 .../src/main/resources/schemas/wsdl/http-conf.xsd  |   8 +
 systests/transport-hc5/pom.xml                     |  16 +
 .../AbstractApacheClientServerHttp2Test.java}      | 109 +++---
 .../hc5/http2}/AbstractBookServerHttp2.java        |   2 +-
 .../hc5/http2/ApacheClientServerHttp2Test.java}    |   4 +-
 .../hc5/http2/ApacheClientServerHttp2cTest.java}   |   4 +-
 .../org/apache/cxf/systest/hc5/http2}/Book.java    |   2 +-
 .../cxf/systest/hc5/http2}/BookServerHttp2.java    |   4 +-
 .../cxf/systest/hc5/http2}/BookServerHttp2c.java   |   4 +-
 .../apache/cxf/systest/hc5/http2}/BookStore.java   |   3 +-
 .../apache/cxf/systest/hc5/http2}/server-tls.xml   |   2 +-
 .../org/apache/cxf/systest/hc5/http2}/server.xml   |   2 +-
 systests/transport-netty/pom.xml                   |   5 +
 .../netty/AbstractNettyClientServerHttp2Test.java  |  87 ++---
 .../cxf/systest/http2/netty/Http2TestClient.java   | 405 ---------------------
 23 files changed, 417 insertions(+), 536 deletions(-)
 copy 
systests/{transport-netty/src/test/java/org/apache/cxf/systest/http2/netty/AbstractNettyClientServerHttp2Test.java
 => 
transport-hc5/src/test/java/org/apache/cxf/systest/hc5/http2/AbstractApacheClientServerHttp2Test.java}
 (57%)
 copy 
systests/{transport-netty/src/test/java/org/apache/cxf/systest/http2/netty => 
transport-hc5/src/test/java/org/apache/cxf/systest/hc5/http2}/AbstractBookServerHttp2.java
 (98%)
 copy 
systests/{transports/src/test/java/org/apache/cxf/systest/http2_jetty/JettyClientServerHttp2Test.java
 => 
transport-hc5/src/test/java/org/apache/cxf/systest/hc5/http2/ApacheClientServerHttp2Test.java}
 (91%)
 copy 
systests/{transports/src/test/java/org/apache/cxf/systest/http2_jetty/JettyClientServerHttp2cTest.java
 => 
transport-hc5/src/test/java/org/apache/cxf/systest/hc5/http2/ApacheClientServerHttp2cTest.java}
 (91%)
 copy systests/{transports/src/test/java/org/apache/cxf/systest/http2_jetty => 
transport-hc5/src/test/java/org/apache/cxf/systest/hc5/http2}/Book.java (97%)
 copy 
systests/{transport-netty/src/test/java/org/apache/cxf/systest/http2/netty => 
transport-hc5/src/test/java/org/apache/cxf/systest/hc5/http2}/BookServerHttp2.java
 (91%)
 copy systests/{transports/src/test/java/org/apache/cxf/systest/http2_jetty => 
transport-hc5/src/test/java/org/apache/cxf/systest/hc5/http2}/BookServerHttp2c.java
 (91%)
 copy systests/{transports/src/test/java/org/apache/cxf/systest/http2_jetty => 
transport-hc5/src/test/java/org/apache/cxf/systest/hc5/http2}/BookStore.java 
(98%)
 copy 
systests/{transports/src/test/resources/org/apache/cxf/systest/http2_jetty => 
transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/http2}/server-tls.xml
 (97%)
 copy 
systests/{transports/src/test/resources/org/apache/cxf/systest/http2_jetty => 
transport-hc5/src/test/resources/org/apache/cxf/systest/hc5/http2}/server.xml 
(96%)
 delete mode 100644 
systests/transport-netty/src/test/java/org/apache/cxf/systest/http2/netty/Http2TestClient.java

Reply via email to