(cxf) branch CXF-9008 updated (ce34603c27 -> c3a75c76ca)
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a change to branch CXF-9008
in repository https://gitbox.apache.org/repos/asf/cxf.git
discard ce34603c27 fips support
add ed2850d40b Update Spring Framework to 6.1.7
add 3896935619 Bump com.sun.xml.messaging.saaj:saaj-impl from 3.0.3 to
3.0.4 (#1878)
add 4be33dce0c Bump jakarta.xml.ws:jakarta.xml.ws-api from 4.0.1 to 4.0.2
(#1879)
add b8dca12d7a Bump org.graalvm.buildtools:native-maven-plugin from 0.10.1
to 0.10.2 (#1883)
add ffd1a3aed2 Bump org.codehaus.mojo:build-helper-maven-plugin from 3.5.0
to 3.6.0 (#1882)
add a3b103fc80 Bump actions/checkout from 4.1.5 to 4.1.6 (#1880)
add b660f71147 Bump github/codeql-action from 2.13.4 to 3.25.5 (#1881)
add dfe8bc122f --- (#1884)
add eea3c9b041 --- (#1885)
add 7f33a57480 --- (#1886)
add aa3787b4ef --- (#1887)
add a9933e7d71 Update cxf-xjc-utils to 4.1.0-SNAPSHOT
add 09e158b832 Update Wiremock to 3.6.0
add d77fd08202 Update Spring Framework to 6.1.8
add eed8283b79 Bump cxf.netty.version from 4.1.109.Final to 4.1.110.Final
(#1888)
add 9e49950993 Update Spring Boot to 3.3.0
add 2b500aab12 Bump org.eclipse.persistence:org.eclipse.persistence.moxy
(#1892)
add 6ad50d5efb [CXF-9019] Jaxws spi unit test coverage enhancement. (#1890)
add 7dcafef996 Remove h from ESCAPED_CHARS in JsonMapObjectReaderWriter
(#1872)
new c3a75c76ca fips support
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (ce34603c27)
\
N -- N -- N refs/heads/CXF-9008 (c3a75c76ca)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 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:
.github/workflows/codeql-analysis.yml | 6 +-
.github/workflows/pull-request-build.yml | 2 +-
.github/workflows/scorecards.yml | 4 +-
.../main/release/samples/corba/hello_world/pom.xml | 2 +-
.../release/samples/jax_rs/graalvm_basic/pom.xml | 4 +-
.../src/main/release/samples/jaxws_graalvm/pom.xml | 4 +-
.../samples/jaxws_graalvm_dynamic/client/pom.xml | 2 +-
.../samples/jaxws_graalvm_dynamic/server/pom.xml | 2 +-
distribution/src/main/release/samples/pom.xml | 6 +-
parent/pom.xml | 20 +-
pom.xml| 4 +-
.../org/apache/cxf/jaxws/spi/ProviderImplTest.java | 243 -
.../WrapperClassCreatorProxyServiceTest.java} | 56 +++--
.../cxf/jaxws/spi/WrapperClassLoaderTest.java | 162 ++
.../json/basic/JsonMapObjectReaderWriter.java | 2 +-
.../security/jose/jwejws/JAXRSJweJwsTest.java | 26 ++-
.../security/jose/jwejws/JweJwsAlgorithmTest.java | 26 +--
.../jaxrs/security/alice.jwk.oaep.properties | 22 --
.../jaxrs/security/certs/jwkPrivateSet-oaep.txt| 43
.../jose/jwejws/algorithms-server-fips.xml | 13 --
.../ws/algsuite/StaxAlgorithmSuiteTest.java| 13 +-
.../org/apache/cxf/systest/ws/gcm/MGFServer.java | 2 +-
.../systest/ws/security/SecurityPolicyTest.java| 8 +-
23 files changed, 508 insertions(+), 164 deletions(-)
copy
rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/{AbstractJaxWsTest.java =>
spi/WrapperClassCreatorProxyServiceTest.java} (67%)
create mode 100644
rt/frontend/jaxws/src/test/java/org/apache/cxf/jaxws/spi/WrapperClassLoaderTest.java
delete mode 100644
systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/alice.jwk.oaep.properties
delete mode 100644
systests/rs-security/src/test/resources/org/apache/cxf/systest/jaxrs/security/certs/jwkPrivateSet-oaep.txt
(cxf) branch CXF-9008 updated (bdf7b02c2b -> ce34603c27)
This is an automated email from the ASF dual-hosted git repository. ffang pushed a change to branch CXF-9008 in repository https://gitbox.apache.org/repos/asf/cxf.git discard bdf7b02c2b fips support add f383915d51 CXF-9013: Move performance benchmark to distribution samples folder (#1867) add cc06da466d Bump io.swagger.core.v3:swagger-jaxrs2-jakarta from 2.2.21 to 2.2.22 (#1877) add e864b59e95 Bump org.owasp:dependency-check-maven from 9.1.0 to 9.2.0 (#1876) add 62495cd141 [CXF-9014]1024-bit RSA key (weak) and isn't allowed in modern JDK versions(SignatureWhitespaceTest failure) (#1875) new ce34603c27 fips support This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (bdf7b02c2b) \ N -- N -- N refs/heads/CXF-9008 (ce34603c27) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 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: .../main/release/samples}/performance/README.txt | 0 .../release/samples}/performance/base/build.xml| 0 .../main/release/samples}/performance/base/pom.xml | 21 +- .../org/apache/cxf/pat/internal/TestCaseBase.java | 35 ++- .../org/apache/cxf/pat/internal/TestResult.java| 0 .../org/apache/cxf/pat/internal/TestRunner.java| 0 .../samples}/performance/basic_type/bin/run_client | 0 .../performance/basic_type/bin/run_client.bat | 0 .../samples}/performance/basic_type/bin/run_server | 0 .../performance/basic_type/bin/run_server.bat | 0 .../samples}/performance/basic_type/build.xml | 0 .../cxf/performance/basic_type/client/Client.java | 0 .../cxf/performance/basic_type/server/Server.java | 0 .../performance/basic_type/server/ServerImpl.java | 0 .../performance/basic_type/wsdl/basic_type.wsdl| 0 .../performance/basic_type/wsdl/cxf-servlet.xml| 0 .../performance/complex_type/bin/run_client| 0 .../performance/complex_type/bin/run_client.bat| 0 .../performance/complex_type/bin/run_server| 0 .../performance/complex_type/bin/run_server.bat| 0 .../samples}/performance/complex_type/build.xml| 0 .../performance/complex_type/client/Client.java| 0 .../performance/complex_type/server/Server.java| 0 .../complex_type/server/ServerImpl.java| 0 .../complex_type/wsdl/complex_type.wsdl| 0 .../performance/complex_type/wsdl/cxf-servlet.xml | 0 .../samples}/performance/etc/common_build.xml | 0 .../release/samples/performance/jaxrs/README.txt | 67 + .../main/release/samples/performance/jaxrs/pom.xml | 168 + .../jaxrs}/src/main/config/KeyREADME.txt | 0 .../jaxrs}/src/main/config/clientKeystore.jks | Bin .../jaxrs}/src/main/config/serviceKeystore.jks | Bin .../cxf/performance/https/client/Client.java | 224 + .../cxf/performance/https/common/Customer.java | 43 +--- .../performance/https/common/CustomerService.java | 52 .../https/server/CustomerServiceImpl.java | 88 +++ .../cxf/performance/https}/server/Server.java | 58 ++--- .../jaxrs}/src/main/resources/ClientConfig.xml | 0 .../jaxrs}/src/main/resources/ServerConfig.xml | 0 .../soap_http_doc_lit/bin/run_java_client | 0 .../performance/soap_http_doc_lit/bin/run_server | 0 .../soap_http_doc_lit/bin/run_server.bat | 0 .../performance/soap_http_doc_lit/build.xml| 0 .../performance/soap_http_doc_lit/build_axis.xml | 0 .../performance/soap_http_doc_lit/build_ri.xml | 0 .../samples}/performance/soap_http_doc_lit/pom.xml | 36 ++- .../performance/complex_type/client/Client.java| 0 .../common/KeystorePasswordCallback.java | 0 .../performance/complex_type/server/Server.java| 0 .../complex_type/server/ServerImpl.java| 0 .../src/main/resources/etc/clientKeystore.jks | Bin .../main/resources/etc/clientKeystore.properties | 0 .../src/main/resources/etc/https-cfg-client.xml| 0 .../src/main/resources/etc/https-cfg-service.xml | 0 .../src/main/resources/etc/policy-asym.xml | 0 .../src/main/resources/etc/policy-sym.xml | 0 .../src/main/resources/et
(cxf) branch main updated: [CXF-9014]1024-bit RSA key (weak) and isn't allowed in modern JDK versions(SignatureWhitespaceTest failure) (#1875)
This is an automated email from the ASF dual-hosted git repository. ffang pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/main by this push: new 62495cd141 [CXF-9014]1024-bit RSA key (weak) and isn't allowed in modern JDK versions(SignatureWhitespaceTest failure) (#1875) 62495cd141 is described below commit 62495cd1415f6073b12dea8a0c4d4248188ca63f Author: Freeman(Yue) Fang AuthorDate: Thu May 16 13:28:26 2024 -0400 [CXF-9014]1024-bit RSA key (weak) and isn't allowed in modern JDK versions(SignatureWhitespaceTest failure) (#1875) --- .../org/apache/cxf/systest/ws/action/bob-modified.jks | Bin 2422 -> 4546 bytes .../cxf/systest/ws/action/request-with-comment.xml| 12 +--- .../ws/action/request-with-trailing-whitespace.xml| 12 +--- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/bob-modified.jks b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/bob-modified.jks index 26df583f43..a9e207e1bb 100644 Binary files a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/bob-modified.jks and b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/bob-modified.jks differ diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/request-with-comment.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/request-with-comment.xml index ca4a27f723..eac43c3fe1 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/request-with-comment.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/request-with-comment.xml @@ -1,11 +1,9 @@ -http://www.example.org/schema/DoubleIt; xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/;> - http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd; xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd;>http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary; ValueType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0#X509PKIPathv1; wsu:Id="X509-20518CC1C45561BA3 [...] -q0bYL9kpL9+a/+/SHR4BGXhKVLqUUrYsbU9QqV9jgHDFRLgZKAfDYL7SjAIovCyubf0fCX6vh7yW -4gGds/56Ls0PRPx306Y=http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0#X509PKIPathv1; wsu:Id="STR-20518CC1C45561BA3A139904923417218" xmlns:wsse11="http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd;>http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss [...] - http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd;> +http://www.example.org/schema/DoubleIt; xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/;> + http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd; xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd;>http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary; ValueType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0#X509PKIPathv1; [...] + http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd;> 25 - - \ No newline at end of file + + diff --git a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/request-with-trailing-whitespace.xml b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/request-with-trailing-whitespace.xml index 18a996d946..93fec747a6 100644 --- a/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/request-with-trailing-whitespace.xml +++ b/systests/ws-security/src/test/resources/org/apache/cxf/systest/ws/action/request-with-trailing-whitespace.xml @@ -1,11 +1,9 @@ -http://www.example.org/schema/DoubleIt; xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/;> - http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-secext-1.0.xsd; xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd;>http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-soap-message-security-1.0#Base64Binary; ValueType="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0#X509PKIPathv1; wsu:Id="X509-20518CC1C45561BA3 [...] -q0bYL9kpL9+a/+/SHR4BGXhKVLqUUrYsbU9QqV9jgHDFRLgZKAfDYL7SjAIovCyubf0fCX6vh7yW -4gGds/56Ls0PRPx306Y=http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-x509-token-profile-1.0#X509PKIPathv1; wsu:Id="STR-20518CC1C45561BA3A139904923417218" xmlns:wsse11="http://docs.oasis-open.org/wss/oasis-wss-wssecurity-secext-1.1.xsd;>
(cxf) branch CXF-9008 updated (4527a628f3 -> bdf7b02c2b)
This is an automated email from the ASF dual-hosted git repository. ffang pushed a change to branch CXF-9008 in repository https://gitbox.apache.org/repos/asf/cxf.git discard 4527a628f3 fips support add cbb76ba807 Update Apache Tomcat to 10.1.23 add f816ec68c9 Bump com.fasterxml.jackson.core:jackson-databind from 2.17.0 to 2.17.1 (#1851) add 0b53df25a3 Bump cxf.undertow.version from 2.3.12.Final to 2.3.13.Final (#1848) add 48cc0d2602 Bump org.mozilla:rhino from 1.7.14 to 1.7.15 (#1852) add 978b5b9867 Bump org.apache.maven.plugins:maven-deploy-plugin from 3.1.1 to 3.1.2 (#1853) add b8156fae4f [CXF-9006] Skip WSS40 cer validation check when on Red Hat JDK (#1836) add c56b1f1c2f Update Jetty to 12.0.9 add 4ab8fcaef7 Bump org.jboss.logging:jboss-logging from 3.5.3.Final to 3.6.0.Final (#1855) add e17b6d78ec [CXF-9010] Update benchmark soap http doc lit suite for CXF 4.1.x (#1857) add 17d58fb767 Use URI factory to parse WSDL location (#1858) add db7514f272 Bump org.apache.maven.plugins:maven-plugin-plugin from 3.12.0 to 3.13.0 (#1860) add 665823648c Bump org.wildfly.common:wildfly-common from 1.7.0.Final to 2.0.0 (#1859) add efa1716a5c CXF-8987: JDK 21+: HttpClientHTTPConduit thread locked during shutdown (#1854) add 388cf563fe Bump cxf.aspectj.version from 1.9.22 to 1.9.22.1 (#1862) add 61ee24c505 Bump cxf.mockito.version from 5.11.0 to 5.12.0 (#1863) add 79fd113bae Bump ossf/scorecard-action from 2.3.1 to 2.3.3 (#1866) add 0d301de6b9 Bump actions/checkout from 4.1.4 to 4.1.5 (#1865) add 369465b324 Update Micrometer Tracing to 1.2.6 add 039aeefd97 Update Micrometer to 1.12.6 add fab33b61db Update Apache Tomcat to 10.1.24 add 5d46f9c9b2 Bump cxf.hibernate.em.version from 6.5.0.Final to 6.5.1.Final (#1871) add 415869c2ee Bump cxf.micrometer.version from 1.12.6 to 1.13.0 (#1869) add ace3b1901c Bump org.apache.camel.springboot:camel-spring-boot-dependencies (#1873) add d5cbaed011 Bump cxf.reactor.version from 3.6.5 to 3.6.6 (#1874) new bdf7b02c2b fips support This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (4527a628f3) \ N -- N -- N refs/heads/CXF-9008 (bdf7b02c2b) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 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: .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/pull-request-build.yml | 2 +- .github/workflows/scorecards.yml | 4 ++-- benchmark/performance/base/pom.xml | 6 ++--- benchmark/performance/soap_http_doc_lit/pom.xml| 28 ++ .../common/KeystorePasswordCallback.java | 2 +- distribution/src/main/release/samples/pom.xml | 8 +++ parent/pom.xml | 28 +++--- pom.xml| 4 ++-- .../cxf/transport/http/HttpClientHTTPConduit.java | 24 +++ .../security/jose/jwejws/algorithms-server.xml | 2 +- .../security/jose/jwejws/reference-server.xml | 2 +- .../systest/jaxrs/security/jose/jwejws/server.xml | 2 +- .../cxf/systest/jaxrs/security/xml/server.xml | 2 +- .../cxf/systest/jaxrs/security/xml/stax-server.xml | 2 +- .../wsdlto/frontend/jaxws/template/service.vm | 3 ++- 16 files changed, 82 insertions(+), 39 deletions(-)
(cxf) branch CXF-9008 updated (3c556188a7 -> 4527a628f3)
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a change to branch CXF-9008
in repository https://gitbox.apache.org/repos/asf/cxf.git
discard 3c556188a7 fips support
new 4527a628f3 fips support
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (3c556188a7)
\
N -- N -- N refs/heads/CXF-9008 (4527a628f3)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 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:
.../jose/jwe/JweCompactReaderWriterTest.java | 93 +---
.../jose/jws/JwsCompactReaderWriterTest.java | 117 +++---
.../security/wss4j/AbstractPolicySecurityTest.java | 1 +
.../wss4j/DOMToStaxEncryptionIdentifierTest.java | 1 +
.../ws/security/wss4j/DOMToStaxRoundTripTest.java | 9 +-
.../cxf/ws/security/wss4j/RoundTripTest.java | 4 +-
.../ws/security/wss4j/StaxToDOMRoundTripTest.java | 12 +-
.../wss4j/UserNameTokenAuthorizationTest.java | 5 +-
.../ws/security/wss4j/WSS4JOutInterceptorTest.java | 2 +-
.../asymmetric_encr/AsymmetricEncryptionTest.java | 9 +-
.../BinarySecurityTokenTest.java | 17 +-
.../cxf/systest/sts/caching/CachingTest.java | 17 +-
.../cxf/systest/sts/caching/ServerCachingTest.java | 21 +-
.../sts/secure_conv/SecureConversationTest.java| 17 +-
.../SecurityContextTokenCancelTest.java| 5 +-
.../secure_conv/SecurityContextTokenUnitTest.java | 9 +-
.../sts_sender_vouches/STSSenderVouchesTest.java | 17 +-
.../{cxf-sts.xml => cxf-sts-fips.xml} | 0
.../cxf/systest/sts/asymmetric_encr/cxf-sts.xml| 4 +-
.../{stax-cxf-sts.xml => stax-cxf-sts-fips.xml}| 0
.../systest/sts/asymmetric_encr/stax-cxf-sts.xml | 4 +-
.../{DoubleIt.wsdl => DoubleIt-fips.wsdl} | 0
.../systest/sts/binarysecuritytoken/DoubleIt.wsdl | 2 +-
.../sts/binarysecuritytoken/cxf-service-fips.xml | 70 ++
.../binarysecuritytoken/stax-cxf-service-fips.xml | 72 ++
.../caching/{DoubleIt.wsdl => DoubleIt-fips.wsdl} | 0
.../apache/cxf/systest/sts/caching/DoubleIt.wsdl | 2 +-
.../sts/caching/cxf-caching-service-fips.xml | 110 +
.../cxf/systest/sts/caching/cxf-service-fips.xml | 70 ++
.../{DoubleIt.wsdl => DoubleIt-fips.wsdl} | 0
.../cxf/systest/sts/secure_conv/DoubleIt.wsdl | 10 +-
.../systest/sts/secure_conv/cxf-service-fips.xml | 112 ++
.../secure_conv/{cxf-sts.xml => cxf-sts-fips.xml} | 6 +-
.../apache/cxf/systest/sts/secure_conv/cxf-sts.xml | 4 +-
.../{stax-cxf-sts.xml => stax-cxf-sts-fips.xml}| 6 +-
.../cxf/systest/sts/secure_conv/stax-cxf-sts.xml | 4 +-
...service.wsdl => ws-trust-1.4-service-fips.wsdl} | 0
.../sts/secure_conv/ws-trust-1.4-service.wsdl | 4 +-
.../{DoubleIt.wsdl => DoubleIt-fips.wsdl} | 0
.../systest/sts/sts_sender_vouches/DoubleIt.wsdl | 2 +-
.../sts/sts_sender_vouches/cxf-service-fips.xml| 37
.../cxf-sts-fips.xml} | 38 ++--
.../stax-cxf-sts-fips.xml} | 38 ++--
...service.wsdl => ws-trust-1.4-service-fips.wsdl} | 0
.../sts_sender_vouches/ws-trust-1.4-service.wsdl | 2 +-
.../apache/cxf/systest/sts/issuer/IssuerTest.java | 13 +-
.../sts/transport/TransportBindingTest.java| 5 +-
.../username_actas/UsernameActAsCachingTest.java | 20 +-
.../sts/username_actas/UsernameActAsTest.java | 8 +-
.../UsernameOnBehalfOfCachingTest.java | 20 +-
.../UsernameOnBehalfOfTest.java| 8 +-
.../sts/x509/X509AsymmetricBindingTest.java| 8 +-
.../cxf/systest/sts/deployment/sts/cxf-sts.xml | 2 +-
.../cxf/systest/sts/issuer/cxf-client-fips.xml | 81 +++
...rt-policy.xml => sts-transport-policy-fips.xml} | 0
.../systest/sts/issuer/sts-transport-policy.xml| 2 +-
.../{DoubleIt.wsdl => DoubleIt-fips.wsdl} | 0
.../cxf/systest/sts/username_actas/DoubleIt.wsdl | 2 +-
.../sts/username_actas/cxf-service-fips.xml| 90
.../sts/username_actas/cxf-service2-fips.xml | 89
.../{DoubleIt.wsdl => DoubleIt-fips
(cxf) branch CXF-9008 updated (3f4ee4f487 -> 3c556188a7)
This is an automated email from the ASF dual-hosted git repository. ffang pushed a change to branch CXF-9008 in repository https://gitbox.apache.org/repos/asf/cxf.git discard 3f4ee4f487 fips support new 3c556188a7 fips support This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (3f4ee4f487) \ N -- N -- N refs/heads/CXF-9008 (3c556188a7) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omit" are not gone; other references still refer to them. Any revisions marked "discard" are gone forever. The 1 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: .../rs/security/xml/AbstractXmlEncInHandler.java | 3 +- .../wss4j/DOMToStaxEncryptionIdentifierTest.java | 4 - .../cxf/ws/security/wss4j/RoundTripTest.java | 14 +- .../wss4j/StaxCryptoCoverageCheckerTest.java | 14 +- .../ws/security/wss4j/StaxRoundTripActionTest.java | 25 +- .../cxf/ws/security/wss4j/StaxRoundTripTest.java | 25 +- .../wss4j/StaxToDOMEncryptionIdentifierTest.java | 21 +- .../ws/security/wss4j/StaxToDOMRoundTripTest.java | 29 +- .../wss4j/UserNameTokenAuthorizationTest.java | 24 +- .../cxf/ws/security/wss4j/WSS4JInOutTest.java | 15 +- .../ws/security/wss4j/WSS4JOutInterceptorTest.java | 4 +- .../security/src/test/resources/logging.properties | 2 +- .../cxf/sts/operation/IssueEncryptedUnitTest.java | 43 ++- .../apache/cxf/sts/operation/IssueSCTUnitTest.java | 5 +- .../token/provider/SAMLProviderKeyTypeTest.java| 11 +- .../username_actas/UsernameActAsCachingTest.java | 4 +- .../sts/username_actas/UsernameActAsTest.java | 7 +- .../UsernameOnBehalfOfCachingTest.java | 4 +- .../UsernameOnBehalfOfTest.java| 7 +- .../sts/x509/X509AsymmetricBindingTest.java| 4 +- ...service.wsdl => ws-trust-1.4-service-fips.wsdl} | 0 .../sts/delegation/ws-trust-1.4-service.wsdl | 4 +- .../systest/sts/deployment/cxf-transport-fips.xml | 4 +- .../sts/deployment/cxf-ut-encrypted-fips.xml | 2 +- .../cxf/systest/sts/deployment/cxf-ut-fips.xml | 2 +- .../cxf/systest/sts/deployment/cxf-x509-fips.xml | 2 +- .../sts/deployment/stax-cxf-transport-fips.xml | 4 +- .../sts/deployment/stax-cxf-ut-encrypted-fips.xml | 2 +- .../systest/sts/deployment/stax-cxf-ut-fips.xml| 2 +- .../systest/sts/deployment/stax-cxf-x509-fips.xml | 2 +- ...service.wsdl => ws-trust-1.4-service-fips.wsdl} | 0 .../sts/deployment/ws-trust-1.4-service.wsdl | 10 +- ...service.wsdl => ws-trust-1.4-service-fips.wsdl} | 0 .../systest/sts/issuer/ws-trust-1.4-service.wsdl | 2 +- .../security/jose/jwejws/JAXRSJweJwsTest.java | 2 - .../jaxrs/security/xml/JAXRSXmlSecTest.java| 18 +- .../apache/cxf/systest/ws/action/ActionTest.java | 72 +++- .../systest/ws/algsuite/AlgorithmSuiteTest.java| 40 +- .../org/apache/cxf/systest/ws/algsuite/Server.java | 5 +- .../ws/algsuite/StaxAlgorithmSuiteTest.java| 5 +- .../apache/cxf/systest/ws/algsuite/StaxServer.java | 5 +- .../systest/ws/basicauth/BasicAuthJAASTest.java| 6 +- .../cxf/systest/ws/basicauth/BasicAuthTest.java| 13 +- .../cxf/systest/ws/basicauth/JAASServer.java | 5 +- .../apache/cxf/systest/ws/basicauth/Server.java| 5 +- .../systest/ws/bindings/BindingPropertiesTest.java | 45 ++- .../org/apache/cxf/systest/ws/bindings/Server.java | 5 +- .../apache/cxf/systest/ws/bindings/StaxServer.java | 5 +- .../apache/cxf/systest/ws/cache/CachingTest.java | 13 +- .../org/apache/cxf/systest/ws/cache/Server.java| 5 +- .../DoubleItPortTypeImplJavaFirstFips.java}| 50 ++- .../org/apache/cxf/systest/ws/fault/FaultTest.java | 54 ++- .../systest/ws/fault/ModifiedRequestServer.java| 6 +- .../cxf/systest/ws/fault/ModifiedRequestTest.java | 21 +- .../org/apache/cxf/systest/ws/fault/Server.java| 5 +- .../org/apache/cxf/systest/ws/gcm/GCMTest.java | 17 +- .../systest/ws/gcm/MGF256AlgorithmSuiteLoader.java | 9 +- .../org/apache/cxf/systest/ws/gcm/MGFServer.java | 5 +- .../apache/cxf/systest/ws/gcm/MGFStaxServer.java | 5 +- .../java/org/apache/cxf/systest/ws/gcm/Server.java | 5 +- .../org/apache/cxf/systest/ws/gcm/StaxServer.java | 5 +- .../apache/cxf/systest/ws/httpget/HTTPGet
(cxf) branch main updated: [CXF-9006] Skip WSS40 cer validation check when on Red Hat JDK (#1836)
This is an automated email from the ASF dual-hosted git repository. ffang pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/main by this push: new b8156fae4f [CXF-9006] Skip WSS40 cer validation check when on Red Hat JDK (#1836) b8156fae4f is described below commit b8156fae4f76da4f1fa8d5cec438f330e2ea608b Author: Jamie Goodyear AuthorDate: Tue May 7 11:49:24 2024 -0230 [CXF-9006] Skip WSS40 cer validation check when on Red Hat JDK (#1836) * [CXF-9006] Skip WSS40 cer validation check when on Red Hat JDK * [CXF-9006] Updated WSS40 certificates * Restore white space count on assert wss40 valid --- .../test/resources/trustedAuthorityValidator/wss40.cer | Bin 956 -> 1097 bytes .../resources/trustedAuthorityValidator/wss40CA.cer| Bin 794 -> 1077 bytes .../resources/trustedAuthorityValidator/wss40CACRL.cer | Bin 345 -> 666 bytes .../resources/trustedAuthorityValidator/wss40rev.cer | Bin 956 -> 1097 bytes 4 files changed, 0 insertions(+), 0 deletions(-) diff --git a/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40.cer b/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40.cer index f916206813..581309ec77 100644 Binary files a/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40.cer and b/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40.cer differ diff --git a/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40CA.cer b/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40CA.cer index 0faeb68b2a..90923a0f3e 100644 Binary files a/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40CA.cer and b/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40CA.cer differ diff --git a/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40CACRL.cer b/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40CACRL.cer index 0d46cca8e6..cd46d13d88 100644 Binary files a/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40CACRL.cer and b/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40CACRL.cer differ diff --git a/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40rev.cer b/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40rev.cer index ef2ff551e7..70dfb44cdd 100644 Binary files a/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40rev.cer and b/services/xkms/xkms-x509-handlers/src/test/resources/trustedAuthorityValidator/wss40rev.cer differ
(cxf) branch CXF-9008 created (now 3f4ee4f487)
This is an automated email from the ASF dual-hosted git repository. ffang pushed a change to branch CXF-9008 in repository https://gitbox.apache.org/repos/asf/cxf.git at 3f4ee4f487 fips support This branch includes the following new commits: new 3f4ee4f487 fips support The 1 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.
(cxf) branch main updated: [CXF-9004]Jetty12 : always use pre-saved HTTP_REQUEST from InMessage to populate SecurityContext (#1823)
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new dc08a738df [CXF-9004]Jetty12 : always use pre-saved HTTP_REQUEST from
InMessage to populate SecurityContext (#1823)
dc08a738df is described below
commit dc08a738df3e10f133f4dc149c2cdbdf56ed8350
Author: Freeman(Yue) Fang
AuthorDate: Fri Apr 19 16:17:40 2024 -0400
[CXF-9004]Jetty12 : always use pre-saved HTTP_REQUEST from InMessage to
populate SecurityContext (#1823)
---
.../cxf/transport/http/AbstractHTTPDestination.java | 20 ++--
1 file changed, 14 insertions(+), 6 deletions(-)
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
index c0771430de..566e05a1b3 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/AbstractHTTPDestination.java
@@ -408,14 +408,22 @@ public abstract class AbstractHTTPDestination
SecurityContext httpSecurityContext = new SecurityContext() {
public Principal getUserPrincipal() {
-try {
-return req.getUserPrincipal();
-} catch (Exception ex) {
-return null;
-}
+//ensure we use req from the one saved in inMessage
+//as this could be the cachedInput one in oneway and
+//ReplyTo is specified when ws-addressing is used
+//which means we need to switch thread context
+//and underlying transport might discard any data on the
original stream
+HttpServletRequest reqFromInMessage =
(HttpServletRequest)exchange.getInMessage().get(HTTP_REQUEST);
+return reqFromInMessage.getUserPrincipal();
}
public boolean isUserInRole(String role) {
-return req.isUserInRole(role);
+//ensure we use req from the one saved in inMessage
+//as this could be the cachedInput one in oneway and
+//ReplyTo is specified when ws-addressing is used
+//which means we need to switch thread context
+//and underlying transport might discard any data on the
original stream
+HttpServletRequest reqFromInMessage =
(HttpServletRequest)exchange.getInMessage().get(HTTP_REQUEST);
+return reqFromInMessage.isUserInRole(role);
}
};
svn commit: r67905 - /release/cxf/3.5.8/
Author: ffang Date: Tue Mar 12 20:22:29 2024 New Revision: 67905 Log: add CXF 3.5.8 distributions Added: release/cxf/3.5.8/apache-cxf-3.5.8-src.tar.gz (with props) release/cxf/3.5.8/apache-cxf-3.5.8-src.tar.gz.asc release/cxf/3.5.8/apache-cxf-3.5.8-src.tar.gz.sha256 release/cxf/3.5.8/apache-cxf-3.5.8-src.zip (with props) release/cxf/3.5.8/apache-cxf-3.5.8-src.zip.asc release/cxf/3.5.8/apache-cxf-3.5.8-src.zip.sha256 release/cxf/3.5.8/apache-cxf-3.5.8.tar.gz (with props) release/cxf/3.5.8/apache-cxf-3.5.8.tar.gz.asc release/cxf/3.5.8/apache-cxf-3.5.8.tar.gz.sha256 release/cxf/3.5.8/apache-cxf-3.5.8.zip (with props) release/cxf/3.5.8/apache-cxf-3.5.8.zip.asc release/cxf/3.5.8/apache-cxf-3.5.8.zip.sha256 Added: release/cxf/3.5.8/apache-cxf-3.5.8-src.tar.gz == Binary file - no diff available. Propchange: release/cxf/3.5.8/apache-cxf-3.5.8-src.tar.gz -- svn:mime-type = application/octet-stream Added: release/cxf/3.5.8/apache-cxf-3.5.8-src.tar.gz.asc == --- release/cxf/3.5.8/apache-cxf-3.5.8-src.tar.gz.asc (added) +++ release/cxf/3.5.8/apache-cxf-3.5.8-src.tar.gz.asc Tue Mar 12 20:22:29 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEqngrBKvZ42zzCWA3tZ09D5+choQFAmXqH8AACgkQtZ09D5+c +hoSvfg//fWnT1moSaJE1soYRPtHNi/K8U9/xxIveo6c3/+ieidsm+pslcUt0cGbv +wkm7ejiDGu5/JjSTy5x3e7YXjpvWPeVzKZDzT8lBSqVaqNSPWOzNIKpW8TAw8TBZ +H/y8+iIHKwPNJhFv7vLbszZ3iOSSs8FqktM1pm5ti0lRbwR13Em6NANHv1d7OYIB +dDt8qh8IsLQgqLxj97D3OUrwMNb6e3j8KmkA3i/wbsjm7gYQdszu/koM7TCmszTX ++VWmBvKGy4+eavZPjq8NSjRiyVh1kdn88hg9gfZhUYF0BB3ly0C/N10/jIbo49J5 +M6AURABDBunkpcS230CbE2q23wAKm/U7FquK9Ru2r5wUkE1/xUz1n07YTWo+WeV3 +tShvSzYSvNy30hGBKVQB8GAHLL14rC4hQEZhdwKWh8Nx2jfZOgj8g3oiftn/ODTs +cvK2F+kvFDZiK5kun9X652JUMzKOiRsHpw4YJquxseWJ7CRVpowOlA3NbQ5zzitg +h09+Ku4nYObi7HZsUxHaf8a/lpbz1FZYqMtqc0pUyUWV1qSVrdlVXXwElhk8NghF +3wtmBb8jyGJ+JBmnUVCASMpCGhEaAQeK3f7MZv2mCo7KyqWZhQMNLA7+hsVdMS1H +oDLCUI5nGdc7wqvIVyGaSltvoOCRbsfaSqYL+3nGV1WstApqupY= +=7Sx6 +-END PGP SIGNATURE- Added: release/cxf/3.5.8/apache-cxf-3.5.8-src.tar.gz.sha256 == --- release/cxf/3.5.8/apache-cxf-3.5.8-src.tar.gz.sha256 (added) +++ release/cxf/3.5.8/apache-cxf-3.5.8-src.tar.gz.sha256 Tue Mar 12 20:22:29 2024 @@ -0,0 +1 @@ +05bacb9ae9610f9f1a2c1797d6970c162930630030bb562ba2188b3ccb117fc4 apache-cxf-3.5.8-src.tar.gz Added: release/cxf/3.5.8/apache-cxf-3.5.8-src.zip == Binary file - no diff available. Propchange: release/cxf/3.5.8/apache-cxf-3.5.8-src.zip -- svn:mime-type = application/octet-stream Added: release/cxf/3.5.8/apache-cxf-3.5.8-src.zip.asc == --- release/cxf/3.5.8/apache-cxf-3.5.8-src.zip.asc (added) +++ release/cxf/3.5.8/apache-cxf-3.5.8-src.zip.asc Tue Mar 12 20:22:29 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEqngrBKvZ42zzCWA3tZ09D5+choQFAmXqH8AACgkQtZ09D5+c +hoTdoQ//dMXLrtbQobt2BMS90zADD5n/xt58sIAFWD081qWNOj/coOC5ZpUN0SFo +/HiCSN6EY89a5WcS6/7QoEZYKrsuqEvgKZA/QPapfdmxrVb90tUD58z6E6P6wKzK +G01ev+1TBdBtGIh3JfzDqgq6CU4UK1Sofzh69cOwpM6hllacvnYfdh6TiVmTbn8P +ATypyIFm6TYh0KtlosTtMur0xSUSwN/AA/muWWsoIvv3qmioTshw4D4/LIkUURQO +IGootbseECNzvC3Ud2XTgtaOFue0wfshAwMIRy10dvAWxBbsdxywUplZCSXxeuof +Qvucoxt8hG56OAHFIFtoQFLtbdsp5A3v7XPkZZ948PrHaoimC1YzSqmbG9t1HxNU +5hHFbaSnjQn4zWq9c+fiWBxcvgt+KKfR5lL5/PR5lUmRLBVTyyNBaq8bJ+SQDM5A +0BFktvWkq5R4yzKSfzMl1VIu8dJMvbOKzFZRXNyRvV1iiXuEfE26pjpA1BbPgrbL +GLJSVipVdjCiN4n2FQx5ObcFAqRRJk6Bl/Rqvn9gVUqmdZXWrwwDa6Se+cf04OG9 +xOPT+zKQG66Ff35AV5gIRVWMquCmX19aPLtkkazUo07pR30iK8kMVVecw2KoTELk +JwQggdGeS3ypK/PtLNoOh6u/G1hAJJC+KSMpMbc5wTL1v3J/WpM= +=kRoV +-END PGP SIGNATURE- Added: release/cxf/3.5.8/apache-cxf-3.5.8-src.zip.sha256 == --- release/cxf/3.5.8/apache-cxf-3.5.8-src.zip.sha256 (added) +++ release/cxf/3.5.8/apache-cxf-3.5.8-src.zip.sha256 Tue Mar 12 20:22:29 2024 @@ -0,0 +1 @@ +c57413b4e7e5a602a4d09676f42684fee08be7f2fa35763f11ed6b43baa5f368 apache-cxf-3.5.8-src.zip Added: release/cxf/3.5.8/apache-cxf-3.5.8.tar.gz == Binary file - no diff available. Propchange: release/cxf/3.5.8/apache-cxf-3.5.8.tar.gz -- svn:mime-type = application/octet-stream Added: release/cxf/3.5.8/apache-cxf-3.5.8.tar.gz.asc
svn commit: r67904 - /release/cxf/3.6.3/
Author: ffang Date: Tue Mar 12 20:19:44 2024 New Revision: 67904 Log: add CXF 3.6.3 distributions Added: release/cxf/3.6.3/apache-cxf-3.6.3-src.tar.gz (with props) release/cxf/3.6.3/apache-cxf-3.6.3-src.tar.gz.asc release/cxf/3.6.3/apache-cxf-3.6.3-src.tar.gz.sha256 release/cxf/3.6.3/apache-cxf-3.6.3-src.zip (with props) release/cxf/3.6.3/apache-cxf-3.6.3-src.zip.asc release/cxf/3.6.3/apache-cxf-3.6.3-src.zip.sha256 release/cxf/3.6.3/apache-cxf-3.6.3.tar.gz (with props) release/cxf/3.6.3/apache-cxf-3.6.3.tar.gz.asc release/cxf/3.6.3/apache-cxf-3.6.3.tar.gz.sha256 release/cxf/3.6.3/apache-cxf-3.6.3.zip (with props) release/cxf/3.6.3/apache-cxf-3.6.3.zip.asc release/cxf/3.6.3/apache-cxf-3.6.3.zip.sha256 Added: release/cxf/3.6.3/apache-cxf-3.6.3-src.tar.gz == Binary file - no diff available. Propchange: release/cxf/3.6.3/apache-cxf-3.6.3-src.tar.gz -- svn:mime-type = application/octet-stream Added: release/cxf/3.6.3/apache-cxf-3.6.3-src.tar.gz.asc == --- release/cxf/3.6.3/apache-cxf-3.6.3-src.tar.gz.asc (added) +++ release/cxf/3.6.3/apache-cxf-3.6.3-src.tar.gz.asc Tue Mar 12 20:19:44 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEqngrBKvZ42zzCWA3tZ09D5+choQFAmXqA4cACgkQtZ09D5+c +hoS4LA//XbGAIPoY7mBrTuu5eSXkO4xIVJ7uG7pVyF51u4CRMSp6f2EF/1XlrVm7 +xq+A5lZwFIBWFYg2Vwflrv5I7im7qZv42j5ZVmoWaUBHTytuv6lBMIoR7Lf4j2PV +5meaqs9YXcYG2Uu4uFVbTlmlLS7rIuzvNC35L/9xDWea2+6p8cTcgM6QhlbJ6uO5 +rxBxOoEyzGNJ8kWNzrwYPwntnVGpO8sKEUP2uuMgkbSa8Vk2bzowMvoE0HHUcs8T +GZbGYItEQgHh5u/g99vcmNkV4ksJpg1sBvAKDHxiJKhW3SyP6ryiLWkkt5BLSiad +kXyuFjmszBm1EMU9lQ+nhygG36eu/x+XIvzWpyKje7gyRW7zPkVJwpM4WVJle/jH +ok0QhWtvPi6PGfZN9CbIQsgs7Wmy94pEGXg2iRLUcEErqVnn9JRdg9LGA9AOAfJ8 +dTlMfg7tLcvIwBjxcv4Iw1hOd3okvd1DWIlmeg+KlDnZv99qm04YXgYiW1+HcEy8 +RAJFVAddqF4VD8g6mZqpfM4wP9P5w5pHOmyZlowaU4IbXplVlfQPRVTtk/3wxcY6 +VZuNGme5yAS43e0nW9loGmUiPhE9zHOGgXbO9TpYDsgm+GmJ9duslpfApg7DjDxN +IkIpUn+nVChPwL0nUIVxSCGQPu1iAoSvAnwLNeSyk1ikJtq79MI= +=6cS2 +-END PGP SIGNATURE- Added: release/cxf/3.6.3/apache-cxf-3.6.3-src.tar.gz.sha256 == --- release/cxf/3.6.3/apache-cxf-3.6.3-src.tar.gz.sha256 (added) +++ release/cxf/3.6.3/apache-cxf-3.6.3-src.tar.gz.sha256 Tue Mar 12 20:19:44 2024 @@ -0,0 +1 @@ +4fced4afa41c7137b6ac8e836680026a7d43bf43896f313a04c07f573c9b9235 apache-cxf-3.6.3-src.tar.gz Added: release/cxf/3.6.3/apache-cxf-3.6.3-src.zip == Binary file - no diff available. Propchange: release/cxf/3.6.3/apache-cxf-3.6.3-src.zip -- svn:mime-type = application/octet-stream Added: release/cxf/3.6.3/apache-cxf-3.6.3-src.zip.asc == --- release/cxf/3.6.3/apache-cxf-3.6.3-src.zip.asc (added) +++ release/cxf/3.6.3/apache-cxf-3.6.3-src.zip.asc Tue Mar 12 20:19:44 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEqngrBKvZ42zzCWA3tZ09D5+choQFAmXqA4cACgkQtZ09D5+c +hoQo2Q/9E/BcVHkC1D6qo/OU1ERFEnxOCWSSwRfDo6GqB+h+5VrgdPyaJfZEBFl0 +lVCCLs+kkd0FLl5hhiAGKbzJ60pJYUR2g+GPKf+tt0MxI4+a9y0/gNjLJGACmzLE +00uvi0vTa5AnEX/8MzPSoEyYJWlMJcuEdn81ZY3UlzQvjYp0P30UbVkg4hS8vqYl ++nn4KsKNG8LrytZVXflrTkJRoVySJzjSon7lWaOEILwpIzILR789vFJixTP6h7ns +jaxbrzt26Ys6BH7RzMGSUwLC2UOARLa0H8r+BPwmPxiTJnx1II4KXpQojbXsMRKY +YhOnk1Gj4TeZ6lqiDorwjxUxgJNlWQN0yt5dDK1h7f+Edr9ize98G9n3GXUaJJbP +zPoSve2LxGtyqBKARRzY64k/78KhNxsngjMg2CIRjCLWJvQy83kj1aEHNcvJLhN4 +LiYnam+Rp8I2xVBf4qOHrBDoqQkhrtiu4sHmnUyBpVFW43QKpJK0F6h1yBiEthEF +JIRon0AAKHqLSljPCOy78xbu7OkmB0qUmfGfy4o7EHJ8rBOfkGtgQ7/xZyCPoteU +t5Aw19MqVqEOs/mmCHHbnQeUocpBaYvlCL1VTYWA7eI1eqin5McakoyxeKJcVPGl +iU9sqN+2Jh1URDxetKaQByxFC/6gR2Fhw1DuR1l43OZQH20CKYA= +=11fa +-END PGP SIGNATURE- Added: release/cxf/3.6.3/apache-cxf-3.6.3-src.zip.sha256 == --- release/cxf/3.6.3/apache-cxf-3.6.3-src.zip.sha256 (added) +++ release/cxf/3.6.3/apache-cxf-3.6.3-src.zip.sha256 Tue Mar 12 20:19:44 2024 @@ -0,0 +1 @@ +db7505b2f79fab235da95818e83817b77e5484e221c555d4ebaac735cd7bae8e apache-cxf-3.6.3-src.zip Added: release/cxf/3.6.3/apache-cxf-3.6.3.tar.gz == Binary file - no diff available. Propchange: release/cxf/3.6.3/apache-cxf-3.6.3.tar.gz -- svn:mime-type = application/octet-stream Added: release/cxf/3.6.3/apache-cxf-3.6.3.tar.gz.asc
svn commit: r67903 - /release/cxf/3.5.8/
Author: ffang Date: Tue Mar 12 19:26:15 2024 New Revision: 67903 Log: create CXF 3.5.8 distributions folder Added: release/cxf/3.5.8/
svn commit: r67902 - /release/cxf/3.6.3/
Author: ffang Date: Tue Mar 12 19:25:51 2024 New Revision: 67902 Log: create CXF 3.6.3 distributions folder Added: release/cxf/3.6.3/
svn commit: r67894 - in /release/cxf/4.0.4: apache-cxf-4.0.4-src.tar.gz.sha256 apache-cxf-4.0.4-src.zip.sha256 apache-cxf-4.0.4.tar.gz.sha256 apache-cxf-4.0.4.zip.sha256
Author: ffang Date: Tue Mar 12 00:52:22 2024 New Revision: 67894 Log: add sha256 checksum for distributions Added: release/cxf/4.0.4/apache-cxf-4.0.4-src.tar.gz.sha256 release/cxf/4.0.4/apache-cxf-4.0.4-src.zip.sha256 release/cxf/4.0.4/apache-cxf-4.0.4.tar.gz.sha256 release/cxf/4.0.4/apache-cxf-4.0.4.zip.sha256 Added: release/cxf/4.0.4/apache-cxf-4.0.4-src.tar.gz.sha256 == --- release/cxf/4.0.4/apache-cxf-4.0.4-src.tar.gz.sha256 (added) +++ release/cxf/4.0.4/apache-cxf-4.0.4-src.tar.gz.sha256 Tue Mar 12 00:52:22 2024 @@ -0,0 +1 @@ +910247ba967ff8e501c80d423156cca888285f12b2e6866d86e216aeb9bd6cf6 apache-cxf-4.0.4-src.tar.gz Added: release/cxf/4.0.4/apache-cxf-4.0.4-src.zip.sha256 == --- release/cxf/4.0.4/apache-cxf-4.0.4-src.zip.sha256 (added) +++ release/cxf/4.0.4/apache-cxf-4.0.4-src.zip.sha256 Tue Mar 12 00:52:22 2024 @@ -0,0 +1 @@ +fca65234f1f6a41c0a2b65c2f8af3e389f3c4e313347265be35c31123af2437b apache-cxf-4.0.4-src.zip Added: release/cxf/4.0.4/apache-cxf-4.0.4.tar.gz.sha256 == --- release/cxf/4.0.4/apache-cxf-4.0.4.tar.gz.sha256 (added) +++ release/cxf/4.0.4/apache-cxf-4.0.4.tar.gz.sha256 Tue Mar 12 00:52:22 2024 @@ -0,0 +1 @@ +b66422ed2e1701238b583a3e9bb3359e569b9a3a8c081fc420338c4234c3d851 apache-cxf-4.0.4.tar.gz Added: release/cxf/4.0.4/apache-cxf-4.0.4.zip.sha256 == --- release/cxf/4.0.4/apache-cxf-4.0.4.zip.sha256 (added) +++ release/cxf/4.0.4/apache-cxf-4.0.4.zip.sha256 Tue Mar 12 00:52:22 2024 @@ -0,0 +1 @@ +c99b97dd7858cbe07bc5c9e4610eb48c073aaa78a3542f7a431502d6a78be0be apache-cxf-4.0.4.zip
svn commit: r67893 - /release/cxf/4.0.4/
Author: ffang Date: Tue Mar 12 00:45:03 2024 New Revision: 67893 Log: remove md5 and sha1 Removed: release/cxf/4.0.4/apache-cxf-4.0.4-src.tar.gz.md5 release/cxf/4.0.4/apache-cxf-4.0.4-src.tar.gz.sha1 release/cxf/4.0.4/apache-cxf-4.0.4-src.zip.md5 release/cxf/4.0.4/apache-cxf-4.0.4-src.zip.sha1 release/cxf/4.0.4/apache-cxf-4.0.4.tar.gz.md5 release/cxf/4.0.4/apache-cxf-4.0.4.tar.gz.sha1 release/cxf/4.0.4/apache-cxf-4.0.4.zip.md5 release/cxf/4.0.4/apache-cxf-4.0.4.zip.sha1
svn commit: r67892 - /release/cxf/4.0.4/
Author: ffang Date: Tue Mar 12 00:41:33 2024 New Revision: 67892 Log: add CXF 4.0.4 distribution Added: release/cxf/4.0.4/apache-cxf-4.0.4-src.tar.gz (with props) release/cxf/4.0.4/apache-cxf-4.0.4-src.tar.gz.asc release/cxf/4.0.4/apache-cxf-4.0.4-src.tar.gz.md5 release/cxf/4.0.4/apache-cxf-4.0.4-src.tar.gz.sha1 release/cxf/4.0.4/apache-cxf-4.0.4-src.zip (with props) release/cxf/4.0.4/apache-cxf-4.0.4-src.zip.asc release/cxf/4.0.4/apache-cxf-4.0.4-src.zip.md5 release/cxf/4.0.4/apache-cxf-4.0.4-src.zip.sha1 release/cxf/4.0.4/apache-cxf-4.0.4.tar.gz (with props) release/cxf/4.0.4/apache-cxf-4.0.4.tar.gz.asc release/cxf/4.0.4/apache-cxf-4.0.4.tar.gz.md5 release/cxf/4.0.4/apache-cxf-4.0.4.tar.gz.sha1 release/cxf/4.0.4/apache-cxf-4.0.4.zip (with props) release/cxf/4.0.4/apache-cxf-4.0.4.zip.asc release/cxf/4.0.4/apache-cxf-4.0.4.zip.md5 release/cxf/4.0.4/apache-cxf-4.0.4.zip.sha1 Added: release/cxf/4.0.4/apache-cxf-4.0.4-src.tar.gz == Binary file - no diff available. Propchange: release/cxf/4.0.4/apache-cxf-4.0.4-src.tar.gz -- svn:mime-type = application/octet-stream Added: release/cxf/4.0.4/apache-cxf-4.0.4-src.tar.gz.asc == --- release/cxf/4.0.4/apache-cxf-4.0.4-src.tar.gz.asc (added) +++ release/cxf/4.0.4/apache-cxf-4.0.4-src.tar.gz.asc Tue Mar 12 00:41:33 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEqngrBKvZ42zzCWA3tZ09D5+choQFAmXpAYUACgkQtZ09D5+c +hoQFPQ/+LlhiXKn4OXrM1zk2dcep3NHN1ss5GKdXdOymwduBKiiSPUMUOOPfAfUT +nvD+oQrkk3EcxD07bcM4S6WTQreUWvsrK7w+DAQMalrp+0YIOVTns5PfWrRWMWhG +pnzdvPcm5uPaqeWvVX4pLdMNg2PJTlx5CYDF1WCTE63B2Fhv/Gx/uN9tbdzGyQuv +BQzJX6grq56FpG9FSDKzWLZ7KNgmJz1U+LdzB5dRRT6IXayTbWZCF0aCtcCaTHfc +KWdap7ly1JUbPP9gXSssQpuL/WvLndoFxBzxIS59zQBWFO2yBBXDoQUHeMW7laXA +7aG3G6jHhl361/f0aYoW5yUTMkoPl20m8dt+hcPcL9axZ/OupbMPJT4uV/HIR1Om +z2AustsEfpbfc4CJZKAJpslbiTTBd3H7uMlTpL7niqInG/j98zeprGZCjP/Y6HMK +O7GrZ4qzK7mbYMvarrhnRMbLeK7opvwlCaFctYdINEQjwJ/91nW2EyxAX61qOTeA +tMOL9QwKPmTuDCO3oJBYoH3gD3M2Ta3AewP+cMbifSGHq1HodvmSMnzSNrvuiQNe +bTQdm5aJkxZZ8LkovCvCEWI1EIh/L/Pe44uZNhWDMvM5nxiCRHpkWArvFswz5CWz +T8wHsFYIkHugeaHsqV+MP/gfEGBEbS9kAJoji8IYzv6yrGyxSIg= +=x2tV +-END PGP SIGNATURE- Added: release/cxf/4.0.4/apache-cxf-4.0.4-src.tar.gz.md5 == --- release/cxf/4.0.4/apache-cxf-4.0.4-src.tar.gz.md5 (added) +++ release/cxf/4.0.4/apache-cxf-4.0.4-src.tar.gz.md5 Tue Mar 12 00:41:33 2024 @@ -0,0 +1 @@ +84d214de500c5f5801e8360b0cf781a9 \ No newline at end of file Added: release/cxf/4.0.4/apache-cxf-4.0.4-src.tar.gz.sha1 == --- release/cxf/4.0.4/apache-cxf-4.0.4-src.tar.gz.sha1 (added) +++ release/cxf/4.0.4/apache-cxf-4.0.4-src.tar.gz.sha1 Tue Mar 12 00:41:33 2024 @@ -0,0 +1 @@ +1e16ebc0f072d37b85fcacaa1edcda63b7847e55 \ No newline at end of file Added: release/cxf/4.0.4/apache-cxf-4.0.4-src.zip == Binary file - no diff available. Propchange: release/cxf/4.0.4/apache-cxf-4.0.4-src.zip -- svn:mime-type = application/octet-stream Added: release/cxf/4.0.4/apache-cxf-4.0.4-src.zip.asc == --- release/cxf/4.0.4/apache-cxf-4.0.4-src.zip.asc (added) +++ release/cxf/4.0.4/apache-cxf-4.0.4-src.zip.asc Tue Mar 12 00:41:33 2024 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEqngrBKvZ42zzCWA3tZ09D5+choQFAmXpAYYACgkQtZ09D5+c +hoRcSRAAoWAXrbiPFjRmizQ3i84E3alUGYh+pty+7XNL5oKTQkT0YODG15pTNwDM +GFZhtRc4l7txVgJIR5XntqHYPctLODIP7lrCg161M2KJS1hg3z/DIN+7+cCm4rQY +akTCWSbsyx5JqLDh/z5wJG1Kqv835zuLgvY//1QSX1OMe/faPfhZGPhyFRaR2X3Y +Q/Qwsmvw1C2KKjuKd30frymB29aCb+CAqIbFNdPHqXi3rj+gFPiyyf92jGEyBntw +QCCV1rcIk81Z86u8MupPlYen7R5cZkcPQSCmQHLUVD8lBmGf7G1m3PJpVWzlKLmI +4cruUQTzaeQyaG8hcBx3ZbciT2qJNWM//XVynY0OveesUg4GccLLsKAvwDO6GV8F +Pjj1/8OfgID14zO0gjIF416eZEDKkmMO6vu5tupVQQ6GgPA5jv3cf9rJxEsw29gh +N7cZbaW31xV9SbYl2NbeNiMEPOo1iLyh1MG1aDLy4/rPg41QrWAaD+qXmrSkhqu1 +tpl+gSZ8pYVmAKqPslcJqkceXIS4eAdGHW5NhMtPRRIx5zhCPzPpemIQhVHL/CUC +euIwrWjJki86h22FBWRF+279/mRiLMatcKqUaGvMDNrkkna0zebQXNZON3J20ndN +Br817raB30HCsq0oN+fRt7jIJionSfc0rQjOy4sCxF0a5gkP6io= +=7GWZ +-END PGP SIGNATURE- Added: release/cxf/4.0.4/apache-cxf-4.0.4-src.zip.md5 == --- release/cxf/4.0.4/apache-cxf-4.0.4-src.zip.md5 (added) +++ release/cxf/4.0.4/apache-cxf-4.0.4-src.zip.md5 Tue Mar 12 00:41:33 2024 @@ -0,0 +1 @@ +3e3fe3585bde8b99800d3aa2e9955fd1 \ No newline at end of file
svn commit: r67891 - /release/cxf/4.0.4/
Author: ffang Date: Tue Mar 12 00:14:26 2024 New Revision: 67891 Log: release CXF 4.0.4 Added: release/cxf/4.0.4/
(cxf) annotated tag cxf-3.5.8 created (now d88e25425d)
This is an automated email from the ASF dual-hosted git repository. ffang pushed a change to annotated tag cxf-3.5.8 in repository https://gitbox.apache.org/repos/asf/cxf.git at d88e25425d (tag) tagging 1593a5e0e48a67f75c60a64add52b0be57bb5eb0 (commit) replaces cxf-3.5.7 by Freeman Fang on Thu Mar 7 13:35:22 2024 -0500 - Log - [maven-release-plugin] copy for tag cxf-3.5.8 --- No new revisions were added by this update.
(cxf) annotated tag cxf-3.6.3 created (now c770a41979)
This is an automated email from the ASF dual-hosted git repository. ffang pushed a change to annotated tag cxf-3.6.3 in repository https://gitbox.apache.org/repos/asf/cxf.git at c770a41979 (tag) tagging d6c36b4dcabade57d0266313ab3745bedf5fb57c (commit) replaces cxf-3.6.2 by Freeman Fang on Thu Mar 7 12:20:37 2024 -0500 - Log - [maven-release-plugin] copy for tag cxf-3.6.3 --- No new revisions were added by this update.
(cxf) branch 3.5.x-fixes updated: update CXF 3.5.8 release notes
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.5.x-fixes by this push:
new b8cb2905fe update CXF 3.5.8 release notes
b8cb2905fe is described below
commit b8cb2905fe844df558f65b273d81a4c80c48bb01
Author: Freeman Fang
AuthorDate: Thu Mar 7 10:40:47 2024 -0500
update CXF 3.5.8 release notes
---
distribution/src/main/release/release_notes.txt | 37 +
1 file changed, 20 insertions(+), 17 deletions(-)
diff --git a/distribution/src/main/release/release_notes.txt
b/distribution/src/main/release/release_notes.txt
index 6a72300e97..c82dc13cd1 100644
--- a/distribution/src/main/release/release_notes.txt
+++ b/distribution/src/main/release/release_notes.txt
@@ -1,4 +1,4 @@
-Apache CXF 3.5.7 Release Notes
+Apache CXF 3.5.8 Release Notes
1. Overview
@@ -31,7 +31,7 @@ for further information and requirements for upgrading from
earlier
versions of CXF.
-3.5.7 fixes over 12 JIRA issues reported by users and the community.
+3.5.8 fixes over 13 JIRA issues reported by users and the community.
2. Installation Prerequisites
@@ -73,24 +73,27 @@ for caveats when upgrading.
7. Specific issues, features, and improvements fixed in this version
-** Sub-task
-* [CXF-8606] - Introduce HTTP/2 Transport: client-side support (Netty &
HttpClient 5)
-* [CXF-8877] - Get rid of EasyMock in cxf-rt-transports-http-netty-client
-
** Bug
-* [CXF-8881] - WSDLValidator link doesn't work
-* [CXF-8882] - Apache HttpClient 5 async conduit does not handle
authentication
-* [CXF-8884] - Update commons-jexl3 to 3.3
-* [CXF-8886] - JavaDocProvider does not work with JDK 17 and beyond
-* [CXF-8907] - java.lang.NullPointerException at
AsymmetricBindingHandler.java
-* [CXF-8918] - Upgrade xnio-nio jar to latest version (3.8.8+) to get rid
of CVE-2022-0084
-* [CXF-8920] - Can't filter when collection has attribute of type
LocalDate or LocalDateTime
-* [CXF-8925] - Logging twice in case of faults happening after pre-stream
phase in out-chain
+* [CXF-8812] - Content-Type header created with collection containing
"null" value
+* [CXF-8834] - "Operation [{.../wsdl}Issue] already exists" when calling
JaxWsServerFactoryBean.create() for SecurityTokenService
+* [CXF-8939] - java.lang.NullPointerException: Cannot invoke
"java.util.List.size()" because the return value of
"java.util.Map$Entry.getValue()" is null
+* [CXF-8940] - ws-security.must-understand works only if
security.enable.streaming is true
+* [CXF-8945] - [JAX-WS] The client out interceptor chain is not called in
case of oneway operation
+* [CXF-8955] - Custom timeout with Message.RECEIVE_TIMEOUT not working
with hc5 / hc
+* [CXF-8959] - Detect order dependent flakiness in AttachmentUtilTest.java
in core module
+* [CXF-8964] - Update Bouncycastle from unsupported xxx-jdk15on to
xxx-jdk18on
+* [CXF-8965] - Apache CXF Netty Integration, URI not encoded
+
+
+** New Feature
+* [CXF-8911] - Allow creating a custom CXFHttpAsyncResponseConsumer
+
** Improvement
-* [CXF-8457] - Provide OpenTelemetry support
-* [CXF-8802] - Update to Maven Remote Resources Plugin 3.1.0
-* [CXF-8901] - Update Guava to 32.1.1 (solving CVE-2023-2976)
+* [CXF-8928] - Reduce code quality warnings in generated code
+* [CXF-8953] - Better support of the HTTPS protocol versions used by
client/server conduits
+* [CXF-8968] - OpenTelemetryClientFeature cannot be used as a CDI bean
unless it has a no-args constructor
+
(cxf) branch 3.6.x-fixes updated: update CXF 3.6.3 release notes
This is an automated email from the ASF dual-hosted git repository. ffang pushed a commit to branch 3.6.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/3.6.x-fixes by this push: new e00f92dc76 update CXF 3.6.3 release notes e00f92dc76 is described below commit e00f92dc768cec07b6fb76463bb15c2dc16db720 Author: Freeman Fang AuthorDate: Thu Mar 7 09:45:01 2024 -0500 update CXF 3.6.3 release notes --- distribution/src/main/release/release_notes.txt | 88 + 1 file changed, 31 insertions(+), 57 deletions(-) diff --git a/distribution/src/main/release/release_notes.txt b/distribution/src/main/release/release_notes.txt index 0fe545b9dc..b3d049114c 100644 --- a/distribution/src/main/release/release_notes.txt +++ b/distribution/src/main/release/release_notes.txt @@ -1,4 +1,4 @@ -Apache CXF 3.6.2 Release Notes +Apache CXF 3.6.3 Release Notes 1. Overview @@ -24,7 +24,7 @@ http://cxf.apache.org/docs/36-migration-guide.html for further information and requirements for upgrading from earlier versions of CXF. -3.6.2 fixes over 53 issues/tasks reported by users. +3.6.3 fixes over 22 issues/tasks reported by users. 2. Installation Prerequisites @@ -66,66 +66,40 @@ for caveats when upgrading. 7. Release Notes -** Sub-task -* [CXF-8842] - Get rid of EasyMock in cxf-core -* [CXF-8843] - Get rid of EasyMock in cxf-integration-jca -* [CXF-8844] - Get rid of EasyMock in cxf-rt-bindings-coloc -* [CXF-8845] - Get rid of EasyMock in cxf-rt-bindings-corba -* [CXF-8846] - Get rid of EasyMock in cxf-rt-bindings-soap -* [CXF-8847] - Get rid of EasyMock in cxf-rt-databinding-aegis -* [CXF-8848] - Get rid of EasyMock in cxf-rt-databinding-jaxb -* [CXF-8849] - Get rid of EasyMock in cxf-rt-features-clustering -* [CXF-8850] - Get rid of EasyMock in cxf-rt-features-logging -* [CXF-8851] - Get rid of EasyMock in cxf-rt-features-throttling -* [CXF-8852] - Get rid of EasyMock in cxf-services-xkms-x509-repo-ldap -* [CXF-8853] - Get rid of EasyMock in cxf-services-xkms-x509-handlers -* [CXF-8854] - Get rid of EasyMock in cxf-rt-wsdl -* [CXF-8855] - Get rid of EasyMock in cxf-rt-ws-transfer -* [CXF-8856] - Get rid of EasyMock in cxf-rt-frontend-jaxrs -* [CXF-8857] - Get rid of EasyMock in cxf-rt-frontend-jaxws -* [CXF-8858] - Get rid of EasyMock in cxf-rt-frontend-js -* [CXF-8859] - Get rid of EasyMock in cxf-rt-ws-security -* [CXF-8860] - Get rid of EasyMock in cxf-rt-ws-rm -* [CXF-8861] - Get rid of EasyMock in cxf-rt-ws-policy -* [CXF-8862] - Get rid of EasyMock in cxf-rt-ws-addr -* [CXF-8863] - Get rid of EasyMock in cxf-rt-transports-websocket -* [CXF-8864] - Get rid of EasyMock in cxf-rt-transports-jms -* [CXF-8865] - Get rid of EasyMock in cxf-rt-management -* [CXF-8866] - Get rid of EasyMock in cxf-rt-rs-service-description -* [CXF-8867] - Get rid of EasyMock in cxf-rt-rs-client -* [CXF-8868] - Get rid of EasyMock in cxf-rt-rs-extension-providers -* [CXF-8869] - Get rid of EasyMock in cxf-rt-rs-extension-search -* [CXF-8870] - Get rid of EasyMock in cxf-rt-transports-http-undertow -* [CXF-8871] - Get rid of EasyMock in cxf-rt-rs-mp-client -* [CXF-8872] - Get rid of EasyMock in cxf-rt-rs-security-oauth2 -* [CXF-8873] - Get rid of EasyMock in cxf-rt-rs-security-oauth2-saml -* [CXF-8874] - Get rid of EasyMock in cxf-rt-rs-security-sso-oidc -* [CXF-8876] - Get rid of EasyMock in cxf-rt-transports-http-jetty -* [CXF-8877] - Get rid of EasyMock in cxf-rt-transports-http-netty-client -* [CXF-8878] - Get rid of EasyMock in cxf-rt-transports-http-netty-server -* [CXF-8890] - Get rid of EasyMock in cxf-rt-transports-http -* [CXF-8917] - Get rid of EasyMock in cxf-rt-transports-http-hc -* [CXF-8921] - Get rid of EasyMock in cxf-rt-rs-service-description-swagger - ** Bug -* [CXF-8885] - HttpClient SelectorManager threads run indefinitely causing OOM -* [CXF-8886] - JavaDocProvider does not work with JDK 17 and beyond -* [CXF-8892] - CXF build on Windows is broken (test failures) -* [CXF-8895] - Deadlock instead of timeout with new HttpClientHTTPConduit using large payloads -* [CXF-8903] - Too many open files error in HttpClientHTTPConduit -* [CXF-8905] - TransportURIResolver doesn't honor the property setting in bus -* [CXF-8907] - java.lang.NullPointerException at AsymmetricBindingHandler.java -* [CXF-8914] - No content-length header after upgrade CXF from 3.5.6 to 3.6.1 -* [CXF-8918] - Upgrade xnio-nio jar to latest version (3.8.8+) to get rid of CVE-2022-0084 -* [CXF-8920] - Can't filter when collection has attribute of type LocalDate or LocalDateTime -* [CXF-8925] - Logging twice in case of faults happening after pre-stream phase in out-chain +* [CXF-8812] - Content-Type header created with collection containing
(cxf) branch 3.6.x-fixes updated: [CXF-8984] Check for null before closing input stream (#1728)
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.6.x-fixes by this push:
new 66d5b9efd0 [CXF-8984] Check for null before closing input stream
(#1728)
66d5b9efd0 is described below
commit 66d5b9efd02243c13018fd3fcb652c8ceb037315
Author: Thomas Egli <38955561+the...@users.noreply.github.com>
AuthorDate: Wed Mar 6 19:47:18 2024 +0100
[CXF-8984] Check for null before closing input stream (#1728)
(cherry picked from commit 08fea2ea2ecb326b84a60ceb3066e6cfe3ccd83c)
---
.../java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java| 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
index 5f4d4653d4..b25777eeb3 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
@@ -817,7 +817,10 @@ public class HttpClientHTTPConduit extends
URLConnectionHTTPConduit {
@Override
protected void closeInputStream() throws IOException {
-getInputStream().close();
+InputStream is = getInputStream();
+if (is != null) {
+is.close();
+}
}
@Override
(cxf) annotated tag cxf-4.0.4 created (now c1e0b9ee38)
This is an automated email from the ASF dual-hosted git repository. ffang pushed a change to annotated tag cxf-4.0.4 in repository https://gitbox.apache.org/repos/asf/cxf.git at c1e0b9ee38 (tag) tagging 40ad2263e5c080bf3b55542bf3ee052fa7465733 (commit) replaces cxf-4.0.3 by Freeman Fang on Wed Mar 6 18:13:23 2024 -0500 - Log - [maven-release-plugin] copy for tag cxf-4.0.4 --- No new revisions were added by this update.
(cxf) 01/02: Revert "rollback version from previous failed release:prepare build"
This is an automated email from the ASF dual-hosted git repository. ffang pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git commit 3bb96d88dbdf6a82ae8281de51662599785ebba4 Author: Freeman Fang AuthorDate: Wed Mar 6 16:32:05 2024 -0500 Revert "rollback version from previous failed release:prepare build" This reverts commit 80e51f015c1165cf5c1c0b436d8c5caa35a98155. --- distribution/javadoc/pom.xml | 46 distribution/manifest/pom.xml | 94 distribution/pom.xml | 120 ++--- .../src/main/release/samples/aegis/pom.xml | 8 +- .../main/release/samples/aegis_standalone/pom.xml | 2 +- .../src/main/release/samples/callback/pom.xml | 8 +- .../samples/configuration_interceptor/pom.xml | 8 +- .../src/main/release/samples/corba/bank/pom.xml| 2 +- .../samples/corba/bank_ws_addressing/pom.xml | 2 +- .../main/release/samples/corba/hello_world/pom.xml | 10 +- .../release/samples/groovy_spring_support/pom.xml | 6 +- .../main/release/samples/in_jvm_transport/pom.xml | 10 +- .../main/release/samples/java_first_jaxws/pom.xml | 6 +- .../samples/java_first_jaxws_factory_bean/pom.xml | 6 +- .../main/release/samples/java_first_jms/pom.xml| 4 +- .../main/release/samples/java_first_pojo/pom.xml | 6 +- .../samples/java_first_spring_support/pom.xml | 6 +- .../src/main/release/samples/jax_rs/basic/pom.xml | 6 +- .../samples/jax_rs/basic_http2_jetty/pom.xml | 4 +- .../samples/jax_rs/basic_http2_netty/pom.xml | 4 +- .../samples/jax_rs/basic_http2_undertow/pom.xml| 4 +- .../release/samples/jax_rs/basic_https/pom.xml | 6 +- .../main/release/samples/jax_rs/basic_oidc/pom.xml | 8 +- .../main/release/samples/jax_rs/big_query/pom.xml | 12 +-- .../samples/jax_rs/content_negotiation/pom.xml | 8 +- .../src/main/release/samples/jax_rs/odata/pom.xml | 4 +- .../src/main/release/samples/jax_rs/search/pom.xml | 12 +-- .../release/samples/jax_rs/spring_boot/pom.xml | 6 +- .../jax_rs/spring_boot_scan/application/pom.xml| 4 +- .../samples/jax_rs/spring_boot_scan/client/pom.xml | 4 +- .../release/samples/jax_rs/spring_security/pom.xml | 6 +- .../main/release/samples/jax_rs/sse_cdi/pom.xml| 6 +- .../main/release/samples/jax_rs/sse_client/pom.xml | 6 +- .../main/release/samples/jax_rs/sse_spring/pom.xml | 4 +- .../main/release/samples/jax_rs/sse_tomcat/pom.xml | 4 +- .../release/samples/jax_rs/tracing_brave/pom.xml | 2 +- .../samples/jax_rs/tracing_micrometer/pom.xml | 12 +-- .../samples/jax_rs/tracing_opentelemetry/pom.xml | 12 +-- .../samples/jax_rs/tracing_opentracing/pom.xml | 12 +-- .../main/release/samples/jax_rs/websocket/pom.xml | 8 +- .../samples/jax_server_aegis_client/pom.xml| 8 +- .../src/main/release/samples/jaxws_async/pom.xml | 12 +-- .../samples/jaxws_dispatch_provider/pom.xml| 8 +- .../src/main/release/samples/jaxws_graalvm/pom.xml | 2 +- .../samples/jaxws_graalvm_dynamic/server/pom.xml | 2 +- .../main/release/samples/jaxws_handlers/pom.xml| 8 +- .../main/release/samples/jaxws_spring_boot/pom.xml | 4 +- .../src/main/release/samples/jms_pubsub/pom.xml| 2 +- .../src/main/release/samples/jms_queue/pom.xml | 6 +- .../src/main/release/samples/jms_spec_demo/pom.xml | 6 +- .../main/release/samples/jms_spring_config/pom.xml | 2 +- .../samples/js_browser_client_java_first/pom.xml | 8 +- .../samples/js_browser_client_simple/pom.xml | 10 +- .../src/main/release/samples/js_client/pom.xml | 10 +- .../src/main/release/samples/js_provider/pom.xml | 8 +- distribution/src/main/release/samples/mtom/pom.xml | 8 +- distribution/src/main/release/samples/pom.xml | 4 +- .../main/release/samples/restful_dispatch/pom.xml | 8 +- .../release/samples/ruby_spring_support/pom.xml| 6 +- .../src/main/release/samples/soap_header/pom.xml | 8 +- distribution/src/main/release/samples/sts/pom.xml | 16 +-- .../src/main/release/samples/throttling/pom.xml| 14 +-- .../src/main/release/samples/ws_addressing/pom.xml | 8 +- .../src/main/release/samples/ws_discovery/pom.xml | 12 +-- .../src/main/release/samples/ws_eventing/pom.xml | 10 +- .../src/main/release/samples/ws_policy/pom.xml | 8 +- .../src/main/release/samples/ws_rm/pom.xml | 10 +- .../release/samples/ws_security/sign_enc/pom.xml | 16 +-- .../samples/ws_security/sign_enc_policy/pom.xml| 12 +-- .../main/release/samples/ws_security/ut/pom.xml| 10 +- .../release/samples/ws_security/ut_policy/pom.xml | 12 +-- .../main/release/samples/ws_transaction/pom.xml| 4 +- .../src/main/release/samples/wsdl_first/pom.xml| 18 ++-- .../samples/wsdl_first_dynamic_client/pom.xml
(cxf) branch main updated (80e51f015c -> f63251ca18)
This is an automated email from the ASF dual-hosted git repository. ffang pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git from 80e51f015c rollback version from previous failed release:prepare build new 3bb96d88db Revert "rollback version from previous failed release:prepare build" new f63251ca18 correct messed up version from previous build 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: distribution/javadoc/pom.xml| 2 +- distribution/manifest/pom.xml | 2 +- distribution/pom.xml| 2 +- distribution/src/main/release/samples/aegis/pom.xml | 2 +- distribution/src/main/release/samples/aegis_standalone/pom.xml | 2 +- distribution/src/main/release/samples/callback/pom.xml | 2 +- distribution/src/main/release/samples/configuration_interceptor/pom.xml | 2 +- distribution/src/main/release/samples/corba/bank/pom.xml| 2 +- distribution/src/main/release/samples/corba/bank_ws_addressing/pom.xml | 2 +- distribution/src/main/release/samples/corba/hello_world/pom.xml | 2 +- distribution/src/main/release/samples/groovy_spring_support/pom.xml | 2 +- distribution/src/main/release/samples/in_jvm_transport/pom.xml | 2 +- distribution/src/main/release/samples/java_first_jaxws/pom.xml | 2 +- .../src/main/release/samples/java_first_jaxws_factory_bean/pom.xml | 2 +- distribution/src/main/release/samples/java_first_jms/pom.xml| 2 +- distribution/src/main/release/samples/java_first_pojo/pom.xml | 2 +- distribution/src/main/release/samples/java_first_spring_support/pom.xml | 2 +- distribution/src/main/release/samples/jax_rs/basic/pom.xml | 2 +- distribution/src/main/release/samples/jax_rs/basic_http2_jetty/pom.xml | 2 +- distribution/src/main/release/samples/jax_rs/basic_http2_netty/pom.xml | 2 +- .../src/main/release/samples/jax_rs/basic_http2_undertow/pom.xml| 2 +- distribution/src/main/release/samples/jax_rs/basic_https/pom.xml| 2 +- distribution/src/main/release/samples/jax_rs/basic_oidc/pom.xml | 2 +- distribution/src/main/release/samples/jax_rs/big_query/pom.xml | 2 +- .../src/main/release/samples/jax_rs/content_negotiation/pom.xml | 2 +- .../samples/jax_rs/description_openapi_microprofile_spring/pom.xml | 2 +- .../src/main/release/samples/jax_rs/description_openapi_v3/pom.xml | 2 +- .../main/release/samples/jax_rs/description_openapi_v3_spring/pom.xml | 2 +- .../src/main/release/samples/jax_rs/description_openapi_v3_web/pom.xml | 2 +- distribution/src/main/release/samples/jax_rs/graalvm_basic/pom.xml | 2 +- distribution/src/main/release/samples/jax_rs/odata/pom.xml | 2 +- distribution/src/main/release/samples/jax_rs/search/pom.xml | 2 +- distribution/src/main/release/samples/jax_rs/spring_boot/pom.xml| 2 +- .../main/release/samples/jax_rs/spring_boot_scan/application/pom.xml| 2 +- .../src/main/release/samples/jax_rs/spring_boot_scan/client/pom.xml | 2 +- .../release/samples/jax_rs/spring_boot_scan/eureka-registry/pom.xml | 2 +- distribution/src/main/release/samples/jax_rs/spring_security/pom.xml| 2 +- distribution/src/main/release/samples/jax_rs/sse_cdi/pom.xml| 2 +- distribution/src/main/release/samples/jax_rs/sse_client/pom.xml | 2 +- distribution/src/main/release/samples/jax_rs/sse_spring/pom.xml | 2 +- distribution/src/main/release/samples/jax_rs/sse_tomcat/pom.xml | 2 +- distribution/src/main/release/samples/jax_rs/tracing_brave/pom.xml | 2 +- distribution/src/main/release/samples/jax_rs/tracing_micrometer/pom.xml | 2 +- .../src/main/release/samples/jax_rs/tracing_opentelemetry/pom.xml | 2 +- .../src/main/release/samples/jax_rs/tracing_opentelemetry_camel/pom.xml | 2 +- .../src/main/release/samples/jax_rs/tracing_opentracing/pom.xml | 2 +- distribution/src/main/release/samples/jax_rs/websocket/pom.xml | 2 +- distribution/src/main/release/samples/jax_rs/websocket_web/pom.xml | 2 +- distribution/src/main/release/samples/jax_server_aegis_client/pom.xml | 2 +- distribution/src/main/release/samples/jaxws_async/pom.xml | 2 +- distribution/src/main/release/samples/jaxws_dispatch_provider/pom.xml | 2 +- distribution/src/main/release/samples/jaxws_graalvm/pom.xml | 2 +- .../src/main/release/samples/jaxws_graalvm_dynamic/client/pom.xml | 2 +- .../src/main/release/samples/jaxws_graalvm_dynamic/server/pom.xml
(cxf) branch main updated: rollback version from previous failed release:prepare build
This is an automated email from the ASF dual-hosted git repository. ffang pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/main by this push: new 80e51f015c rollback version from previous failed release:prepare build 80e51f015c is described below commit 80e51f015c1165cf5c1c0b436d8c5caa35a98155 Author: Freeman Fang AuthorDate: Wed Mar 6 16:23:16 2024 -0500 rollback version from previous failed release:prepare build --- distribution/javadoc/pom.xml | 46 distribution/manifest/pom.xml | 94 distribution/pom.xml | 120 ++--- .../src/main/release/samples/aegis/pom.xml | 8 +- .../main/release/samples/aegis_standalone/pom.xml | 2 +- .../src/main/release/samples/callback/pom.xml | 8 +- .../samples/configuration_interceptor/pom.xml | 8 +- .../src/main/release/samples/corba/bank/pom.xml| 2 +- .../samples/corba/bank_ws_addressing/pom.xml | 2 +- .../main/release/samples/corba/hello_world/pom.xml | 10 +- .../release/samples/groovy_spring_support/pom.xml | 6 +- .../main/release/samples/in_jvm_transport/pom.xml | 10 +- .../main/release/samples/java_first_jaxws/pom.xml | 6 +- .../samples/java_first_jaxws_factory_bean/pom.xml | 6 +- .../main/release/samples/java_first_jms/pom.xml| 4 +- .../main/release/samples/java_first_pojo/pom.xml | 6 +- .../samples/java_first_spring_support/pom.xml | 6 +- .../src/main/release/samples/jax_rs/basic/pom.xml | 6 +- .../samples/jax_rs/basic_http2_jetty/pom.xml | 4 +- .../samples/jax_rs/basic_http2_netty/pom.xml | 4 +- .../samples/jax_rs/basic_http2_undertow/pom.xml| 4 +- .../release/samples/jax_rs/basic_https/pom.xml | 6 +- .../main/release/samples/jax_rs/basic_oidc/pom.xml | 8 +- .../main/release/samples/jax_rs/big_query/pom.xml | 12 +-- .../samples/jax_rs/content_negotiation/pom.xml | 8 +- .../src/main/release/samples/jax_rs/odata/pom.xml | 4 +- .../src/main/release/samples/jax_rs/search/pom.xml | 12 +-- .../release/samples/jax_rs/spring_boot/pom.xml | 6 +- .../jax_rs/spring_boot_scan/application/pom.xml| 4 +- .../samples/jax_rs/spring_boot_scan/client/pom.xml | 4 +- .../release/samples/jax_rs/spring_security/pom.xml | 6 +- .../main/release/samples/jax_rs/sse_cdi/pom.xml| 6 +- .../main/release/samples/jax_rs/sse_client/pom.xml | 6 +- .../main/release/samples/jax_rs/sse_spring/pom.xml | 4 +- .../main/release/samples/jax_rs/sse_tomcat/pom.xml | 4 +- .../release/samples/jax_rs/tracing_brave/pom.xml | 2 +- .../samples/jax_rs/tracing_micrometer/pom.xml | 12 +-- .../samples/jax_rs/tracing_opentelemetry/pom.xml | 12 +-- .../samples/jax_rs/tracing_opentracing/pom.xml | 12 +-- .../main/release/samples/jax_rs/websocket/pom.xml | 8 +- .../samples/jax_server_aegis_client/pom.xml| 8 +- .../src/main/release/samples/jaxws_async/pom.xml | 12 +-- .../samples/jaxws_dispatch_provider/pom.xml| 8 +- .../src/main/release/samples/jaxws_graalvm/pom.xml | 2 +- .../samples/jaxws_graalvm_dynamic/server/pom.xml | 2 +- .../main/release/samples/jaxws_handlers/pom.xml| 8 +- .../main/release/samples/jaxws_spring_boot/pom.xml | 4 +- .../src/main/release/samples/jms_pubsub/pom.xml| 2 +- .../src/main/release/samples/jms_queue/pom.xml | 6 +- .../src/main/release/samples/jms_spec_demo/pom.xml | 6 +- .../main/release/samples/jms_spring_config/pom.xml | 2 +- .../samples/js_browser_client_java_first/pom.xml | 8 +- .../samples/js_browser_client_simple/pom.xml | 10 +- .../src/main/release/samples/js_client/pom.xml | 10 +- .../src/main/release/samples/js_provider/pom.xml | 8 +- distribution/src/main/release/samples/mtom/pom.xml | 8 +- distribution/src/main/release/samples/pom.xml | 4 +- .../main/release/samples/restful_dispatch/pom.xml | 8 +- .../release/samples/ruby_spring_support/pom.xml| 6 +- .../src/main/release/samples/soap_header/pom.xml | 8 +- distribution/src/main/release/samples/sts/pom.xml | 16 +-- .../src/main/release/samples/throttling/pom.xml| 14 +-- .../src/main/release/samples/ws_addressing/pom.xml | 8 +- .../src/main/release/samples/ws_discovery/pom.xml | 12 +-- .../src/main/release/samples/ws_eventing/pom.xml | 10 +- .../src/main/release/samples/ws_policy/pom.xml | 8 +- .../src/main/release/samples/ws_rm/pom.xml | 10 +- .../release/samples/ws_security/sign_enc/pom.xml | 16 +-- .../samples/ws_security/sign_enc_policy/pom.xml| 12 +-- .../main/release/samples/ws_security/ut/pom.xml| 10 +- .../release/samples/ws_security/ut_policy/pom.xml | 12 +-- .../main/release/samples/ws_transaction/pom.xml| 4 +- .../src/main/release/samples
(cxf) branch main updated: Disallowing DTDs for Aegis SourceType (#1729)
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new 667cf979a2 Disallowing DTDs for Aegis SourceType (#1729)
667cf979a2 is described below
commit 667cf979a29782191b942747da2ae6f260101003
Author: Colm O hEigeartaigh
AuthorDate: Wed Mar 6 20:31:50 2024 +
Disallowing DTDs for Aegis SourceType (#1729)
---
.../aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java | 2 ++
1 file changed, 2 insertions(+)
diff --git
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
index 81e9827412..587fe82080 100644
---
a/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
+++
b/rt/databinding/aegis/src/main/java/org/apache/cxf/aegis/type/xml/SourceType.java
@@ -104,6 +104,8 @@ public class SourceType extends AegisType {
protected XMLReader createXMLReader() throws SAXException,
ParserConfigurationException {
SAXParserFactory spf = SAXParserFactory.newInstance();
spf.setNamespaceAware(true);
+// Disable DTDs
+spf.setFeature("http://apache.org/xml/features/disallow-doctype-decl;,
true);
return spf.newSAXParser().getXMLReader();
}
(cxf) annotated tag cxf-4.0.4 deleted (was 5956dd292b)
This is an automated email from the ASF dual-hosted git repository. ffang pushed a change to annotated tag cxf-4.0.4 in repository https://gitbox.apache.org/repos/asf/cxf.git *** WARNING: tag cxf-4.0.4 was deleted! *** tag was 5956dd292b The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
(cxf) branch main updated: [maven-release-plugin] rollback the release of cxf-4.0.4
This is an automated email from the ASF dual-hosted git repository. ffang pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/main by this push: new 3d88bbb9cc [maven-release-plugin] rollback the release of cxf-4.0.4 3d88bbb9cc is described below commit 3d88bbb9cc51ac141d83dcefea4ab307c09d525f Author: Freeman Fang AuthorDate: Wed Mar 6 15:31:06 2024 -0500 [maven-release-plugin] rollback the release of cxf-4.0.4 --- bom/pom.xml | 6 +++--- core/pom.xml | 2 +- integration/cdi/pom.xml | 2 +- integration/jca/pom.xml | 2 +- integration/pom.xml | 2 +- integration/spring-boot/autoconfigure/pom.xml| 2 +- integration/spring-boot/pom.xml | 2 +- integration/spring-boot/starter-jaxrs/pom.xml| 2 +- integration/spring-boot/starter-jaxws/pom.xml| 2 +- integration/tracing/tracing-brave/pom.xml| 2 +- integration/tracing/tracing-micrometer/pom.xml | 2 +- integration/tracing/tracing-opentelemetry/pom.xml| 2 +- integration/tracing/tracing-opentracing/pom.xml | 2 +- maven-plugins/archetypes/cxf-jaxrs-service/pom.xml | 2 +- maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml | 4 ++-- maven-plugins/archetypes/cxf-jaxws-wsdlfirst/pom.xml | 2 +- maven-plugins/archetypes/pom.xml | 2 +- maven-plugins/codegen-plugin/pom.xml | 2 +- maven-plugins/corba/pom.xml | 2 +- maven-plugins/java2wadl-plugin/pom.xml | 4 ++-- maven-plugins/java2ws-plugin/pom.xml | 2 +- maven-plugins/pom.xml| 2 +- maven-plugins/wadl2java-plugin/pom.xml | 2 +- maven-plugins/wsdl-validator-plugin/pom.xml | 2 +- parent/pom.xml | 2 +- pom.xml | 2 +- rt/bindings/coloc/pom.xml| 2 +- rt/bindings/corba/pom.xml| 2 +- rt/bindings/pom.xml | 2 +- rt/bindings/soap/pom.xml | 2 +- rt/bindings/xml/pom.xml | 2 +- rt/databinding/aegis/pom.xml | 2 +- rt/databinding/jaxb/pom.xml | 2 +- rt/databinding/pom.xml | 2 +- rt/features/clustering/pom.xml | 2 +- rt/features/logging/pom.xml | 2 +- rt/features/metrics/pom.xml | 2 +- rt/features/pom.xml | 2 +- rt/features/throttling/pom.xml | 2 +- rt/frontend/jaxrs/pom.xml| 2 +- rt/frontend/jaxws/pom.xml| 2 +- rt/frontend/js/pom.xml | 2 +- rt/frontend/pom.xml | 2 +- rt/frontend/simple/pom.xml | 2 +- rt/javascript/javascript-rt/pom.xml | 2 +- rt/javascript/javascript-tests/pom.xml | 2 +- rt/javascript/pom.xml| 2 +- rt/management/pom.xml| 2 +- rt/pom.xml | 2 +- rt/rs/client/pom.xml | 2 +- rt/rs/description-common-openapi/pom.xml | 2 +- rt/rs/description-microprofile-openapi/pom.xml | 2 +- rt/rs/description-openapi-v3/pom.xml | 2 +- rt/rs/description-swagger-ui/pom.xml | 2 +- rt/rs/description/pom.xml| 2 +- rt/rs/extensions/json-basic/pom.xml | 2 +- rt/rs/extensions/providers/pom.xml | 2 +- rt/rs/extensions/reactivestreams/pom.xml | 2 +- rt/rs/extensions/reactor/pom.xml | 2 +- rt/rs/extensions/rx/pom.xml | 2 +- rt/rs/extensions/rx2/pom.xml | 2 +- rt/rs/extensions/rx3/pom.xml | 2 +- rt/rs/extensions/search/pom.xml | 2 +- rt/rs/http-sci/pom.xml | 2 +- rt/rs/microprofile-client/pom.xml| 2 +- rt/rs/pom.xml| 2 +- rt/rs/security/cors/pom.xml | 2 +- rt/rs/security/http-signature/pom.xml| 2 +- rt/rs/security/jose-parent/jose-jaxrs/pom.xml| 2 +- rt/rs/security/jose-parent/jose/pom.xml | 2 +- rt/rs/security/jose-parent/pom.xml | 2 +- rt/rs/security/oauth-parent/oauth2-saml/pom.xml | 2 +- rt/rs/security/oauth-parent/oauth2/pom.xml | 2 +- rt/rs/security
(cxf) annotated tag cxf-4.0.4 created (now 5956dd292b)
This is an automated email from the ASF dual-hosted git repository. ffang pushed a change to annotated tag cxf-4.0.4 in repository https://gitbox.apache.org/repos/asf/cxf.git at 5956dd292b (tag) tagging 52f98447a2068f9446e91e7189c2c440f2e90570 (commit) replaces cxf-4.0.3 by Freeman Fang on Wed Mar 6 15:30:16 2024 -0500 - Log - [maven-release-plugin] copy for tag cxf-4.0.4 --- No new revisions were added by this update.
(cxf) branch main updated: [maven-release-plugin] prepare release cxf-4.0.4
This is an automated email from the ASF dual-hosted git repository. ffang pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/main by this push: new 52f98447a2 [maven-release-plugin] prepare release cxf-4.0.4 52f98447a2 is described below commit 52f98447a2068f9446e91e7189c2c440f2e90570 Author: Freeman Fang AuthorDate: Wed Mar 6 15:30:10 2024 -0500 [maven-release-plugin] prepare release cxf-4.0.4 --- bom/pom.xml | 2 +- core/pom.xml | 2 +- integration/cdi/pom.xml | 2 +- integration/jca/pom.xml | 2 +- integration/pom.xml | 2 +- integration/spring-boot/autoconfigure/pom.xml| 2 +- integration/spring-boot/pom.xml | 2 +- integration/spring-boot/starter-jaxrs/pom.xml| 2 +- integration/spring-boot/starter-jaxws/pom.xml| 2 +- integration/tracing/tracing-brave/pom.xml| 2 +- integration/tracing/tracing-micrometer/pom.xml | 2 +- integration/tracing/tracing-opentelemetry/pom.xml| 2 +- integration/tracing/tracing-opentracing/pom.xml | 2 +- maven-plugins/archetypes/cxf-jaxrs-service/pom.xml | 2 +- maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml | 4 ++-- maven-plugins/archetypes/cxf-jaxws-wsdlfirst/pom.xml | 2 +- maven-plugins/archetypes/pom.xml | 2 +- maven-plugins/codegen-plugin/pom.xml | 2 +- maven-plugins/corba/pom.xml | 2 +- maven-plugins/java2wadl-plugin/pom.xml | 4 ++-- maven-plugins/java2ws-plugin/pom.xml | 2 +- maven-plugins/pom.xml| 2 +- maven-plugins/wadl2java-plugin/pom.xml | 2 +- maven-plugins/wsdl-validator-plugin/pom.xml | 2 +- parent/pom.xml | 2 +- pom.xml | 4 ++-- rt/bindings/coloc/pom.xml| 2 +- rt/bindings/corba/pom.xml| 2 +- rt/bindings/pom.xml | 2 +- rt/bindings/soap/pom.xml | 2 +- rt/bindings/xml/pom.xml | 2 +- rt/databinding/aegis/pom.xml | 2 +- rt/databinding/jaxb/pom.xml | 2 +- rt/databinding/pom.xml | 2 +- rt/features/clustering/pom.xml | 2 +- rt/features/logging/pom.xml | 2 +- rt/features/metrics/pom.xml | 2 +- rt/features/pom.xml | 2 +- rt/features/throttling/pom.xml | 2 +- rt/frontend/jaxrs/pom.xml| 2 +- rt/frontend/jaxws/pom.xml| 2 +- rt/frontend/js/pom.xml | 2 +- rt/frontend/pom.xml | 2 +- rt/frontend/simple/pom.xml | 2 +- rt/javascript/javascript-rt/pom.xml | 2 +- rt/javascript/javascript-tests/pom.xml | 2 +- rt/javascript/pom.xml| 2 +- rt/management/pom.xml| 2 +- rt/pom.xml | 2 +- rt/rs/client/pom.xml | 2 +- rt/rs/description-common-openapi/pom.xml | 2 +- rt/rs/description-microprofile-openapi/pom.xml | 2 +- rt/rs/description-openapi-v3/pom.xml | 2 +- rt/rs/description-swagger-ui/pom.xml | 2 +- rt/rs/description/pom.xml| 2 +- rt/rs/extensions/json-basic/pom.xml | 2 +- rt/rs/extensions/providers/pom.xml | 2 +- rt/rs/extensions/reactivestreams/pom.xml | 2 +- rt/rs/extensions/reactor/pom.xml | 2 +- rt/rs/extensions/rx/pom.xml | 2 +- rt/rs/extensions/rx2/pom.xml | 2 +- rt/rs/extensions/rx3/pom.xml | 2 +- rt/rs/extensions/search/pom.xml | 2 +- rt/rs/http-sci/pom.xml | 2 +- rt/rs/microprofile-client/pom.xml| 2 +- rt/rs/pom.xml| 2 +- rt/rs/security/cors/pom.xml | 2 +- rt/rs/security/http-signature/pom.xml| 2 +- rt/rs/security/jose-parent/jose-jaxrs/pom.xml| 2 +- rt/rs/security/jose-parent/jose/pom.xml | 2 +- rt/rs/security/jose-parent/pom.xml | 2 +- rt/rs/security/oauth-parent/oauth2-saml/pom.xml | 2 +- rt/rs/security/oauth-parent/oauth2/pom.xml | 2 +- rt/rs/security/oauth-parent
(cxf) branch main updated: [maven-release-plugin] rollback the release of cxf-4.0.4
This is an automated email from the ASF dual-hosted git repository. ffang pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/main by this push: new fabe346b8c [maven-release-plugin] rollback the release of cxf-4.0.4 fabe346b8c is described below commit fabe346b8c16eebb27e097ec04bea5a3d0e60f9c Author: Freeman Fang AuthorDate: Wed Mar 6 14:55:24 2024 -0500 [maven-release-plugin] rollback the release of cxf-4.0.4 --- bom/pom.xml | 2 +- core/pom.xml | 2 +- integration/cdi/pom.xml | 2 +- integration/jca/pom.xml | 2 +- integration/pom.xml | 2 +- integration/spring-boot/autoconfigure/pom.xml| 2 +- integration/spring-boot/pom.xml | 2 +- integration/spring-boot/starter-jaxrs/pom.xml| 2 +- integration/spring-boot/starter-jaxws/pom.xml| 2 +- integration/tracing/tracing-brave/pom.xml| 2 +- integration/tracing/tracing-micrometer/pom.xml | 2 +- integration/tracing/tracing-opentelemetry/pom.xml| 2 +- integration/tracing/tracing-opentracing/pom.xml | 2 +- maven-plugins/archetypes/cxf-jaxrs-service/pom.xml | 2 +- maven-plugins/archetypes/cxf-jaxws-javafirst/pom.xml | 4 ++-- maven-plugins/archetypes/cxf-jaxws-wsdlfirst/pom.xml | 2 +- maven-plugins/archetypes/pom.xml | 2 +- maven-plugins/codegen-plugin/pom.xml | 2 +- maven-plugins/corba/pom.xml | 2 +- maven-plugins/java2wadl-plugin/pom.xml | 4 ++-- maven-plugins/java2ws-plugin/pom.xml | 2 +- maven-plugins/pom.xml| 2 +- maven-plugins/wadl2java-plugin/pom.xml | 2 +- maven-plugins/wsdl-validator-plugin/pom.xml | 2 +- parent/pom.xml | 2 +- pom.xml | 4 ++-- rt/bindings/coloc/pom.xml| 2 +- rt/bindings/corba/pom.xml| 2 +- rt/bindings/pom.xml | 2 +- rt/bindings/soap/pom.xml | 2 +- rt/bindings/xml/pom.xml | 2 +- rt/databinding/aegis/pom.xml | 2 +- rt/databinding/jaxb/pom.xml | 2 +- rt/databinding/pom.xml | 2 +- rt/features/clustering/pom.xml | 2 +- rt/features/logging/pom.xml | 2 +- rt/features/metrics/pom.xml | 2 +- rt/features/pom.xml | 2 +- rt/features/throttling/pom.xml | 2 +- rt/frontend/jaxrs/pom.xml| 2 +- rt/frontend/jaxws/pom.xml| 2 +- rt/frontend/js/pom.xml | 2 +- rt/frontend/pom.xml | 2 +- rt/frontend/simple/pom.xml | 2 +- rt/javascript/javascript-rt/pom.xml | 2 +- rt/javascript/javascript-tests/pom.xml | 2 +- rt/javascript/pom.xml| 2 +- rt/management/pom.xml| 2 +- rt/pom.xml | 2 +- rt/rs/client/pom.xml | 2 +- rt/rs/description-common-openapi/pom.xml | 2 +- rt/rs/description-microprofile-openapi/pom.xml | 2 +- rt/rs/description-openapi-v3/pom.xml | 2 +- rt/rs/description-swagger-ui/pom.xml | 2 +- rt/rs/description/pom.xml| 2 +- rt/rs/extensions/json-basic/pom.xml | 2 +- rt/rs/extensions/providers/pom.xml | 2 +- rt/rs/extensions/reactivestreams/pom.xml | 2 +- rt/rs/extensions/reactor/pom.xml | 2 +- rt/rs/extensions/rx/pom.xml | 2 +- rt/rs/extensions/rx2/pom.xml | 2 +- rt/rs/extensions/rx3/pom.xml | 2 +- rt/rs/extensions/search/pom.xml | 2 +- rt/rs/http-sci/pom.xml | 2 +- rt/rs/microprofile-client/pom.xml| 2 +- rt/rs/pom.xml| 2 +- rt/rs/security/cors/pom.xml | 2 +- rt/rs/security/http-signature/pom.xml| 2 +- rt/rs/security/jose-parent/jose-jaxrs/pom.xml| 2 +- rt/rs/security/jose-parent/jose/pom.xml | 2 +- rt/rs/security/jose-parent/pom.xml | 2 +- rt/rs/security/oauth-parent/oauth2-saml/pom.xml | 2 +- rt/rs/security/oauth-parent/oauth2/pom.xml | 2 +- rt/rs/security
(cxf) branch main updated: update release_notes
This is an automated email from the ASF dual-hosted git repository. ffang pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/main by this push: new 89db1096de update release_notes 89db1096de is described below commit 89db1096de8842a084a58714dafc068fd4a11fbd Author: Freeman Fang AuthorDate: Wed Mar 6 14:07:18 2024 -0500 update release_notes --- distribution/src/main/release/release_notes.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/distribution/src/main/release/release_notes.txt b/distribution/src/main/release/release_notes.txt index b365944190..b5ea85fdd2 100644 --- a/distribution/src/main/release/release_notes.txt +++ b/distribution/src/main/release/release_notes.txt @@ -84,6 +84,7 @@ for caveats when upgrading. * [CXF-8965] - Apache CXF Netty Integration, URI not encoded * [CXF-8978] - Codegen plugin fails with IBM JDK * [CXF-8983] - cxf-services-sts-core should depend on cxf-rt-rs-security-jose instead of cxf-rt-rs-security-jose-jaxrs +* [CXF-8984] - HttpClientHTTPConduit.HttpClientWrappedOutputStream throws NPE in closeInputStream() ** New Feature
(cxf) branch main updated: [CXF-8984] Check for null before closing input stream (#1728)
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new 08fea2ea2e [CXF-8984] Check for null before closing input stream
(#1728)
08fea2ea2e is described below
commit 08fea2ea2ecb326b84a60ceb3066e6cfe3ccd83c
Author: Thomas Egli <38955561+the...@users.noreply.github.com>
AuthorDate: Wed Mar 6 19:47:18 2024 +0100
[CXF-8984] Check for null before closing input stream (#1728)
---
.../java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java| 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
index 5f4d4653d4..b25777eeb3 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
@@ -817,7 +817,10 @@ public class HttpClientHTTPConduit extends
URLConnectionHTTPConduit {
@Override
protected void closeInputStream() throws IOException {
-getInputStream().close();
+InputStream is = getInputStream();
+if (is != null) {
+is.close();
+}
}
@Override
(cxf) branch main updated (ea25bfc07e -> 65ed0403a0)
This is an automated email from the ASF dual-hosted git repository. ffang pushed a change to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git from ea25bfc07e update release notes new c252e7cd86 Revert "[maven-release-plugin] prepare for next development iteration" new 65ed0403a0 Revert "[maven-release-plugin] prepare release cxf-4.0.4" 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: bom/pom.xml | 2 +- core/pom.xml | 2 +- distribution/javadoc/pom.xml | 2 +- distribution/manifest/pom.xml| 2 +- distribution/pom.xml | 2 +- distribution/src/main/release/samples/aegis/pom.xml | 10 +- .../src/main/release/samples/aegis_standalone/pom.xml| 4 ++-- distribution/src/main/release/samples/callback/pom.xml | 8 .../release/samples/configuration_interceptor/pom.xml| 8 distribution/src/main/release/samples/corba/bank/pom.xml | 2 +- .../release/samples/corba/bank_ws_addressing/pom.xml | 2 +- .../src/main/release/samples/corba/hello_world/pom.xml | 8 .../main/release/samples/groovy_spring_support/pom.xml | 2 +- .../src/main/release/samples/in_jvm_transport/pom.xml| 10 +- .../src/main/release/samples/java_first_jaxws/pom.xml| 2 +- .../samples/java_first_jaxws_factory_bean/pom.xml| 8 .../src/main/release/samples/java_first_jms/pom.xml | 6 +++--- .../src/main/release/samples/java_first_pojo/pom.xml | 8 .../release/samples/java_first_spring_support/pom.xml| 2 +- .../src/main/release/samples/jax_rs/basic/pom.xml| 8 .../release/samples/jax_rs/basic_http2_jetty/pom.xml | 2 +- .../release/samples/jax_rs/basic_http2_netty/pom.xml | 2 +- .../release/samples/jax_rs/basic_http2_undertow/pom.xml | 2 +- .../src/main/release/samples/jax_rs/basic_https/pom.xml | 2 +- .../src/main/release/samples/jax_rs/basic_oidc/pom.xml | 2 +- .../src/main/release/samples/jax_rs/big_query/pom.xml| 2 +- .../release/samples/jax_rs/content_negotiation/pom.xml | 10 +- .../description_openapi_microprofile_spring/pom.xml | 2 +- .../samples/jax_rs/description_openapi_v3/pom.xml| 2 +- .../samples/jax_rs/description_openapi_v3_spring/pom.xml | 2 +- .../samples/jax_rs/description_openapi_v3_web/pom.xml| 2 +- .../main/release/samples/jax_rs/graalvm_basic/pom.xml| 2 +- .../src/main/release/samples/jax_rs/odata/pom.xml| 2 +- .../src/main/release/samples/jax_rs/search/pom.xml | 14 +++--- .../src/main/release/samples/jax_rs/spring_boot/pom.xml | 2 +- .../samples/jax_rs/spring_boot_scan/application/pom.xml | 2 +- .../samples/jax_rs/spring_boot_scan/client/pom.xml | 2 +- .../jax_rs/spring_boot_scan/eureka-registry/pom.xml | 2 +- .../main/release/samples/jax_rs/spring_security/pom.xml | 8 .../src/main/release/samples/jax_rs/sse_cdi/pom.xml | 2 +- .../src/main/release/samples/jax_rs/sse_client/pom.xml | 2 +- .../src/main/release/samples/jax_rs/sse_spring/pom.xml | 2 +- .../src/main/release/samples/jax_rs/sse_tomcat/pom.xml | 2 +- .../main/release/samples/jax_rs/tracing_brave/pom.xml| 4 ++-- .../release/samples/jax_rs/tracing_micrometer/pom.xml| 14 +++--- .../release/samples/jax_rs/tracing_opentelemetry/pom.xml | 14 +++--- .../samples/jax_rs/tracing_opentelemetry_camel/pom.xml | 2 +- .../release/samples/jax_rs/tracing_opentracing/pom.xml | 14 +++--- .../src/main/release/samples/jax_rs/websocket/pom.xml| 10 +- .../main/release/samples/jax_rs/websocket_web/pom.xml| 2 +- .../main/release/samples/jax_server_aegis_client/pom.xml | 10 +- .../src/main/release/samples/jaxws_async/pom.xml | 10 +- .../main/release/samples/jaxws_dispatch_provider/pom.xml | 8 .../src/main/release/samples/jaxws_graalvm/pom.xml | 2 +- .../release/samples/jaxws_graalvm_dynamic/client/pom.xml | 2 +- .../release/samples/jaxws_graalvm_dynamic/server/pom.xml | 2 +- .../src/main/release/samples/jaxws_handlers/pom.xml | 8 .../src/main/release/samples/jaxws_spring_boot/pom.xml | 2 +- distribution/src/main/release/samples/jms_pubsub/pom.xml | 4 ++-- distribution/src/main/release/samples/jms_queue/pom.xml | 6 +++--- .../src/main/release/samples/jms_spec_demo/pom.xml | 6 +++--- .../src/main/release/samples/jms_spring_config/pom.xml | 2 +- .../release/samples/js_browser_client_java_first/pom.
(cxf) annotated tag cxf-4.0.4 deleted (was 1a9b73469e)
This is an automated email from the ASF dual-hosted git repository. ffang pushed a change to annotated tag cxf-4.0.4 in repository https://gitbox.apache.org/repos/asf/cxf.git *** WARNING: tag cxf-4.0.4 was deleted! *** tag was 1a9b73469e The revisions that were on this annotated tag are still contained in other references; therefore, this change does not discard any commits from the repository.
(cxf) branch main updated: update release notes
This is an automated email from the ASF dual-hosted git repository. ffang pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/main by this push: new ea25bfc07e update release notes ea25bfc07e is described below commit ea25bfc07ebaca6f10e32bd04ad4d7683f98746b Author: Freeman Fang AuthorDate: Wed Mar 6 11:13:05 2024 -0500 update release notes --- distribution/src/main/release/release_notes.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/distribution/src/main/release/release_notes.txt b/distribution/src/main/release/release_notes.txt index cb09902bbf..b365944190 100644 --- a/distribution/src/main/release/release_notes.txt +++ b/distribution/src/main/release/release_notes.txt @@ -83,6 +83,7 @@ for caveats when upgrading. * [CXF-8964] - Update Bouncycastle from unsupported xxx-jdk15on to xxx-jdk18on * [CXF-8965] - Apache CXF Netty Integration, URI not encoded * [CXF-8978] - Codegen plugin fails with IBM JDK +* [CXF-8983] - cxf-services-sts-core should depend on cxf-rt-rs-security-jose instead of cxf-rt-rs-security-jose-jaxrs ** New Feature
(cxf) annotated tag cxf-4.0.4 created (now 1a9b73469e)
This is an automated email from the ASF dual-hosted git repository. ffang pushed a change to annotated tag cxf-4.0.4 in repository https://gitbox.apache.org/repos/asf/cxf.git at 1a9b73469e (tag) tagging f88b9bf2bc5121a8b8ed0629ff7685c2b1b447a1 (commit) replaces cxf-4.0.3 by Freeman Fang on Tue Mar 5 14:59:41 2024 -0500 - Log - [maven-release-plugin] copy for tag cxf-4.0.4 --- No new revisions were added by this update.
(cxf) branch main updated: make release preparation goals configurable
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new 9730f744e6 make release preparation goals configurable
9730f744e6 is described below
commit 9730f744e655d4c9ec2011876d287875d4a7e285
Author: Freeman Fang
AuthorDate: Tue Mar 5 14:00:50 2024 -0500
make release preparation goals configurable
---
pom.xml | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 515cc73b9c..6de8883129 100644
--- a/pom.xml
+++ b/pom.xml
@@ -46,6 +46,7 @@
UTF-8
scp://people.apache.org/www/cxf.apache.org/maven-site
9.0.9
+clean install
@@ -456,7 +457,7 @@
3.0.1
false
-clean install
+
${preparationGoals}
deploy
-Prelease,deploy
true
(cxf) branch main updated: remove SNAPSHOT version
This is an automated email from the ASF dual-hosted git repository. ffang pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/main by this push: new 7a503ee7c7 remove SNAPSHOT version 7a503ee7c7 is described below commit 7a503ee7c7a9cdb3068930a24f9f2b1dd4992825 Author: Freeman Fang AuthorDate: Tue Mar 5 10:24:55 2024 -0500 remove SNAPSHOT version --- rt/ws/security/pom.xml | 1 - 1 file changed, 1 deletion(-) diff --git a/rt/ws/security/pom.xml b/rt/ws/security/pom.xml index 1279ef0ff1..535e3dc289 100644 --- a/rt/ws/security/pom.xml +++ b/rt/ws/security/pom.xml @@ -114,7 +114,6 @@ org.apache.wss4j wss4j-policy -3.0.3-SNAPSHOT org.codehaus.woodstox
(cxf) branch main updated: Update release notes for 4.0.4
This is an automated email from the ASF dual-hosted git repository. ffang pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/main by this push: new bd1d7aef9a Update release notes for 4.0.4 bd1d7aef9a is described below commit bd1d7aef9a66b19ae04db0d355273c49dee29cdd Author: Freeman Fang AuthorDate: Tue Mar 5 08:59:40 2024 -0500 Update release notes for 4.0.4 --- distribution/src/main/release/release_notes.txt | 97 ++--- 1 file changed, 39 insertions(+), 58 deletions(-) diff --git a/distribution/src/main/release/release_notes.txt b/distribution/src/main/release/release_notes.txt index 49bd7a522a..cb09902bbf 100644 --- a/distribution/src/main/release/release_notes.txt +++ b/distribution/src/main/release/release_notes.txt @@ -1,4 +1,4 @@ -Apache CXF 4.0.3 Release Notes +Apache CXF 4.0.4 Release Notes 1. Overview @@ -21,7 +21,7 @@ for further information and requirements for upgrading from earlier versions of CXF. -4.0.3 fixes over 54 JIRA issues reported by users and the community. +4.0.4 fixes over 28 JIRA issues reported by users and the community. 2. Installation Prerequisites @@ -63,67 +63,48 @@ for caveats when upgrading. 7. Specific issues, features, and improvements fixed in this version -** Sub-task -* [CXF-8842] - Get rid of EasyMock in cxf-core -* [CXF-8843] - Get rid of EasyMock in cxf-integration-jca -* [CXF-8844] - Get rid of EasyMock in cxf-rt-bindings-coloc -* [CXF-8845] - Get rid of EasyMock in cxf-rt-bindings-corba -* [CXF-8846] - Get rid of EasyMock in cxf-rt-bindings-soap -* [CXF-8847] - Get rid of EasyMock in cxf-rt-databinding-aegis -* [CXF-8848] - Get rid of EasyMock in cxf-rt-databinding-jaxb -* [CXF-8849] - Get rid of EasyMock in cxf-rt-features-clustering -* [CXF-8850] - Get rid of EasyMock in cxf-rt-features-logging -* [CXF-8851] - Get rid of EasyMock in cxf-rt-features-throttling -* [CXF-8852] - Get rid of EasyMock in cxf-services-xkms-x509-repo-ldap -* [CXF-8853] - Get rid of EasyMock in cxf-services-xkms-x509-handlers -* [CXF-8854] - Get rid of EasyMock in cxf-rt-wsdl -* [CXF-8855] - Get rid of EasyMock in cxf-rt-ws-transfer -* [CXF-8856] - Get rid of EasyMock in cxf-rt-frontend-jaxrs -* [CXF-8857] - Get rid of EasyMock in cxf-rt-frontend-jaxws -* [CXF-8858] - Get rid of EasyMock in cxf-rt-frontend-js -* [CXF-8859] - Get rid of EasyMock in cxf-rt-ws-security -* [CXF-8860] - Get rid of EasyMock in cxf-rt-ws-rm -* [CXF-8861] - Get rid of EasyMock in cxf-rt-ws-policy -* [CXF-8862] - Get rid of EasyMock in cxf-rt-ws-addr -* [CXF-8863] - Get rid of EasyMock in cxf-rt-transports-websocket -* [CXF-8864] - Get rid of EasyMock in cxf-rt-transports-jms -* [CXF-8865] - Get rid of EasyMock in cxf-rt-management -* [CXF-8866] - Get rid of EasyMock in cxf-rt-rs-service-description -* [CXF-8867] - Get rid of EasyMock in cxf-rt-rs-client -* [CXF-8868] - Get rid of EasyMock in cxf-rt-rs-extension-providers -* [CXF-8869] - Get rid of EasyMock in cxf-rt-rs-extension-search -* [CXF-8870] - Get rid of EasyMock in cxf-rt-transports-http-undertow -* [CXF-8871] - Get rid of EasyMock in cxf-rt-rs-mp-client -* [CXF-8872] - Get rid of EasyMock in cxf-rt-rs-security-oauth2 -* [CXF-8873] - Get rid of EasyMock in cxf-rt-rs-security-oauth2-saml -* [CXF-8874] - Get rid of EasyMock in cxf-rt-rs-security-sso-oidc -* [CXF-8876] - Get rid of EasyMock in cxf-rt-transports-http-jetty -* [CXF-8877] - Get rid of EasyMock in cxf-rt-transports-http-netty-client -* [CXF-8878] - Get rid of EasyMock in cxf-rt-transports-http-netty-server -* [CXF-8890] - Get rid of EasyMock in cxf-rt-transports-http ** Bug -* [CXF-8885] - HttpClient SelectorManager threads run indefinitely causing OOM -* [CXF-8886] - JavaDocProvider does not work with JDK 17 and beyond -* [CXF-8889] - Compilation of CXF fails due to a "jakarta..." vs. "javax..." issue. -* [CXF-8892] - CXF build on Windows is broken (test failures) -* [CXF-8895] - Deadlock instead of timeout with new HttpClientHTTPConduit using large payloads -* [CXF-8896] - http client sends some strange HTTP/1.1 and HTTP/2 mix headers -* [CXF-8903] - Too many open files error in HttpClientHTTPConduit -* [CXF-8905] - TransportURIResolver doesn't honor the property setting in bus -* [CXF-8907] - java.lang.NullPointerException at AsymmetricBindingHandler.java -* [CXF-8914] - No content-length header after upgrade CXF from 3.5.6 to 3.6.1 -* [CXF-8919] - JAXRSUtils references javax.activation.Datasource -* [CXF-8920] - Can't filter when collection has attribute of type LocalDate or LocalDateTime -* [CXF-8925] - Logging twice in case of faults happening after pre-stream phase in out-chain +* [CXF-8812] - Content
(cxf) branch main updated: [CXF-8981] Added unit tests for key agreement method (#1715)
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new 354f09f05e [CXF-8981] Added unit tests for key agreement method
(#1715)
354f09f05e is described below
commit 354f09f05ef61722e9d62f5c6c4fb777d7ef9c97
Author: jrihtarsic
AuthorDate: Tue Mar 5 14:55:06 2024 +0100
[CXF-8981] Added unit tests for key agreement method (#1715)
* [CXF-8981] Added unit tests for key agreement method with WSS4j
interceptors
* Add documentation to WSS4JInOutWithAttachmentsTest
* Ensure that added tests builds with JDK 11+
-
Co-authored-by: RIHTARSIC Joze
---
.../ws/security/wss4j/AbstractSecurityTest.java| 9 +
.../cxf/ws/security/wss4j/TestPwdCallback.java | 5 +
.../cxf/ws/security/wss4j/WSS4JInOutTest.java | 86 ++
.../wss4j/WSS4JInOutWithAttachmentsTest.java | 289 +
.../cxf/ws/security/wss4j/edeliver-as4-clean.xml | 62 +
rt/ws/security/src/test/resources/wss-ecdh.p12 | Bin 0 -> 8299 bytes
.../src/test/resources/wss-ecdh.properties | 4 +
7 files changed, 455 insertions(+)
diff --git
a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractSecurityTest.java
b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractSecurityTest.java
index 3e06e36783..d62b314520 100644
---
a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractSecurityTest.java
+++
b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/AbstractSecurityTest.java
@@ -171,4 +171,13 @@ public abstract class AbstractSecurityTest extends
AbstractCXFTest {
}
}
}
+
+protected int getJDKVersion() {
+try {
+return Integer.getInteger("java.specification.version", 0);
+} catch (NumberFormatException ex) {
+// ignore
+}
+return 0;
+}
}
diff --git
a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/TestPwdCallback.java
b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/TestPwdCallback.java
index eb233a9ab6..1ad166fcd8 100644
---
a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/TestPwdCallback.java
+++
b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/TestPwdCallback.java
@@ -36,6 +36,11 @@ public class TestPwdCallback implements CallbackHandler {
passwords.put("myalias", "myAliasPassword");
passwords.put("alice", "alicePassword");
passwords.put("username", "myAliasPassword");
+passwords.put("x448", "security");
+passwords.put("x25519", "security");
+passwords.put("secp256r1", "security");
+passwords.put("secp384r1", "security");
+passwords.put("secp521r1", "security");
}
public void handle(Callback[] callbacks) throws IOException,
UnsupportedCallbackException {
diff --git
a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
index bd3488a6b3..9404bfd78f 100644
---
a/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
+++
b/rt/ws/security/src/test/java/org/apache/cxf/ws/security/wss4j/WSS4JInOutTest.java
@@ -55,7 +55,10 @@ import org.apache.wss4j.dom.WSDataRef;
import org.apache.wss4j.dom.engine.WSSecurityEngineResult;
import org.apache.wss4j.dom.handler.WSHandlerConstants;
import org.apache.wss4j.dom.handler.WSHandlerResult;
+import org.apache.xml.security.utils.Constants;
+import org.apache.xml.security.utils.EncryptionConstants;
+import org.junit.Assume;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
@@ -70,6 +73,9 @@ import static org.junit.Assert.fail;
public class WSS4JInOutTest extends AbstractSecurityTest {
public WSS4JInOutTest() {
+// add xenc11 and dsig11 namespaces
+testUtilities.addNamespace("xenc11",
EncryptionConstants.EncryptionSpec11NS);
+testUtilities.addNamespace("dsig11", Constants.SignatureSpec11NS);
}
@Test
@@ -191,6 +197,86 @@ public class WSS4JInOutTest extends AbstractSecurityTest {
);
}
+@Test
+public void testEncryptionWithAgreementMethodsX448() throws Exception {
+Assume.assumeTrue(getJDKVersion() >= 16);
+testEncryptionWithAgreementMethod("x448",
"//dsig11:DEREncodedKeyValue");
+}
+
+@Test
+public void testEncryptionWithAgreementMethodsX25519() throws Exception {
+Assume.assumeTrue(getJDKVersion() >= 16);
+testEncryptionWithAgreem
(cxf) branch 3.6.x-fixes updated: correct wrong package name
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.6.x-fixes by this push:
new 1a13214e84 correct wrong package name
1a13214e84 is described below
commit 1a13214e84bcc48e2a893acfb0127a370d75406d
Author: Freeman Fang
AuthorDate: Mon Mar 4 21:55:35 2024 -0500
correct wrong package name
---
.../test/java/org/apache/cxf/systest/jaxrs/EmptyBookStore.java | 10 +-
.../cxf/systest/jaxrs/JAXRSClientServerEmptyBookTest.java | 3 ++-
2 files changed, 7 insertions(+), 6 deletions(-)
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/EmptyBookStore.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/EmptyBookStore.java
index e0131aa855..02a2872a2e 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/EmptyBookStore.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/EmptyBookStore.java
@@ -19,11 +19,11 @@
package org.apache.cxf.systest.jaxrs;
-import jakarta.ws.rs.DELETE;
-import jakarta.ws.rs.GET;
-import jakarta.ws.rs.Path;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.HttpHeaders;
+import javax.ws.rs.DELETE;
+import javax.ws.rs.GET;
+import javax.ws.rs.Path;
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.HttpHeaders;
@Path("/bookstore")
public class EmptyBookStore {
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerEmptyBookTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerEmptyBookTest.java
index 04859f4351..77e2ee6177 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerEmptyBookTest.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSClientServerEmptyBookTest.java
@@ -19,7 +19,8 @@
package org.apache.cxf.systest.jaxrs;
-import jakarta.ws.rs.core.Response;
+import javax.ws.rs.core.Response;
+
import org.apache.cxf.Bus;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
(cxf) branch 3.6.x-fixes updated: CXF-8962: HttpClientHTTPConduit sets Content-Type Header for DELETE requests with empty body (#1699)
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.6.x-fixes by this push:
new 445ef65a57 CXF-8962: HttpClientHTTPConduit sets Content-Type Header
for DELETE requests with empty body (#1699)
445ef65a57 is described below
commit 445ef65a572e13e94b38e3087449fdb7a1eea1a1
Author: Andriy Redko
AuthorDate: Mon Mar 4 20:10:56 2024 -0500
CXF-8962: HttpClientHTTPConduit sets Content-Type Header for DELETE
requests with empty body (#1699)
(cherry picked from commit d0ac9fb5d4717c77134764cf45eb72292f3e7f5f)
---
.../org/apache/cxf/transport/http/Headers.java | 2 +-
.../cxf/transport/http/HttpClientHTTPConduit.java | 21 +++-
.../apache/cxf/systest/jaxrs/EmptyBookServer.java | 46
.../apache/cxf/systest/jaxrs/EmptyBookStore.java | 46
.../jaxrs/JAXRSClientServerEmptyBookTest.java | 63 ++
5 files changed, 175 insertions(+), 3 deletions(-)
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
index 59ba141089..fccd803cdc 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/Headers.java
@@ -67,7 +67,7 @@ public class Headers {
public static final String HTTP_HEADERS_LINK = "Link";
public static final String EMPTY_REQUEST_PROPERTY =
"org.apache.cxf.empty.request";
public static final String USER_AGENT = initUserAgent();
-private static final String SET_EMPTY_REQUEST_CT_PROPERTY =
"set.content.type.for.empty.request";
+public static final String SET_EMPTY_REQUEST_CT_PROPERTY =
"set.content.type.for.empty.request";
private static final TimeZone TIME_ZONE_GMT = TimeZone.getTimeZone("GMT");
private static final Logger LOG = LogUtils.getL7dLogger(Headers.class);
diff --git
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
index e5d26d2c60..5f4d4653d4 100644
---
a/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
+++
b/rt/transports/http/src/main/java/org/apache/cxf/transport/http/HttpClientHTTPConduit.java
@@ -567,9 +567,26 @@ public class HttpClientHTTPConduit extends
URLConnectionHTTPConduit {
}
if (!h.headerMap().containsKey("User-Agent")) {
rb.header("User-Agent", Headers.USER_AGENT);
-}
+}
+
if (hasCT ||
!KNOWN_HTTP_VERBS_WITH_NO_CONTENT.contains(outMessage.get(Message.HTTP_REQUEST_METHOD)))
{
-rb.header(HttpHeaderHelper.CONTENT_TYPE,
h.determineContentType());
+boolean dropContentType = false;
+boolean emptyRequest =
PropertyUtils.isTrue(outMessage.get(Headers.EMPTY_REQUEST_PROPERTY));
+
+// If it is an empty request (without a request body) then
check further if CT still needs be set
+if (emptyRequest) {
+final Object setCtForEmptyRequestProp = outMessage
+
.getContextualProperty(Headers.SET_EMPTY_REQUEST_CT_PROPERTY);
+if (setCtForEmptyRequestProp != null) {
+// If SET_EMPTY_REQUEST_CT_PROPERTY is set then do as
a user prefers.
+// CT will be dropped if setting CT for empty requests
was explicitly disabled
+dropContentType =
PropertyUtils.isFalse(setCtForEmptyRequestProp);
+}
+}
+
+if (!dropContentType) {
+rb.header(HttpHeaderHelper.CONTENT_TYPE,
h.determineContentType());
+}
}
}
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/EmptyBookServer.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/EmptyBookServer.java
new file mode 100644
index 00..e22b8ff883
--- /dev/null
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/EmptyBookServer.java
@@ -0,0 +1,46 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless re
(cxf) branch main updated: Introduction of CustomAlgorithmSuite (CXF-8971) (#1660)
This is an automated email from the ASF dual-hosted git repository. ffang pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cxf.git The following commit(s) were added to refs/heads/main by this push: new 4b3960caec Introduction of CustomAlgorithmSuite (CXF-8971) (#1660) 4b3960caec is described below commit 4b3960caec2a05084bc965976a30b8ddcc513233 Author: JiriOndrusek AuthorDate: Mon Feb 26 15:52:20 2024 +0100 Introduction of CustomAlgorithmSuite (CXF-8971) (#1660) --- parent/pom.xml | 2 +- rt/ws/security/pom.xml | 1 + .../apache/cxf/ws/security/SecurityConstants.java | 103 ++- .../policy/custom/DefaultAlgorithmSuiteLoader.java | 128 + .../security/wss4j/AlgorithmSuiteTranslater.java | 49 +++-- .../wss4j/PolicyBasedWSS4JInInterceptor.java | 9 +- .../wss4j/PolicyBasedWSS4JOutInterceptor.java | 15 ++ .../wss4j/PolicyBasedWSS4JStaxInInterceptor.java | 32 +++- .../StaxAsymmetricBindingHandler.java | 5 + .../StaxSymmetricBindingHandler.java | 5 + .../AlgorithmSuitePolicyValidator.java | 5 + .../policy/custom/CustomAlgorithmLoaderTest.java | 169 ++ systests/ws-security/generate-certs.sh | 53 ++ .../WSSecurity10CustomAlgorithmSuiteTest.java | 198 + .../ws/wssec10/server/Custom10SignEncrypt01.java | 30 .../wssec10/server/ServerCustomAlgorithmSuite.java | 39 .../server/StaxServerCustomAlgorithmSuite.java | 40 + .../test/resources/alice-customAlgSuite.properties | 21 +++ .../test/resources/bob-customAlgSuite.properties | 21 +++ .../src/test/resources/certs/alice.pkcs12 | Bin 0 -> 5737 bytes .../src/test/resources/certs/bob.pkcs12| Bin 0 -> 5733 bytes .../ws/wssec10/client_customAlgorithmSuite.xml | 92 ++ .../ws/wssec10/server_customAlgorithmSuite.xml | 115 .../wssec10/stax-server_customAlgorithmSuite.xml | 119 + .../wssec10/WsSecurity10_customAlgorithmSuite.wsdl | 66 +++ .../wssec10/WsSecurity10_policy.wsdl | 2 +- .../WsSecurity10_policy_customAlgorithmSuite.wsdl | 178 ++ systests/ws-security/v3.ext| 3 + 28 files changed, 1476 insertions(+), 24 deletions(-) diff --git a/parent/pom.xml b/parent/pom.xml index 893dbe8582..e175a432b7 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -235,7 +235,7 @@ 6.6.0 4.2.1 1.6.3 -3.0.2 +3.0.3-SNAPSHOT 2.3.1 3.8.13.Final 2.1 diff --git a/rt/ws/security/pom.xml b/rt/ws/security/pom.xml index 535e3dc289..1279ef0ff1 100644 --- a/rt/ws/security/pom.xml +++ b/rt/ws/security/pom.xml @@ -114,6 +114,7 @@ org.apache.wss4j wss4j-policy +3.0.3-SNAPSHOT org.codehaus.woodstox diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java index 687a141e29..56848594f9 100644 --- a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java +++ b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/SecurityConstants.java @@ -202,7 +202,7 @@ public final class SecurityConstants extends org.apache.cxf.rt.security.Security * default instance that is used is the EHCacheReplayCache. */ public static final String NONCE_CACHE_INSTANCE = -"ws-security.nonce.cache.instance"; +"ws-security.nonce.cache.instance"; /** * This holds a reference to a ReplayCache instance used to cache Timestamp Created Strings. The @@ -406,6 +406,94 @@ public final class SecurityConstants extends org.apache.cxf.rt.security.Security */ public static final String KERBEROS_CLIENT = "ws-security.kerberos.client"; +/** + * Prefix of all constants meant to change customAlgSuite. + */ +public static final String CUSTOM_ALG_SUITE_PREFIX = "ws-security.custom.alg.suite."; + +/** + * Default value is: http://www.w3.org/2001/04/xmlenc#sha256 + */ +public static final String CUSTOM_ALG_SUITE_DIGEST_ALGORITHM = "ws-security.custom.alg.suite.digest.algorithm"; + +/** + * Default value is: http://www.w3.org/2009/xmlenc11#aes256-gcm + */ +public static final String CUSTOM_ALG_SUITE_ENCRYPTION_ALGORITHM = +"ws-security.custom.alg.suite.encryption.algorithm"; + +/** + * Default value is: http://www.w3.org/2001/04/xmlenc#kw-aes256 + */ +public static final String CUSTOM_ALG_SUITE_SYMMETRIC_KEY_ENCRYPTION_ALGORITHM = +"ws-security.custom.alg.suite.symmetric.key.encryption.algorithm"; +
(cxf) branch main updated (cfac6ce7e1 -> 5fafb851e3)
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a change to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
from cfac6ce7e1 Bump actions/upload-artifact from 4.1.0 to 4.2.0 (#1658)
add 5fafb851e3 [CXF-8970]ensure we can build and run without bouncycastle
dependencies (#1645)
No new revisions were added by this update.
Summary of changes:
distribution/javadoc/pom.xml | 4 -
.../src/main/release/samples/jax_rs/search/pom.xml | 6 +
parent/pom.xml | 9 +-
rt/rs/extensions/search/pom.xml| 6 +
rt/rs/security/jose-parent/jose/pom.xml| 6 -
.../cxf/rs/security/jose/common/JoseUtils.java | 24 +++
.../cxf/rs/security/jose/jwa/AlgorithmUtils.java | 12 +-
.../cxf/rs/security/jose/jwa/ContentAlgorithm.java | 6 +-
.../rs/security/jose/jwa/SignatureAlgorithm.java | 6 +-
.../jwe/PbesHmacAesWrapKeyEncryptionAlgorithm.java | 40 ++---
.../jose/jwe/WrappedKeyDecryptionAlgorithm.java| 2 +-
.../jose/jws/PrivateKeyJwsSignatureProvider.java | 8 +
.../jose/jws/PublicKeyJwsSignatureVerifier.java| 17 +++
.../cxf/rs/security/jose/common/HexUtils.java} | 32 ++--
.../jose/cookbook/JwsJoseCookBookTest.java | 165 +---
.../cxf/rs/security/jose/jwa/AbstractJwaTest.java | 17 +--
.../rs/security/jose/jwa/CxfDecryptRfcTest.java| 2 +
.../rs/security/jose/jwa/CxfEncryptRfcTest.java| 3 +
.../rs/security/jose/jwe/JwaSpecTestCasesTest.java | 43 ++
.../jose/jwe/JweCompactReaderWriterTest.java | 18 +--
.../rs/security/jose/jwe/JweJsonConsumerTest.java | 22 +--
.../rs/security/jose/jwe/JweJsonProducerTest.java | 24 +--
.../security/jose/jwe/JwePbeHmacAesWrapTest.java | 13 +-
.../cxf/rs/security/jose/jwk/JsonWebKeyTest.java | 66
.../cxf/rs/security/jose/jwk/JwkUtilsTest.java | 1 +
.../jose/jws/JwsCompactReaderWriterTest.java | 37 ++---
rt/security-saml/pom.xml | 6 +
.../rt/security/crypto/BouncyCastleInstaller.java | 31
.../apache/cxf/rt/security/crypto/CryptoUtils.java | 19 +--
rt/ws/security/pom.xml | 9 +-
services/sts/sts-core/pom.xml | 2 +-
.../sts/token/provider/JWTTokenProviderTest.java | 168 ++---
services/sts/systests/advanced/pom.xml | 5 -
systests/jaxrs/pom.xml | 11 +-
systests/kerberos/pom.xml | 5 -
systests/ldap/pom.xml | 5 -
systests/rs-security/pom.xml | 5 -
.../systest/jaxrs/security/jcs/JAXRSJcsTest.java | 14 +-
.../security/jose/jwejws/JAXRSJweJsonTest.java | 12 +-
.../security/jose/jwejws/JAXRSJweJwsTest.java | 14 +-
.../security/jose/jwejws/JAXRSJwsJsonTest.java | 14 +-
.../jose/jwejws/JAXRSJwsMultipartTest.java | 13 --
.../security/jose/jwejws/JweJwsAlgorithmTest.java | 15 +-
.../security/jose/jwejws/JweJwsReferenceTest.java | 15 +-
.../jaxrs/security/jose/jwt/JWTAlgorithmTest.java | 15 +-
systests/transports/pom.xml| 6 -
systests/ws-security/pom.xml | 5 -
47 files changed, 368 insertions(+), 610 deletions(-)
copy
rt/rs/security/jose-parent/jose/src/{main/java/org/apache/cxf/rs/security/jose/common/JoseException.java
=> test/java/org/apache/cxf/rs/security/jose/common/HexUtils.java} (67%)
delete mode 100644
rt/security/src/main/java/org/apache/cxf/rt/security/crypto/BouncyCastleInstaller.java
(cxf) branch servlet-6 created (now 19030eac37)
This is an automated email from the ASF dual-hosted git repository. ffang pushed a change to branch servlet-6 in repository https://gitbox.apache.org/repos/asf/cxf.git at 19030eac37 Update to servlet-api 6.0/Jetty 12/Undertow 2.3 This branch includes the following new commits: new 19030eac37 Update to servlet-api 6.0/Jetty 12/Undertow 2.3 The 1 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.
[cxf] branch 3.6.x-fixes updated: [CXF-8940]ensure ws-security.must-understand property can be honoured
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.6.x-fixes by this push:
new f147ec60a0 [CXF-8940]ensure ws-security.must-understand property can
be honoured
f147ec60a0 is described below
commit f147ec60a0e76ef0acf41e6a631d43d00bd88a74
Author: Freeman Fang
AuthorDate: Fri Oct 13 17:16:33 2023 -0400
[CXF-8940]ensure ws-security.must-understand property can be honoured
(cherry picked from commit 802dc02039930a92f229497ff0a475c30e36e66b)
---
.../security/wss4j/AbstractTokenInterceptor.java | 6 ++-
.../cxf/systest/ws/ut/UsernameTokenPolicyTest.java | 62 +-
.../apache/cxf/systest/ws/ut/DoubleItUtPolicy.wsdl | 3 ++
.../org/apache/cxf/systest/ws/ut/policy-client.xml | 13 -
.../org/apache/cxf/systest/ws/ut/policy-server.xml | 12 -
.../cxf/systest/ws/ut/stax-policy-server.xml | 13 -
.../systest/ws/ut/utonly-plaintext-pass-policy.xml | 16 ++
.../cxf/systest/ws/wssec10/server_authorized.xml | 2 +-
8 files changed, 121 insertions(+), 6 deletions(-)
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractTokenInterceptor.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractTokenInterceptor.java
index 3a563a73f5..742c72be20 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractTokenInterceptor.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractTokenInterceptor.java
@@ -169,7 +169,11 @@ public abstract class AbstractTokenInterceptor extends
AbstractSoapInterceptor {
el.setAttributeNS(WSS4JConstants.XMLNS_NS, "xmlns:wsse",
WSS4JConstants.WSSE_NS);
SoapHeader sh = new SoapHeader(new QName(WSS4JConstants.WSSE_NS,
"Security"), el);
-sh.setMustUnderstand(true);
+boolean mustUnderstand =
+MessageUtils.getContextualBoolean(
+message, SecurityConstants.MUST_UNDERSTAND, true
+);
+sh.setMustUnderstand(mustUnderstand);
if (actor != null && actor.length() > 0) {
sh.setActor(actor);
}
diff --git
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java
index 9944b4da57..898eee20e8 100644
---
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java
+++
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java
@@ -28,10 +28,21 @@ import javax.xml.ws.Service;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
+import org.apache.cxf.binding.soap.SoapHeader;
+import org.apache.cxf.binding.soap.SoapMessage;
+import org.apache.cxf.binding.soap.interceptor.AbstractSoapInterceptor;
+import
org.apache.cxf.binding.soap.interceptor.SoapOutInterceptor.SoapOutEndingInterceptor;
import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.ext.logging.LoggingOutInterceptor;
+import org.apache.cxf.frontend.ClientProxy;
+import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.message.MessageUtils;
+import org.apache.cxf.phase.Phase;
import org.apache.cxf.systest.ws.common.SecurityTestUtil;
import org.apache.cxf.systest.ws.common.TestParam;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.apache.cxf.ws.security.SecurityConstants;
import org.example.contract.doubleit.DoubleItPortType;
import org.junit.BeforeClass;
@@ -195,6 +206,33 @@ public class UsernameTokenPolicyTest extends
AbstractBusClientServerTestBase {
((java.io.Closeable)port).close();
bus.shutdown(true);
}
+
+@org.junit.Test
+public void testOnlyHasUsernameTokenWithoutMustUnderstand() throws
Exception {
+
+SpringBusFactory bf = new SpringBusFactory();
+URL busFile =
UsernameTokenPolicyTest.class.getResource("policy-client.xml");
+
+Bus bus = bf.createBus(busFile.toString());
+BusFactory.setDefaultBus(bus);
+BusFactory.setThreadDefaultBus(bus);
+
+URL wsdl =
UsernameTokenPolicyTest.class.getResource("DoubleItUtPolicy.wsdl");
+Service service = Service.create(wsdl, SERVICE_QNAME);
+QName portQName = new QName(NAMESPACE, "DoubleItPlaintextPort4");
+DoubleItPortType port =
+service.getPort(portQName, DoubleItPortType.class);
+updateAddressPort(port, test.getPort());
+Client client = ClientProxy.getClient(port);
+client.getRequestContext().put(SecurityConstants.MUST_UNDERSTAND,
false);
+client.getOutInterceptors().add(new CheckMustUnderstandHeader());
+
[cxf] branch main updated: [CXF-8940]ensure ws-security.must-understand property can be honoured
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new 802dc02039 [CXF-8940]ensure ws-security.must-understand property can
be honoured
new e8cc4610d6 Merge pull request #1473 from ffang/CXF-8940
802dc02039 is described below
commit 802dc02039930a92f229497ff0a475c30e36e66b
Author: Freeman Fang
AuthorDate: Fri Oct 13 17:16:33 2023 -0400
[CXF-8940]ensure ws-security.must-understand property can be honoured
---
.../security/wss4j/AbstractTokenInterceptor.java | 6 ++-
.../cxf/systest/ws/ut/UsernameTokenPolicyTest.java | 62 +-
.../apache/cxf/systest/ws/ut/DoubleItUtPolicy.wsdl | 3 ++
.../org/apache/cxf/systest/ws/ut/policy-client.xml | 13 -
.../org/apache/cxf/systest/ws/ut/policy-server.xml | 12 -
.../cxf/systest/ws/ut/stax-policy-server.xml | 13 -
.../systest/ws/ut/utonly-plaintext-pass-policy.xml | 16 ++
.../cxf/systest/ws/wssec10/server_authorized.xml | 2 +-
8 files changed, 121 insertions(+), 6 deletions(-)
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractTokenInterceptor.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractTokenInterceptor.java
index 3a563a73f5..742c72be20 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractTokenInterceptor.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/wss4j/AbstractTokenInterceptor.java
@@ -169,7 +169,11 @@ public abstract class AbstractTokenInterceptor extends
AbstractSoapInterceptor {
el.setAttributeNS(WSS4JConstants.XMLNS_NS, "xmlns:wsse",
WSS4JConstants.WSSE_NS);
SoapHeader sh = new SoapHeader(new QName(WSS4JConstants.WSSE_NS,
"Security"), el);
-sh.setMustUnderstand(true);
+boolean mustUnderstand =
+MessageUtils.getContextualBoolean(
+message, SecurityConstants.MUST_UNDERSTAND, true
+);
+sh.setMustUnderstand(mustUnderstand);
if (actor != null && actor.length() > 0) {
sh.setActor(actor);
}
diff --git
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java
index 00e9b9639a..f990946bcd 100644
---
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java
+++
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/ut/UsernameTokenPolicyTest.java
@@ -28,10 +28,21 @@ import javax.xml.namespace.QName;
import jakarta.xml.ws.Service;
import org.apache.cxf.Bus;
import org.apache.cxf.BusFactory;
+import org.apache.cxf.binding.soap.SoapHeader;
+import org.apache.cxf.binding.soap.SoapMessage;
+import org.apache.cxf.binding.soap.interceptor.AbstractSoapInterceptor;
+import
org.apache.cxf.binding.soap.interceptor.SoapOutInterceptor.SoapOutEndingInterceptor;
import org.apache.cxf.bus.spring.SpringBusFactory;
+import org.apache.cxf.endpoint.Client;
+import org.apache.cxf.ext.logging.LoggingOutInterceptor;
+import org.apache.cxf.frontend.ClientProxy;
+import org.apache.cxf.interceptor.Fault;
+import org.apache.cxf.message.MessageUtils;
+import org.apache.cxf.phase.Phase;
import org.apache.cxf.systest.ws.common.SecurityTestUtil;
import org.apache.cxf.systest.ws.common.TestParam;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.apache.cxf.ws.security.SecurityConstants;
import org.example.contract.doubleit.DoubleItPortType;
import org.junit.BeforeClass;
@@ -195,6 +206,33 @@ public class UsernameTokenPolicyTest extends
AbstractBusClientServerTestBase {
((java.io.Closeable)port).close();
bus.shutdown(true);
}
+
+@org.junit.Test
+public void testOnlyHasUsernameTokenWithoutMustUnderstand() throws
Exception {
+
+SpringBusFactory bf = new SpringBusFactory();
+URL busFile =
UsernameTokenPolicyTest.class.getResource("policy-client.xml");
+
+Bus bus = bf.createBus(busFile.toString());
+BusFactory.setDefaultBus(bus);
+BusFactory.setThreadDefaultBus(bus);
+
+URL wsdl =
UsernameTokenPolicyTest.class.getResource("DoubleItUtPolicy.wsdl");
+Service service = Service.create(wsdl, SERVICE_QNAME);
+QName portQName = new QName(NAMESPACE, "DoubleItPlaintextPort4");
+DoubleItPortType port =
+service.getPort(portQName, DoubleItPortType.class);
+updateAddressPort(port, test.getPort());
+Client client = ClientProxy.getClient(port);
+client.getRequestContext().put(SecurityConstants.MUST_UNDERSTAND,
false);
+client.getOutInterceptors().add(new CheckMustUnderstandHeader());
+
[cxf] branch main updated: [CXF-8948]wsdlto tool should throw exception when bindingFiles is invalid
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new 3fda9e5c56 [CXF-8948]wsdlto tool should throw exception when
bindingFiles is invalid
3fda9e5c56 is described below
commit 3fda9e5c5695fa6a715660e99e8973250f64404b
Author: Freeman Fang
AuthorDate: Mon Oct 23 14:35:13 2023 -0400
[CXF-8948]wsdlto tool should throw exception when bindingFiles is invalid
---
.../tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java | 3 +++
.../cxf/tools/wsdlto/frontend/jaxws/customization/Messages.properties | 1 +
2 files changed, 4 insertions(+)
diff --git
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
index 940085d888..9fe8a3620f 100644
---
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
+++
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
@@ -535,6 +535,9 @@ public final class CustomizationParser {
} else {
jaxbBindings.add(new InputSource(bindingFile));
}
+} else {
+Message msg = new Message("INVALID_BINDING_FILE", LOG);
+throw new ToolException(msg);
}
}
diff --git
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/Messages.properties
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/Messages.properties
index 5f78ab391b..d9889f15f8 100644
---
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/Messages.properties
+++
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/Messages.properties
@@ -34,3 +34,4 @@ FAILED_RESOLVE_CATALOG = Failed to resolve catalog {0}
MISSING_WSDL = Unable to read {0}.
OLD_JAXWS_NAMESPACE = Old JAXWS binding file namespace
\"https://java.sun.com/xml/ns/jaxws\; is used.This binding file will be
ignored. Please use \"https://jakarta.ee/xml/ns/jaxws\; instead
OLD_JAXB_NAMESPACE = Old JAXB binding file namespace
\"https://java.sun.com/xml/ns/jaxb\; is used.This binding file will be ignored.
Please use \"https://jakarta.ee/xml/ns/jaxb\; instead
+INVALID_BINDING_FILE = Not a valid jaxb or jaxws binding file, please check
the namespace
[cxf] branch main updated: [CXF-8880]print warning message if old jaxws/jaxb binding namespace is used other than ignoring the binding file silently
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new 6266242cb5 [CXF-8880]print warning message if old jaxws/jaxb binding
namespace is used other than ignoring the binding file silently
6266242cb5 is described below
commit 6266242cb5e720efdd0add51842ea953376494f9
Author: Freeman Fang
AuthorDate: Thu Jun 1 11:28:11 2023 -0400
[CXF-8880]print warning message if old jaxws/jaxb binding namespace is used
other than ignoring the binding file silently
---
.../org/apache/cxf/tools/common/ToolConstants.java | 4 ++
.../jaxws/customization/CustomizationParser.java | 43 --
.../jaxws/customization/Messages.properties| 2 +
3 files changed, 37 insertions(+), 12 deletions(-)
diff --git
a/tools/common/src/main/java/org/apache/cxf/tools/common/ToolConstants.java
b/tools/common/src/main/java/org/apache/cxf/tools/common/ToolConstants.java
index e050aec896..d1d1613bd7 100644
--- a/tools/common/src/main/java/org/apache/cxf/tools/common/ToolConstants.java
+++ b/tools/common/src/main/java/org/apache/cxf/tools/common/ToolConstants.java
@@ -171,9 +171,13 @@ public final class ToolConstants {
// Binding namespace
public static final String NS_JAXWS_BINDINGS =
"https://jakarta.ee/xml/ns/jaxws;;
+public static final String OLD_NS_JAXWS_BINDINGS =
"https://java.sun.com/xml/ns/jaxws;;
public static final String NS_JAXB_BINDINGS =
"https://jakarta.ee/xml/ns/jaxb;;
+public static final String OLD_NS_JAXB_BINDINGS =
"https://java.sun.com/xml/ns/jaxb;;
public static final QName JAXWS_BINDINGS = new QName(NS_JAXWS_BINDINGS,
"bindings");
+public static final QName OLD_JAXWS_BINDINGS = new
QName(OLD_NS_JAXWS_BINDINGS, "bindings");
public static final QName JAXB_BINDINGS = new QName(NS_JAXB_BINDINGS,
"bindings");
+public static final QName OLD_JAXB_BINDINGS = new
QName(OLD_NS_JAXB_BINDINGS, "bindings");
public static final QName SCHEMA = new QName(SCHEMA_URI, "schema");
public static final String JAXWS_BINDINGS_WSDL_LOCATION = "wsdlLocation";
public static final String JAXWS_BINDING_NODE = "node";
diff --git
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
index fbed951e8f..173dd10926 100644
---
a/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
+++
b/tools/wsdlto/frontend/jaxws/src/main/java/org/apache/cxf/tools/wsdlto/frontend/jaxws/customization/CustomizationParser.java
@@ -30,17 +30,6 @@ import java.util.List;
import java.util.Map;
import java.util.logging.Logger;
-import javax.xml.XMLConstants;
-import javax.xml.stream.XMLStreamException;
-import javax.xml.stream.XMLStreamReader;
-
-import org.w3c.dom.Attr;
-import org.w3c.dom.Document;
-import org.w3c.dom.Element;
-import org.w3c.dom.NamedNodeMap;
-import org.w3c.dom.Node;
-import org.w3c.dom.NodeList;
-
import org.xml.sax.InputSource;
import org.apache.cxf.Bus;
@@ -59,6 +48,16 @@ import org.apache.cxf.tools.common.ToolConstants;
import org.apache.cxf.tools.common.ToolContext;
import org.apache.cxf.tools.common.ToolException;
import
org.apache.cxf.tools.wsdlto.frontend.jaxws.processor.internal.ProcessorUtil;
+import org.w3c.dom.Attr;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.NamedNodeMap;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
+
+import javax.xml.XMLConstants;
+import javax.xml.stream.XMLStreamException;
+import javax.xml.stream.XMLStreamReader;
public final class CustomizationParser {
// For WSDL1.1
@@ -342,6 +341,9 @@ public final class CustomizationParser {
}
protected void internalizeBinding(Element bindings, Element targetNode,
String expression) {
+if (isOldJAXWSBindings(bindings)) {
+LOG.warning(new Message("OLD_JAXWS_NAMESPACE", LOG).toString());
+}
if (bindings.getAttributeNode("wsdlLocation") != null) {
expression = "/";
}
@@ -489,6 +491,7 @@ public final class CustomizationParser {
}
XMLStreamReader reader = StaxUtils.createXMLStreamReader(root);
StaxUtils.toNextTag(reader);
+
if (isValidJaxwsBindingFile(bindingFile, reader)) {
String wsdlLocation = root.getAttribute("wsdlLocation");
@@ -589,14 +592,24 @@ public final class CustomizationParser {
}
private boolean isValidJaxbBindingFile(XMLStreamReader reader) {
+if (ToolConstants.OLD_JAXB_BINDINGS.
[cxf] branch main updated: [CXF-8766]avoid NPE warning message by removing tryOSGI
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/main by this push:
new f8d9f35ba6 [CXF-8766]avoid NPE warning message by removing tryOSGI
f8d9f35ba6 is described below
commit f8d9f35ba6986a13fb65eadd50b701b7cbf70113
Author: Freeman Fang
AuthorDate: Fri Nov 25 10:30:55 2022 -0500
[CXF-8766]avoid NPE warning message by removing tryOSGI
---
core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git
a/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
b/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
index e1a15e85c7..61f5d38f3f 100644
--- a/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
+++ b/core/src/main/java/org/apache/cxf/bus/spring/SpringBeanLocator.java
@@ -152,9 +152,10 @@ public class SpringBeanLocator implements
ConfiguredBeanLocator {
lst.add(type.cast(context.getBean(n, type)));
}
lst.addAll(orig.getBeansOfType(type));
-if (lst.isEmpty()) {
+//TODO: [OSGi+Jakarta] Uncomment this when osgi comes back
+/*if (lst.isEmpty()) {
tryOSGI(lst, type);
-}
+}*/
return lst;
}
private void tryOSGI(Collection lst, Class type) {
[cxf] branch 3.4.x-fixes updated: [CXF-8647]add DisallowedMethodsHandler for cxf http-undertow transport
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.4.x-fixes by this push:
new 45a23f7 [CXF-8647]add DisallowedMethodsHandler for cxf http-undertow
transport
45a23f7 is described below
commit 45a23f77c35892b6e771df7836fb90388d215137
Author: Freeman Fang
AuthorDate: Thu Jan 27 16:08:23 2022 -0500
[CXF-8647]add DisallowedMethodsHandler for cxf http-undertow transport
(cherry picked from commit 445fd07abc572f110d08c1172a5bda5e305f942c)
(cherry picked from commit d72504360419f605619fcf7d62cb7b5ea3e19fa0)
---
.../handlers/CxfDisallowedMethodsHandler.java | 80 ++
.../http_undertow/UndertowBasicAuthServer.java | 10 +++
.../http_undertow/UndertowBasicAuthTest.java | 22 ++
.../http_undertow/undertowBasicAuthServer.xml | 12
4 files changed, 124 insertions(+)
diff --git
a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/handlers/CxfDisallowedMethodsHandler.java
b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/handlers/CxfDisallowedMethodsHandler.java
new file mode 100644
index 000..77620f1
--- /dev/null
+++
b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/handlers/CxfDisallowedMethodsHandler.java
@@ -0,0 +1,80 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.transport.http_undertow.handlers;
+
+import org.apache.cxf.transport.http_undertow.CXFUndertowHttpHandler;
+
+import io.undertow.server.HttpHandler;
+import io.undertow.server.HttpServerExchange;
+import io.undertow.server.handlers.DisallowedMethodsHandler;
+import io.undertow.util.HttpString;
+
+public class CxfDisallowedMethodsHandler implements CXFUndertowHttpHandler {
+
+private HttpHandler next;
+private DisallowedMethodsHandler buildDisallowedMethodHandler;
+private String[] methods;
+
+
+public CxfDisallowedMethodsHandler(String[] methods) {
+this.setMethods(methods);
+}
+
+
+@Override
+public void handleRequest(HttpServerExchange exchange) throws Exception {
+
+if (buildDisallowedMethodHandler == null) {
+buildDisallowedMethodHandler();
+}
+this.buildDisallowedMethodHandler.handleRequest(exchange);
+}
+
+@Override
+public void setNext(HttpHandler nextHandler) {
+this.next = nextHandler;
+
+}
+
+private void buildDisallowedMethodHandler() {
+HttpString[] strings = new HttpString[methods.length];
+for (int i = 0; i < methods.length; ++i) {
+strings[i] = new HttpString(methods[i]);
+}
+
+HttpHandler handler = this.next;
+this.buildDisallowedMethodHandler =
+new DisallowedMethodsHandler(handler, strings);
+
+}
+
+
+public String[] getMethods() {
+return methods;
+}
+
+
+public void setMethods(String[] methods) {
+this.methods = methods;
+}
+
+
+
+}
+
diff --git
a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/UndertowBasicAuthServer.java
b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/UndertowBasicAuthServer.java
index 7db5b5f..7254027 100644
---
a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/UndertowBasicAuthServer.java
+++
b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/UndertowBasicAuthServer.java
@@ -30,13 +30,18 @@ import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.ext.logging.LoggingInInterceptor;
import org.apache.cxf.ext.logging.LoggingOutInterceptor;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.testutil.common.TestUtil;
public class UndertowBasicAuthServer extends AbstractBusTestServerBase {
static final String PORT = allocatePort(UndertowBasicAuthServer.class);
static final String ADDRESS = "http://localhost:; + PO
[cxf] branch master updated: [CXF-8647]add DisallowedMethodsHandler for cxf http-undertow transport
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 445fd07 [CXF-8647]add DisallowedMethodsHandler for cxf http-undertow
transport
445fd07 is described below
commit 445fd07abc572f110d08c1172a5bda5e305f942c
Author: Freeman Fang
AuthorDate: Thu Jan 27 16:08:23 2022 -0500
[CXF-8647]add DisallowedMethodsHandler for cxf http-undertow transport
---
.../handlers/CxfDisallowedMethodsHandler.java | 80 ++
.../http_undertow/UndertowBasicAuthServer.java | 10 +++
.../http_undertow/UndertowBasicAuthTest.java | 22 ++
.../http_undertow/undertowBasicAuthServer.xml | 12
4 files changed, 124 insertions(+)
diff --git
a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/handlers/CxfDisallowedMethodsHandler.java
b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/handlers/CxfDisallowedMethodsHandler.java
new file mode 100644
index 000..77620f1
--- /dev/null
+++
b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/handlers/CxfDisallowedMethodsHandler.java
@@ -0,0 +1,80 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.transport.http_undertow.handlers;
+
+import org.apache.cxf.transport.http_undertow.CXFUndertowHttpHandler;
+
+import io.undertow.server.HttpHandler;
+import io.undertow.server.HttpServerExchange;
+import io.undertow.server.handlers.DisallowedMethodsHandler;
+import io.undertow.util.HttpString;
+
+public class CxfDisallowedMethodsHandler implements CXFUndertowHttpHandler {
+
+private HttpHandler next;
+private DisallowedMethodsHandler buildDisallowedMethodHandler;
+private String[] methods;
+
+
+public CxfDisallowedMethodsHandler(String[] methods) {
+this.setMethods(methods);
+}
+
+
+@Override
+public void handleRequest(HttpServerExchange exchange) throws Exception {
+
+if (buildDisallowedMethodHandler == null) {
+buildDisallowedMethodHandler();
+}
+this.buildDisallowedMethodHandler.handleRequest(exchange);
+}
+
+@Override
+public void setNext(HttpHandler nextHandler) {
+this.next = nextHandler;
+
+}
+
+private void buildDisallowedMethodHandler() {
+HttpString[] strings = new HttpString[methods.length];
+for (int i = 0; i < methods.length; ++i) {
+strings[i] = new HttpString(methods[i]);
+}
+
+HttpHandler handler = this.next;
+this.buildDisallowedMethodHandler =
+new DisallowedMethodsHandler(handler, strings);
+
+}
+
+
+public String[] getMethods() {
+return methods;
+}
+
+
+public void setMethods(String[] methods) {
+this.methods = methods;
+}
+
+
+
+}
+
diff --git
a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/UndertowBasicAuthServer.java
b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/UndertowBasicAuthServer.java
index 7db5b5f..7254027 100644
---
a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/UndertowBasicAuthServer.java
+++
b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/UndertowBasicAuthServer.java
@@ -30,13 +30,18 @@ import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.ext.logging.LoggingInInterceptor;
import org.apache.cxf.ext.logging.LoggingOutInterceptor;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.testutil.common.TestUtil;
public class UndertowBasicAuthServer extends AbstractBusTestServerBase {
static final String PORT = allocatePort(UndertowBasicAuthServer.class);
static final String ADDRESS = "http://localhost:; + PORT +
"/SoapContext/SoapPort";
+
+static final String PORT1 =
TestUtil.getPortNumber("UndertowBasicAuthServer1");
+static fin
[cxf] branch 3.5.x-fixes updated: [CXF-8647]add DisallowedMethodsHandler for cxf http-undertow transport
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.5.x-fixes by this push:
new d725043 [CXF-8647]add DisallowedMethodsHandler for cxf http-undertow
transport
d725043 is described below
commit d72504360419f605619fcf7d62cb7b5ea3e19fa0
Author: Freeman Fang
AuthorDate: Thu Jan 27 16:08:23 2022 -0500
[CXF-8647]add DisallowedMethodsHandler for cxf http-undertow transport
(cherry picked from commit 445fd07abc572f110d08c1172a5bda5e305f942c)
---
.../handlers/CxfDisallowedMethodsHandler.java | 80 ++
.../http_undertow/UndertowBasicAuthServer.java | 10 +++
.../http_undertow/UndertowBasicAuthTest.java | 22 ++
.../http_undertow/undertowBasicAuthServer.xml | 12
4 files changed, 124 insertions(+)
diff --git
a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/handlers/CxfDisallowedMethodsHandler.java
b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/handlers/CxfDisallowedMethodsHandler.java
new file mode 100644
index 000..77620f1
--- /dev/null
+++
b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/handlers/CxfDisallowedMethodsHandler.java
@@ -0,0 +1,80 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.transport.http_undertow.handlers;
+
+import org.apache.cxf.transport.http_undertow.CXFUndertowHttpHandler;
+
+import io.undertow.server.HttpHandler;
+import io.undertow.server.HttpServerExchange;
+import io.undertow.server.handlers.DisallowedMethodsHandler;
+import io.undertow.util.HttpString;
+
+public class CxfDisallowedMethodsHandler implements CXFUndertowHttpHandler {
+
+private HttpHandler next;
+private DisallowedMethodsHandler buildDisallowedMethodHandler;
+private String[] methods;
+
+
+public CxfDisallowedMethodsHandler(String[] methods) {
+this.setMethods(methods);
+}
+
+
+@Override
+public void handleRequest(HttpServerExchange exchange) throws Exception {
+
+if (buildDisallowedMethodHandler == null) {
+buildDisallowedMethodHandler();
+}
+this.buildDisallowedMethodHandler.handleRequest(exchange);
+}
+
+@Override
+public void setNext(HttpHandler nextHandler) {
+this.next = nextHandler;
+
+}
+
+private void buildDisallowedMethodHandler() {
+HttpString[] strings = new HttpString[methods.length];
+for (int i = 0; i < methods.length; ++i) {
+strings[i] = new HttpString(methods[i]);
+}
+
+HttpHandler handler = this.next;
+this.buildDisallowedMethodHandler =
+new DisallowedMethodsHandler(handler, strings);
+
+}
+
+
+public String[] getMethods() {
+return methods;
+}
+
+
+public void setMethods(String[] methods) {
+this.methods = methods;
+}
+
+
+
+}
+
diff --git
a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/UndertowBasicAuthServer.java
b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/UndertowBasicAuthServer.java
index 7db5b5f..7254027 100644
---
a/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/UndertowBasicAuthServer.java
+++
b/systests/transport-undertow/src/test/java/org/apache/cxf/systest/http_undertow/UndertowBasicAuthServer.java
@@ -30,13 +30,18 @@ import org.apache.cxf.bus.spring.SpringBusFactory;
import org.apache.cxf.ext.logging.LoggingInInterceptor;
import org.apache.cxf.ext.logging.LoggingOutInterceptor;
import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
+import org.apache.cxf.testutil.common.TestUtil;
public class UndertowBasicAuthServer extends AbstractBusTestServerBase {
static final String PORT = allocatePort(UndertowBasicAuthServer.class);
static final String ADDRESS = "http://localhost:; + PORT +
"/SoapContext/SoapPort";
+
+static final
[cxf] branch 3.4.x-fixes updated: [CXF-8644]introduce a cache for AbstractJAXBProvider to avoid unnecessary ObjectFactory.class|jaxb.index availability check
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.4.x-fixes by this push:
new 6d7cb14 [CXF-8644]introduce a cache for AbstractJAXBProvider to avoid
unnecessary ObjectFactory.class|jaxb.index availability check
6d7cb14 is described below
commit 6d7cb14fffe9a6e310ad39578e1f671a378ebf98
Author: Freeman Fang
AuthorDate: Tue Jan 25 10:47:02 2022 -0500
[CXF-8644]introduce a cache for AbstractJAXBProvider to avoid unnecessary
ObjectFactory.class|jaxb.index availability check
(cherry picked from commit 02c81854625e2e362e66b4af41f53341df4c4fb7)
(cherry picked from commit 0fbafc05632f475a4080f6c0c1da44f60f7f72ea)
---
.../org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
index ff5353d..a273402 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
@@ -101,6 +101,7 @@ public abstract class AbstractJAXBProvider extends
AbstractConfigurableProvid
protected Set> collectionContextClasses =
ConcurrentHashMap.newKeySet();
protected Map jaxbElementClassMap = Collections.emptyMap();
+protected Map objectFactoryOrIndexMap = new
ConcurrentHashMap<>();
protected boolean unmarshalAsJaxbElement;
protected boolean marshalAsJaxbElement;
protected boolean xmlTypeAsJaxbElementOnly;
@@ -594,8 +595,15 @@ public abstract class AbstractJAXBProvider extends
AbstractConfigurableProvid
}
protected boolean objectFactoryOrIndexAvailable(Class type) {
-return type.getResource("ObjectFactory.class") != null
+if (this.objectFactoryOrIndexMap.get(type.getName()) != null) {
+return this.objectFactoryOrIndexMap.get(type.getName());
+} else {
+boolean ret = type.getResource("ObjectFactory.class") != null
|| type.getResource("jaxb.index") != null;
+this.objectFactoryOrIndexMap.put(type.getName(), ret);
+return ret;
+}
+
}
private boolean objectFactoryForType(Type genericType) {
@@ -704,6 +712,7 @@ public abstract class AbstractJAXBProvider extends
AbstractConfigurableProvid
public void clearContexts() {
classContexts.clear();
packageContexts.clear();
+objectFactoryOrIndexMap.clear();
}
//TODO: move these methods into the dedicated utility class
[cxf] branch 3.5.x-fixes updated: [CXF-8644]introduce a cache for AbstractJAXBProvider to avoid unnecessary ObjectFactory.class|jaxb.index availability check
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.5.x-fixes by this push:
new 0fbafc0 [CXF-8644]introduce a cache for AbstractJAXBProvider to avoid
unnecessary ObjectFactory.class|jaxb.index availability check
0fbafc0 is described below
commit 0fbafc05632f475a4080f6c0c1da44f60f7f72ea
Author: Freeman Fang
AuthorDate: Tue Jan 25 10:47:02 2022 -0500
[CXF-8644]introduce a cache for AbstractJAXBProvider to avoid unnecessary
ObjectFactory.class|jaxb.index availability check
(cherry picked from commit 02c81854625e2e362e66b4af41f53341df4c4fb7)
---
.../org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
index f2bee17..5510438 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
@@ -101,6 +101,7 @@ public abstract class AbstractJAXBProvider extends
AbstractConfigurableProvid
protected Set> collectionContextClasses =
ConcurrentHashMap.newKeySet();
protected Map jaxbElementClassMap = Collections.emptyMap();
+protected Map objectFactoryOrIndexMap = new
ConcurrentHashMap<>();
protected boolean unmarshalAsJaxbElement;
protected boolean marshalAsJaxbElement;
protected boolean xmlTypeAsJaxbElementOnly;
@@ -594,8 +595,15 @@ public abstract class AbstractJAXBProvider extends
AbstractConfigurableProvid
}
protected boolean objectFactoryOrIndexAvailable(Class type) {
-return type.getResource("ObjectFactory.class") != null
+if (this.objectFactoryOrIndexMap.get(type.getName()) != null) {
+return this.objectFactoryOrIndexMap.get(type.getName());
+} else {
+boolean ret = type.getResource("ObjectFactory.class") != null
|| type.getResource("jaxb.index") != null;
+this.objectFactoryOrIndexMap.put(type.getName(), ret);
+return ret;
+}
+
}
private boolean objectFactoryForType(Type genericType) {
@@ -704,6 +712,7 @@ public abstract class AbstractJAXBProvider extends
AbstractConfigurableProvid
public void clearContexts() {
classContexts.clear();
packageContexts.clear();
+objectFactoryOrIndexMap.clear();
}
//TODO: move these methods into the dedicated utility class
[cxf] branch master updated: [CXF-8644]introduce a cache for AbstractJAXBProvider to avoid unnecessary ObjectFactory.class|jaxb.index availability check
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 02c8185 [CXF-8644]introduce a cache for AbstractJAXBProvider to avoid
unnecessary ObjectFactory.class|jaxb.index availability check
02c8185 is described below
commit 02c81854625e2e362e66b4af41f53341df4c4fb7
Author: Freeman Fang
AuthorDate: Tue Jan 25 10:47:02 2022 -0500
[CXF-8644]introduce a cache for AbstractJAXBProvider to avoid unnecessary
ObjectFactory.class|jaxb.index availability check
---
.../org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java | 11 ++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
index f2bee17..5510438 100644
---
a/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
+++
b/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/provider/AbstractJAXBProvider.java
@@ -101,6 +101,7 @@ public abstract class AbstractJAXBProvider extends
AbstractConfigurableProvid
protected Set> collectionContextClasses =
ConcurrentHashMap.newKeySet();
protected Map jaxbElementClassMap = Collections.emptyMap();
+protected Map objectFactoryOrIndexMap = new
ConcurrentHashMap<>();
protected boolean unmarshalAsJaxbElement;
protected boolean marshalAsJaxbElement;
protected boolean xmlTypeAsJaxbElementOnly;
@@ -594,8 +595,15 @@ public abstract class AbstractJAXBProvider extends
AbstractConfigurableProvid
}
protected boolean objectFactoryOrIndexAvailable(Class type) {
-return type.getResource("ObjectFactory.class") != null
+if (this.objectFactoryOrIndexMap.get(type.getName()) != null) {
+return this.objectFactoryOrIndexMap.get(type.getName());
+} else {
+boolean ret = type.getResource("ObjectFactory.class") != null
|| type.getResource("jaxb.index") != null;
+this.objectFactoryOrIndexMap.put(type.getName(), ret);
+return ret;
+}
+
}
private boolean objectFactoryForType(Type genericType) {
@@ -704,6 +712,7 @@ public abstract class AbstractJAXBProvider extends
AbstractConfigurableProvid
public void clearContexts() {
classContexts.clear();
packageContexts.clear();
+objectFactoryOrIndexMap.clear();
}
//TODO: move these methods into the dedicated utility class
[cxf] branch 3.4.x-fixes updated: CXF-8641 NPE on NamePasswordCallbackHandler
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.4.x-fixes by this push:
new 098c807 CXF-8641 NPE on NamePasswordCallbackHandler
098c807 is described below
commit 098c80771d9dccac074084995fcbd92921b04f2f
Author: Jan Filipski
AuthorDate: Tue Jan 18 11:24:32 2022 +0100
CXF-8641
NPE on NamePasswordCallbackHandler
(cherry picked from commit b4f45e7ece7d5f6bdda6df6284decbccc00817af)
(cherry picked from commit 299a294adbeb413f76edc0686c00df0096f00085)
---
.../security/NameDigestPasswordCallbackHandler.java | 2 +-
.../cxf/interceptor/security/NamePasswordCallbackHandler.java | 4 ++--
.../interceptor/security/NamePasswordCallbackHandlerTest.java | 11 +++
.../servlet/servicelist/ServiceListJAASAuthenticator.java | 5 +++--
4 files changed, 17 insertions(+), 5 deletions(-)
diff --git
a/core/src/main/java/org/apache/cxf/interceptor/security/NameDigestPasswordCallbackHandler.java
b/core/src/main/java/org/apache/cxf/interceptor/security/NameDigestPasswordCallbackHandler.java
index a8e242d..97e0563 100644
---
a/core/src/main/java/org/apache/cxf/interceptor/security/NameDigestPasswordCallbackHandler.java
+++
b/core/src/main/java/org/apache/cxf/interceptor/security/NameDigestPasswordCallbackHandler.java
@@ -72,7 +72,7 @@ public class NameDigestPasswordCallbackHandler implements
CallbackHandler {
((NameCallback) callback).setName(username);
} else if (callback instanceof PasswordCallback) {
PasswordCallback pwCallback = (PasswordCallback) callback;
-pwCallback.setPassword(password.toCharArray());
+pwCallback.setPassword(password == null ? null :
password.toCharArray());
} else if (!invokePasswordCallback(callback)) {
org.apache.cxf.common.i18n.Message errorMsg =
new
org.apache.cxf.common.i18n.Message("UNSUPPORTED_CALLBACK_TYPE",
diff --git
a/core/src/main/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandler.java
b/core/src/main/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandler.java
index a5c7e81..c66bc72 100644
---
a/core/src/main/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandler.java
+++
b/core/src/main/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandler.java
@@ -64,7 +64,7 @@ public class NamePasswordCallbackHandler implements
CallbackHandler {
((NameCallback) callback).setName(username);
} else if (callback instanceof PasswordCallback) {
PasswordCallback pwCallback = (PasswordCallback) callback;
-pwCallback.setPassword(password.toCharArray());
+pwCallback.setPassword(password == null ? null :
password.toCharArray());
} else if (!invokePasswordCallback(callback)) {
org.apache.cxf.common.i18n.Message errorMsg =
new
org.apache.cxf.common.i18n.Message("UNSUPPORTED_CALLBACK_TYPE",
@@ -83,7 +83,7 @@ public class NamePasswordCallbackHandler implements
CallbackHandler {
/*
* This method is called from the handle(Callback[]) method when the
specified callback
* did not match any of the known callback classes. It looks for the
callback method
- * having the specified method name with one of the suppported parameter
types.
+ * having the specified method name with one of the supported parameter
types.
* If found, it invokes the callback method on the object and returns true.
* If not, it returns false.
*/
diff --git
a/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java
b/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java
index ab21a15..047cab4 100755
---
a/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java
+++
b/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java
@@ -26,6 +26,7 @@ import javax.security.auth.callback.PasswordCallback;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
/**
@@ -75,6 +76,16 @@ public class NamePasswordCallbackHandlerTest {
assertEquals("dog", new
String(((CharArrayCallback)callbacks[1]).getValue()));
}
+@Test
+public void testHandleCallbackNullPassword() throws Exception {
+NamePasswordCallbackHandler handler = new
NamePasswordCallbackHandler("Barry", null);
+Callback[] callbacks =
+new Callback[]{new NameCallback("name"), new
PasswordCallback("password", false)};
+handler.handle(callbac
[cxf] branch 3.5.x-fixes updated: CXF-8641 NPE on NamePasswordCallbackHandler
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.5.x-fixes by this push:
new 299a294 CXF-8641 NPE on NamePasswordCallbackHandler
299a294 is described below
commit 299a294adbeb413f76edc0686c00df0096f00085
Author: Jan Filipski
AuthorDate: Tue Jan 18 11:24:32 2022 +0100
CXF-8641
NPE on NamePasswordCallbackHandler
(cherry picked from commit b4f45e7ece7d5f6bdda6df6284decbccc00817af)
---
.../security/NameDigestPasswordCallbackHandler.java | 2 +-
.../cxf/interceptor/security/NamePasswordCallbackHandler.java | 4 ++--
.../interceptor/security/NamePasswordCallbackHandlerTest.java | 11 +++
.../servlet/servicelist/ServiceListJAASAuthenticator.java | 5 +++--
4 files changed, 17 insertions(+), 5 deletions(-)
diff --git
a/core/src/main/java/org/apache/cxf/interceptor/security/NameDigestPasswordCallbackHandler.java
b/core/src/main/java/org/apache/cxf/interceptor/security/NameDigestPasswordCallbackHandler.java
index a8e242d..97e0563 100644
---
a/core/src/main/java/org/apache/cxf/interceptor/security/NameDigestPasswordCallbackHandler.java
+++
b/core/src/main/java/org/apache/cxf/interceptor/security/NameDigestPasswordCallbackHandler.java
@@ -72,7 +72,7 @@ public class NameDigestPasswordCallbackHandler implements
CallbackHandler {
((NameCallback) callback).setName(username);
} else if (callback instanceof PasswordCallback) {
PasswordCallback pwCallback = (PasswordCallback) callback;
-pwCallback.setPassword(password.toCharArray());
+pwCallback.setPassword(password == null ? null :
password.toCharArray());
} else if (!invokePasswordCallback(callback)) {
org.apache.cxf.common.i18n.Message errorMsg =
new
org.apache.cxf.common.i18n.Message("UNSUPPORTED_CALLBACK_TYPE",
diff --git
a/core/src/main/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandler.java
b/core/src/main/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandler.java
index a5c7e81..c66bc72 100644
---
a/core/src/main/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandler.java
+++
b/core/src/main/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandler.java
@@ -64,7 +64,7 @@ public class NamePasswordCallbackHandler implements
CallbackHandler {
((NameCallback) callback).setName(username);
} else if (callback instanceof PasswordCallback) {
PasswordCallback pwCallback = (PasswordCallback) callback;
-pwCallback.setPassword(password.toCharArray());
+pwCallback.setPassword(password == null ? null :
password.toCharArray());
} else if (!invokePasswordCallback(callback)) {
org.apache.cxf.common.i18n.Message errorMsg =
new
org.apache.cxf.common.i18n.Message("UNSUPPORTED_CALLBACK_TYPE",
@@ -83,7 +83,7 @@ public class NamePasswordCallbackHandler implements
CallbackHandler {
/*
* This method is called from the handle(Callback[]) method when the
specified callback
* did not match any of the known callback classes. It looks for the
callback method
- * having the specified method name with one of the suppported parameter
types.
+ * having the specified method name with one of the supported parameter
types.
* If found, it invokes the callback method on the object and returns true.
* If not, it returns false.
*/
diff --git
a/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java
b/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java
index ab21a15..047cab4 100755
---
a/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java
+++
b/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java
@@ -26,6 +26,7 @@ import javax.security.auth.callback.PasswordCallback;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
/**
@@ -75,6 +76,16 @@ public class NamePasswordCallbackHandlerTest {
assertEquals("dog", new
String(((CharArrayCallback)callbacks[1]).getValue()));
}
+@Test
+public void testHandleCallbackNullPassword() throws Exception {
+NamePasswordCallbackHandler handler = new
NamePasswordCallbackHandler("Barry", null);
+Callback[] callbacks =
+new Callback[]{new NameCallback("name"), new
PasswordCallback("password", false)};
+handler.handle(callbacks);
+assertEquals("Barry", ((NameCallback)callba
[cxf] branch master updated: CXF-8641 NPE on NamePasswordCallbackHandler
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new b4f45e7 CXF-8641 NPE on NamePasswordCallbackHandler
new 02886aa Merge pull request #892 from globalbus/bugfix/CXF-8641
b4f45e7 is described below
commit b4f45e7ece7d5f6bdda6df6284decbccc00817af
Author: Jan Filipski
AuthorDate: Tue Jan 18 11:24:32 2022 +0100
CXF-8641
NPE on NamePasswordCallbackHandler
---
.../security/NameDigestPasswordCallbackHandler.java | 2 +-
.../cxf/interceptor/security/NamePasswordCallbackHandler.java | 4 ++--
.../interceptor/security/NamePasswordCallbackHandlerTest.java | 11 +++
.../servlet/servicelist/ServiceListJAASAuthenticator.java | 5 +++--
4 files changed, 17 insertions(+), 5 deletions(-)
diff --git
a/core/src/main/java/org/apache/cxf/interceptor/security/NameDigestPasswordCallbackHandler.java
b/core/src/main/java/org/apache/cxf/interceptor/security/NameDigestPasswordCallbackHandler.java
index a8e242d..97e0563 100644
---
a/core/src/main/java/org/apache/cxf/interceptor/security/NameDigestPasswordCallbackHandler.java
+++
b/core/src/main/java/org/apache/cxf/interceptor/security/NameDigestPasswordCallbackHandler.java
@@ -72,7 +72,7 @@ public class NameDigestPasswordCallbackHandler implements
CallbackHandler {
((NameCallback) callback).setName(username);
} else if (callback instanceof PasswordCallback) {
PasswordCallback pwCallback = (PasswordCallback) callback;
-pwCallback.setPassword(password.toCharArray());
+pwCallback.setPassword(password == null ? null :
password.toCharArray());
} else if (!invokePasswordCallback(callback)) {
org.apache.cxf.common.i18n.Message errorMsg =
new
org.apache.cxf.common.i18n.Message("UNSUPPORTED_CALLBACK_TYPE",
diff --git
a/core/src/main/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandler.java
b/core/src/main/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandler.java
index a5c7e81..c66bc72 100644
---
a/core/src/main/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandler.java
+++
b/core/src/main/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandler.java
@@ -64,7 +64,7 @@ public class NamePasswordCallbackHandler implements
CallbackHandler {
((NameCallback) callback).setName(username);
} else if (callback instanceof PasswordCallback) {
PasswordCallback pwCallback = (PasswordCallback) callback;
-pwCallback.setPassword(password.toCharArray());
+pwCallback.setPassword(password == null ? null :
password.toCharArray());
} else if (!invokePasswordCallback(callback)) {
org.apache.cxf.common.i18n.Message errorMsg =
new
org.apache.cxf.common.i18n.Message("UNSUPPORTED_CALLBACK_TYPE",
@@ -83,7 +83,7 @@ public class NamePasswordCallbackHandler implements
CallbackHandler {
/*
* This method is called from the handle(Callback[]) method when the
specified callback
* did not match any of the known callback classes. It looks for the
callback method
- * having the specified method name with one of the suppported parameter
types.
+ * having the specified method name with one of the supported parameter
types.
* If found, it invokes the callback method on the object and returns true.
* If not, it returns false.
*/
diff --git
a/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java
b/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java
index ab21a15..047cab4 100755
---
a/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java
+++
b/core/src/test/java/org/apache/cxf/interceptor/security/NamePasswordCallbackHandlerTest.java
@@ -26,6 +26,7 @@ import javax.security.auth.callback.PasswordCallback;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
/**
@@ -75,6 +76,16 @@ public class NamePasswordCallbackHandlerTest {
assertEquals("dog", new
String(((CharArrayCallback)callbacks[1]).getValue()));
}
+@Test
+public void testHandleCallbackNullPassword() throws Exception {
+NamePasswordCallbackHandler handler = new
NamePasswordCallbackHandler("Barry", null);
+Callback[] callbacks =
+new Callback[]{new NameCallback("name"), new
PasswordCallback("password", false)};
+handler.handle(callbacks);
+assertEquals("Barry", ((NameCallback)callbacks[0]).getNam
[cxf] branch 3.4.x-fixes updated: [CXF-8633]http.responseMessage gets lost in AbstractClient#setResponseBuilder
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.4.x-fixes by this push:
new 8c66020 [CXF-8633]http.responseMessage gets lost in
AbstractClient#setResponseBuilder
8c66020 is described below
commit 8c6602049325177b0eec2a4b820578f9cf5b550d
Author: Freeman Fang
AuthorDate: Wed Dec 22 12:38:21 2021 -0500
[CXF-8633]http.responseMessage gets lost in
AbstractClient#setResponseBuilder
(cherry picked from commit d23ed9dc87481d9a6cabdb2b6a6e086da6fcce24)
(cherry picked from commit 785da366e7a1e5b9bcd6869d0bdb04a4429dae13)
---
.../src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java | 8
1 file changed, 8 insertions(+)
diff --git
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
index bba3873..123d30f 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
@@ -102,6 +102,7 @@ import org.apache.cxf.phase.PhaseManager;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.transport.MessageObserver;
+import org.apache.cxf.transport.http.HTTPConduit;
/**
* Common proxy and http-centric client implementation
@@ -438,6 +439,12 @@ public abstract class AbstractClient implements Client {
if (responseMessage == null) {
return currentResponseBuilder;
}
+
+String reasonPhrase = (String)MessageUtils.getContextualProperty(
+ responseMessage, HTTPConduit.HTTP_RESPONSE_MESSAGE, null);
+if (reasonPhrase != null) {
+currentResponseBuilder.status(status, reasonPhrase);
+}
Map> protocolHeaders =
CastUtils.cast((Map)responseMessage.get(Message.PROTOCOL_HEADERS));
@@ -485,6 +492,7 @@ public abstract class AbstractClient implements Client {
}
InputStream mStream = responseMessage.getContent(InputStream.class);
currentResponseBuilder.entity(mStream);
+
return currentResponseBuilder;
}
[cxf] branch 3.5.x-fixes updated: [CXF-8633]http.responseMessage gets lost in AbstractClient#setResponseBuilder
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.5.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.5.x-fixes by this push:
new 785da36 [CXF-8633]http.responseMessage gets lost in
AbstractClient#setResponseBuilder
785da36 is described below
commit 785da366e7a1e5b9bcd6869d0bdb04a4429dae13
Author: Freeman Fang
AuthorDate: Wed Dec 22 12:38:21 2021 -0500
[CXF-8633]http.responseMessage gets lost in
AbstractClient#setResponseBuilder
(cherry picked from commit d23ed9dc87481d9a6cabdb2b6a6e086da6fcce24)
---
.../src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java | 8
1 file changed, 8 insertions(+)
diff --git
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
index bba3873..123d30f 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
@@ -102,6 +102,7 @@ import org.apache.cxf.phase.PhaseManager;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.transport.MessageObserver;
+import org.apache.cxf.transport.http.HTTPConduit;
/**
* Common proxy and http-centric client implementation
@@ -438,6 +439,12 @@ public abstract class AbstractClient implements Client {
if (responseMessage == null) {
return currentResponseBuilder;
}
+
+String reasonPhrase = (String)MessageUtils.getContextualProperty(
+ responseMessage, HTTPConduit.HTTP_RESPONSE_MESSAGE, null);
+if (reasonPhrase != null) {
+currentResponseBuilder.status(status, reasonPhrase);
+}
Map> protocolHeaders =
CastUtils.cast((Map)responseMessage.get(Message.PROTOCOL_HEADERS));
@@ -485,6 +492,7 @@ public abstract class AbstractClient implements Client {
}
InputStream mStream = responseMessage.getContent(InputStream.class);
currentResponseBuilder.entity(mStream);
+
return currentResponseBuilder;
}
[cxf] branch master updated: [CXF-8633]http.responseMessage gets lost in AbstractClient#setResponseBuilder
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new d23ed9d [CXF-8633]http.responseMessage gets lost in
AbstractClient#setResponseBuilder
d23ed9d is described below
commit d23ed9dc87481d9a6cabdb2b6a6e086da6fcce24
Author: Freeman Fang
AuthorDate: Wed Dec 22 12:38:21 2021 -0500
[CXF-8633]http.responseMessage gets lost in
AbstractClient#setResponseBuilder
---
.../src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java | 8
1 file changed, 8 insertions(+)
diff --git
a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
index bba3873..123d30f 100644
--- a/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
+++ b/rt/rs/client/src/main/java/org/apache/cxf/jaxrs/client/AbstractClient.java
@@ -102,6 +102,7 @@ import org.apache.cxf.phase.PhaseManager;
import org.apache.cxf.service.Service;
import org.apache.cxf.service.model.BindingOperationInfo;
import org.apache.cxf.transport.MessageObserver;
+import org.apache.cxf.transport.http.HTTPConduit;
/**
* Common proxy and http-centric client implementation
@@ -438,6 +439,12 @@ public abstract class AbstractClient implements Client {
if (responseMessage == null) {
return currentResponseBuilder;
}
+
+String reasonPhrase = (String)MessageUtils.getContextualProperty(
+ responseMessage, HTTPConduit.HTTP_RESPONSE_MESSAGE, null);
+if (reasonPhrase != null) {
+currentResponseBuilder.status(status, reasonPhrase);
+}
Map> protocolHeaders =
CastUtils.cast((Map)responseMessage.get(Message.PROTOCOL_HEADERS));
@@ -485,6 +492,7 @@ public abstract class AbstractClient implements Client {
}
InputStream mStream = responseMessage.getContent(InputStream.class);
currentResponseBuilder.entity(mStream);
+
return currentResponseBuilder;
}
[cxf] 02/02: [CXF-8627]AttachmentDataSource should always returns a valid contentType
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 72268ee6651346ee0095029fd82d7c2964050d92
Author: Freeman Fang
AuthorDate: Tue Dec 14 16:29:39 2021 -0500
[CXF-8627]AttachmentDataSource should always returns a valid contentType
(cherry picked from commit d27ad0157e49fdd601f702823155ff813880de5b)
(cherry picked from commit 34d2d42f98cfc16be6d516edca837c0b36bd406c)
---
.../main/java/org/apache/cxf/attachment/AttachmentDataSource.java | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git
a/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
b/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
index 1e2dc09..ae9ca10 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
@@ -25,6 +25,7 @@ import java.io.OutputStream;
import javax.activation.DataSource;
+import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.io.CacheSizeExceededException;
import org.apache.cxf.io.CachedOutputStream;
@@ -32,7 +33,7 @@ import org.apache.cxf.message.Message;
public class AttachmentDataSource implements DataSource {
-private final String ct;
+private String ct;
private CachedOutputStream cache;
private InputStream ins;
private DelegatingInputStream delegate;
@@ -76,6 +77,9 @@ public class AttachmentDataSource implements DataSource {
}
public String getContentType() {
+if (StringUtils.isEmpty(ct)) {
+ct = "application/octet-stream";
+}
return ct;
}
[cxf] branch 3.3.x-fixes updated (27e2bdc -> 72268ee)
This is an automated email from the ASF dual-hosted git repository. ffang pushed a change to branch 3.3.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git. from 27e2bdc Recording .gitmergeinfo Changes new 52ba7c0 [CXF-8626]async http client may handle response by multiple threads on work queue new 72268ee [CXF-8627]AttachmentDataSource should always returns a valid contentType 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: .../cxf/attachment/AttachmentDataSource.java | 6 - .../http/asyncclient/AsyncHTTPConduit.java | 2 +- .../http/asyncclient/AsyncHTTPConduitTest.java | 26 ++ 3 files changed, 32 insertions(+), 2 deletions(-)
[cxf] 01/02: [CXF-8626]async http client may handle response by multiple threads on work queue
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 52ba7c05fb85e696544479f01f66193d47d9552b
Author: Freeman Fang
AuthorDate: Tue Dec 14 16:18:07 2021 -0500
[CXF-8626]async http client may handle response by multiple threads on work
queue
(cherry picked from commit b42882889c4d0c7010c65d17bae50e86bb624675)
(cherry picked from commit ef721549e4a7d0ed5a06af7d6bb4adfe7af11a69)
---
.../http/asyncclient/AsyncHTTPConduit.java | 2 +-
.../http/asyncclient/AsyncHTTPConduitTest.java | 26 ++
2 files changed, 27 insertions(+), 1 deletion(-)
diff --git
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
index fc71e8c..3cd8ed2 100755
---
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
+++
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
@@ -674,7 +674,7 @@ public class AsyncHTTPConduit extends
URLConnectionHTTPConduit {
}
protected void handleResponseAsync() throws IOException {
-isAsync = true;
+
}
protected void closeInputStream() throws IOException {
diff --git
a/rt/transports/http-hc/src/test/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitTest.java
b/rt/transports/http-hc/src/test/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitTest.java
index ee3ebca..f6e4ef5 100644
---
a/rt/transports/http-hc/src/test/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitTest.java
+++
b/rt/transports/http-hc/src/test/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitTest.java
@@ -188,6 +188,32 @@ public class AsyncHTTPConduitTest extends
AbstractBusClientServerTestBase {
}
@Test
+public void testRetransmitAsync() throws Exception {
+
+updateAddressPort(g, PORT);
+HTTPConduit c = (HTTPConduit)ClientProxy.getClient(g).getConduit();
+HTTPClientPolicy cp = new HTTPClientPolicy();
+cp.setMaxRetransmits(2);
+cp.setChunkLength(20);
+c.setClient(cp);
+GreetMeResponse resp = (GreetMeResponse)g.greetMeAsync(request, new
AsyncHandler() {
+public void handleResponse(Response res) {
+try {
+res.get().getResponseType();
+} catch (InterruptedException | ExecutionException e) {
+e.printStackTrace();
+}
+}
+}).get();
+assertEquals("Hello " + request, resp.getResponseType());
+
+g.greetMeLaterAsync(1000, new AsyncHandler() {
+public void handleResponse(Response res) {
+}
+}).get();
+}
+
+@Test
public void testTimeoutAsyncWithPropertySetting() throws Exception {
updateAddressPort(g, PORT);
((javax.xml.ws.BindingProvider)g).getRequestContext().put("javax.xml.ws.client.receiveTimeout",
[cxf] 01/02: [CXF-8626]async http client may handle response by multiple threads on work queue
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit ef721549e4a7d0ed5a06af7d6bb4adfe7af11a69
Author: Freeman Fang
AuthorDate: Tue Dec 14 16:18:07 2021 -0500
[CXF-8626]async http client may handle response by multiple threads on work
queue
(cherry picked from commit b42882889c4d0c7010c65d17bae50e86bb624675)
---
.../http/asyncclient/AsyncHTTPConduit.java | 2 +-
.../http/asyncclient/AsyncHTTPConduitTest.java | 26 ++
2 files changed, 27 insertions(+), 1 deletion(-)
diff --git
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
index fc71e8c..3cd8ed2 100755
---
a/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
+++
b/rt/transports/http-hc/src/main/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduit.java
@@ -674,7 +674,7 @@ public class AsyncHTTPConduit extends
URLConnectionHTTPConduit {
}
protected void handleResponseAsync() throws IOException {
-isAsync = true;
+
}
protected void closeInputStream() throws IOException {
diff --git
a/rt/transports/http-hc/src/test/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitTest.java
b/rt/transports/http-hc/src/test/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitTest.java
index 6f9f3be..057a636 100644
---
a/rt/transports/http-hc/src/test/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitTest.java
+++
b/rt/transports/http-hc/src/test/java/org/apache/cxf/transport/http/asyncclient/AsyncHTTPConduitTest.java
@@ -188,6 +188,32 @@ public class AsyncHTTPConduitTest extends
AbstractBusClientServerTestBase {
}
@Test
+public void testRetransmitAsync() throws Exception {
+
+updateAddressPort(g, PORT);
+HTTPConduit c = (HTTPConduit)ClientProxy.getClient(g).getConduit();
+HTTPClientPolicy cp = new HTTPClientPolicy();
+cp.setMaxRetransmits(2);
+cp.setChunkLength(20);
+c.setClient(cp);
+GreetMeResponse resp = (GreetMeResponse)g.greetMeAsync(request, new
AsyncHandler() {
+public void handleResponse(Response res) {
+try {
+res.get().getResponseType();
+} catch (InterruptedException | ExecutionException e) {
+e.printStackTrace();
+}
+}
+}).get();
+assertEquals("Hello " + request, resp.getResponseType());
+
+g.greetMeLaterAsync(1000, new AsyncHandler() {
+public void handleResponse(Response res) {
+}
+}).get();
+}
+
+@Test
public void testTimeoutAsyncWithPropertySetting() throws Exception {
updateAddressPort(g, PORT);
((javax.xml.ws.BindingProvider)g).getRequestContext().put("javax.xml.ws.client.receiveTimeout",
[cxf] 02/02: [CXF-8627]AttachmentDataSource should always returns a valid contentType
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 34d2d42f98cfc16be6d516edca837c0b36bd406c
Author: Freeman Fang
AuthorDate: Tue Dec 14 16:29:39 2021 -0500
[CXF-8627]AttachmentDataSource should always returns a valid contentType
(cherry picked from commit d27ad0157e49fdd601f702823155ff813880de5b)
---
.../main/java/org/apache/cxf/attachment/AttachmentDataSource.java | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git
a/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
b/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
index 1e2dc09..ae9ca10 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
@@ -25,6 +25,7 @@ import java.io.OutputStream;
import javax.activation.DataSource;
+import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.io.CacheSizeExceededException;
import org.apache.cxf.io.CachedOutputStream;
@@ -32,7 +33,7 @@ import org.apache.cxf.message.Message;
public class AttachmentDataSource implements DataSource {
-private final String ct;
+private String ct;
private CachedOutputStream cache;
private InputStream ins;
private DelegatingInputStream delegate;
@@ -76,6 +77,9 @@ public class AttachmentDataSource implements DataSource {
}
public String getContentType() {
+if (StringUtils.isEmpty(ct)) {
+ct = "application/octet-stream";
+}
return ct;
}
[cxf] branch master updated: [CXF-8627]AttachmentDataSource should always returns a valid contentType
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new d27ad01 [CXF-8627]AttachmentDataSource should always returns a valid
contentType
new bc59057 Merge branch 'master' of github.com:apache/cxf
d27ad01 is described below
commit d27ad0157e49fdd601f702823155ff813880de5b
Author: Freeman Fang
AuthorDate: Tue Dec 14 16:29:39 2021 -0500
[CXF-8627]AttachmentDataSource should always returns a valid contentType
---
.../main/java/org/apache/cxf/attachment/AttachmentDataSource.java | 6 +-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git
a/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
b/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
index 6e4fa1a..a10c682 100644
--- a/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
+++ b/core/src/main/java/org/apache/cxf/attachment/AttachmentDataSource.java
@@ -25,6 +25,7 @@ import java.io.OutputStream;
import javax.activation.DataSource;
+import org.apache.cxf.common.util.StringUtils;
import org.apache.cxf.helpers.IOUtils;
import org.apache.cxf.io.CacheSizeExceededException;
import org.apache.cxf.io.CachedOutputStream;
@@ -32,7 +33,7 @@ import org.apache.cxf.message.Message;
public class AttachmentDataSource implements DataSource {
-private final String ct;
+private String ct;
private CachedOutputStream cache;
private InputStream ins;
private DelegatingInputStream delegate;
@@ -76,6 +77,9 @@ public class AttachmentDataSource implements DataSource {
}
public String getContentType() {
+if (StringUtils.isEmpty(ct)) {
+ct = "application/octet-stream";
+}
return ct;
}
[cxf] branch master updated (f2de9e2 -> 8039f64)
This is an automated email from the ASF dual-hosted git repository. ffang pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git. from f2de9e2 Update maven-javadoc-plugin to 3.3.1 (#883) add b428828 [CXF-8626]async http client may handle response by multiple threads on work queue add 8039f64 Merge branch 'master' of github.com:apache/cxf No new revisions were added by this update. Summary of changes: .../http/asyncclient/AsyncHTTPConduit.java | 2 +- .../http/asyncclient/AsyncHTTPConduitTest.java | 26 ++ 2 files changed, 27 insertions(+), 1 deletion(-)
[cxf] branch 3.4.x-fixes updated: [CXF-8614]ensure OSGi header of cxf-core to import com.sun.codemodel.writer package
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.4.x-fixes by this push:
new b051397 [CXF-8614]ensure OSGi header of cxf-core to import
com.sun.codemodel.writer package
b051397 is described below
commit b0513975cdd280e5d235fdda72cbfbde73ae2cb3
Author: Freeman Fang
AuthorDate: Mon Nov 1 15:29:14 2021 -0400
[CXF-8614]ensure OSGi header of cxf-core to import com.sun.codemodel.writer
package
(cherry picked from commit f9cf44fb1203b45833e5050688ae353bab788d32)
---
core/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index 81124e1..a334e49 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -46,6 +46,7 @@
com.sun.msv*;resolution:=optional,
com.sun.tools*;resolution:=optional,
com.sun.xml*;resolution:=optional,
+com.sun.codemodel.writer;resolution:=optional,
org.slf4j*;resolution:=optional;version="${cxf.osgi.slf4j.version}",
net.sf.cglib*;resolution:=optional;version="${cxf.cglib.osgi.version}",
org.springframework.osgi.io;resolution:=optional;version="${cxf.osgi.spring.osgi.version}",
@@ -65,8 +66,7 @@
org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional,
org.apache.karaf.jaas.boot.principal;resolution:=optional,
org.apache.commons.logging;resolution:=optional,
-!sun.misc,
-!com.sun.codemodel.writer
+!sun.misc
org.apache.cxf.bus,org.apache.cxf.*,com.ctc.wstx.*,org.apache.karaf.jaas.boot.principal.*
[cxf] branch master updated: [CXF-8614]ensure OSGi header of cxf-core to import com.sun.codemodel.writer package
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new f9cf44f [CXF-8614]ensure OSGi header of cxf-core to import
com.sun.codemodel.writer package
f9cf44f is described below
commit f9cf44fb1203b45833e5050688ae353bab788d32
Author: Freeman Fang
AuthorDate: Mon Nov 1 15:29:14 2021 -0400
[CXF-8614]ensure OSGi header of cxf-core to import com.sun.codemodel.writer
package
---
core/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/core/pom.xml b/core/pom.xml
index dd2882c..e5c4775 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -46,6 +46,7 @@
com.sun.msv*;resolution:=optional,
com.sun.tools*;resolution:=optional,
com.sun.xml*;resolution:=optional,
+com.sun.codemodel.writer;resolution:=optional,
org.slf4j*;resolution:=optional;version="${cxf.osgi.slf4j.version}",
net.sf.cglib*;resolution:=optional;version="${cxf.cglib.osgi.version}",
org.springframework.osgi.io;resolution:=optional;version="${cxf.osgi.spring.osgi.version}",
@@ -65,8 +66,7 @@
org.apache.aries*;version="${cxf.aries.version.range}";resolution:=optional,
org.apache.karaf.jaas.boot.principal;resolution:=optional,
org.apache.commons.logging;resolution:=optional,
-!sun.misc,
-!com.sun.codemodel.writer
+!sun.misc
org.apache.cxf.bus,org.apache.cxf.*,com.ctc.wstx.*,org.apache.karaf.jaas.boot.principal.*
[cxf] branch 3.4.x-fixes updated: [CXF-8608]WSSCTest always failed with JDK8
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.4.x-fixes by this push:
new 6121317 [CXF-8608]WSSCTest always failed with JDK8
6121317 is described below
commit 612131768b984aefc1c9a0fa78327c87161986fc
Author: Freeman Fang
AuthorDate: Fri Oct 15 15:52:41 2021 -0400
[CXF-8608]WSSCTest always failed with JDK8
(cherry picked from commit 11824047b6a9e639fd78be030b4667917836ed96)
---
.../src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java
index a5ffe53..934caef 100644
---
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java
+++
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java
@@ -120,6 +120,7 @@ public class WSSCTest extends
AbstractBusClientServerTestBase {
@Parameters(name = "{0}")
public static Collection data() {
return Arrays.asList(new TestParam[] {
+new
TestParam("SecureConversation_UserNameOverTransport_IPingService", STAX_PORT2,
true),
new
TestParam("SecureConversation_UserNameOverTransport_IPingService", PORT2,
false),
new
TestParam("SecureConversation_MutualCertificate10SignEncrypt_IPingService",
PORT, false),
new TestParam("AC_IPingService", PORT, false),
@@ -200,7 +201,6 @@ public class WSSCTest extends
AbstractBusClientServerTestBase {
new TestParam("_XD-SEES_IPingService", STAX_PORT, false),
new TestParam("_XD-ES_IPingService", STAX_PORT, false),
-new
TestParam("SecureConversation_UserNameOverTransport_IPingService", STAX_PORT2,
true),
// TODO Endorsing derived keys not supported.
// new
TestParam("SecureConversation_MutualCertificate10SignEncrypt_IPingService",
// STAX_PORT, true),
[cxf] branch master updated: [CXF-8608]WSSCTest always failed with JDK8
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 1182404 [CXF-8608]WSSCTest always failed with JDK8
1182404 is described below
commit 11824047b6a9e639fd78be030b4667917836ed96
Author: Freeman Fang
AuthorDate: Fri Oct 15 15:52:41 2021 -0400
[CXF-8608]WSSCTest always failed with JDK8
---
.../src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java
index a5ffe53..934caef 100644
---
a/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java
+++
b/systests/ws-security/src/test/java/org/apache/cxf/systest/ws/wssc/WSSCTest.java
@@ -120,6 +120,7 @@ public class WSSCTest extends
AbstractBusClientServerTestBase {
@Parameters(name = "{0}")
public static Collection data() {
return Arrays.asList(new TestParam[] {
+new
TestParam("SecureConversation_UserNameOverTransport_IPingService", STAX_PORT2,
true),
new
TestParam("SecureConversation_UserNameOverTransport_IPingService", PORT2,
false),
new
TestParam("SecureConversation_MutualCertificate10SignEncrypt_IPingService",
PORT, false),
new TestParam("AC_IPingService", PORT, false),
@@ -200,7 +201,6 @@ public class WSSCTest extends
AbstractBusClientServerTestBase {
new TestParam("_XD-SEES_IPingService", STAX_PORT, false),
new TestParam("_XD-ES_IPingService", STAX_PORT, false),
-new
TestParam("SecureConversation_UserNameOverTransport_IPingService", STAX_PORT2,
true),
// TODO Endorsing derived keys not supported.
// new
TestParam("SecureConversation_MutualCertificate10SignEncrypt_IPingService",
// STAX_PORT, true),
[cxf] branch 3.4.x-fixes updated: CXF-8607 OpenApiFeature: OpenApiCustomizer doesn´t work with runAsFilter
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.4.x-fixes by this push:
new da1fece CXF-8607 OpenApiFeature: OpenApiCustomizer doesn´t work with
runAsFilter
da1fece is described below
commit da1fece268c806a8d03cc204135492e99a5690af
Author: FWermelskirchen
AuthorDate: Wed Oct 13 14:08:13 2021 +0200
CXF-8607 OpenApiFeature: OpenApiCustomizer doesn´t work with runAsFilter
(cherry picked from commit 0c02781a0df19ab29e871f16a0943755cd2afb9f)
---
.../apache/cxf/jaxrs/openapi/OpenApiFeature.java | 56 --
1 file changed, 53 insertions(+), 3 deletions(-)
diff --git
a/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/OpenApiFeature.java
b/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/OpenApiFeature.java
index 4f51d87..ddac359 100644
---
a/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/OpenApiFeature.java
+++
b/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/OpenApiFeature.java
@@ -496,7 +496,7 @@ public class OpenApiFeature extends
DelegatingFeature
.getUserDefinedOptions());
registerOpenApiResources(sfb, packages,
context.getOpenApiConfiguration());
registerSwaggerUiResources(sfb, combine(swaggerProps,
userProperties), factory, bus);
-registerSwaggerContainerRequestFilter(factory, application);
+registerSwaggerContainerRequestFilter(factory, application,
context.getOpenApiConfiguration());
if (useContextBasedConfig) {
registerServletConfigProvider(factory);
@@ -512,10 +512,13 @@ public class OpenApiFeature extends
DelegatingFeature
}
}
-private void
registerSwaggerContainerRequestFilter(ServerProviderFactory factory,
Application application) {
+private void
registerSwaggerContainerRequestFilter(ServerProviderFactory factory,
Application application,
+
OpenAPIConfiguration config) {
if (isRunAsFilter()) {
List providers = new ArrayList<>();
-providers.add(new SwaggerContainerRequestFilter(application));
+BaseOpenApiResource filter =
createOpenApiRequestFilter(application).openApiConfiguration(config)
+.configLocation(configLocation);
+providers.add(filter);
factory.setUserProviders(providers);
}
@@ -914,6 +917,11 @@ public class OpenApiFeature extends
DelegatingFeature
private BaseOpenApiResource createOpenApiResource() {
return (customizer == null) ? new OpenApiResource() : new
OpenApiCustomizedResource(customizer);
}
+
+private BaseOpenApiResource createOpenApiRequestFilter(Application
application) {
+return (customizer == null) ? new
SwaggerContainerRequestFilter(application)
+: new CustomizedSwaggerContainerRequestFilter(application,
customizer);
+}
}
@PreMatching
@@ -955,4 +963,46 @@ public class OpenApiFeature extends
DelegatingFeature
}
}
}
+
+@PreMatching
+protected static class CustomizedSwaggerContainerRequestFilter extends
OpenApiCustomizedResource
+implements ContainerRequestFilter {
+
+protected static final String APIDOCS_LISTING_PATH_JSON =
"openapi.json";
+protected static final String APIDOCS_LISTING_PATH_YAML =
"openapi.yaml";
+
+
+@Context
+protected MessageContext mc;
+
+private Application app;
+public CustomizedSwaggerContainerRequestFilter(Application app,
OpenApiCustomizer customizer) {
+super(customizer);
+this.app = app;
+}
+
+@Override
+public void filter(ContainerRequestContext requestContext) throws
IOException {
+UriInfo ui = mc.getUriInfo();
+
+Response response = null;
+if (ui.getPath().endsWith(APIDOCS_LISTING_PATH_JSON)) {
+try {
+response = super.getOpenApi(app, mc.getServletConfig(),
mc.getHttpHeaders(), ui, "json");
+} catch (Exception ex) {
+throw new IOException(ex);
+}
+} else if (ui.getPath().endsWith(APIDOCS_LISTING_PATH_YAML)) {
+try {
+response = super.getOpenApi(app, mc.getServletConfig(),
mc.getHttpHeaders(), ui, "yaml");
+} catch (Exception ex) {
+throw new IOException(ex);
+}
+}
+
+if (response != null) {
+requestContext.abortWith(response);
+}
+}
+}
}
[cxf] branch master updated: CXF-8607 OpenApiFeature: OpenApiCustomizer doesn´t work with runAsFilter
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 0c02781 CXF-8607 OpenApiFeature: OpenApiCustomizer doesn´t work with
runAsFilter
new b2731a6 Merge pull request #864 from DevFlorian/master
0c02781 is described below
commit 0c02781a0df19ab29e871f16a0943755cd2afb9f
Author: FWermelskirchen
AuthorDate: Wed Oct 13 14:08:13 2021 +0200
CXF-8607 OpenApiFeature: OpenApiCustomizer doesn´t work with runAsFilter
---
.../apache/cxf/jaxrs/openapi/OpenApiFeature.java | 56 --
1 file changed, 53 insertions(+), 3 deletions(-)
diff --git
a/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/OpenApiFeature.java
b/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/OpenApiFeature.java
index 4f51d87..ddac359 100644
---
a/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/OpenApiFeature.java
+++
b/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/OpenApiFeature.java
@@ -496,7 +496,7 @@ public class OpenApiFeature extends
DelegatingFeature
.getUserDefinedOptions());
registerOpenApiResources(sfb, packages,
context.getOpenApiConfiguration());
registerSwaggerUiResources(sfb, combine(swaggerProps,
userProperties), factory, bus);
-registerSwaggerContainerRequestFilter(factory, application);
+registerSwaggerContainerRequestFilter(factory, application,
context.getOpenApiConfiguration());
if (useContextBasedConfig) {
registerServletConfigProvider(factory);
@@ -512,10 +512,13 @@ public class OpenApiFeature extends
DelegatingFeature
}
}
-private void
registerSwaggerContainerRequestFilter(ServerProviderFactory factory,
Application application) {
+private void
registerSwaggerContainerRequestFilter(ServerProviderFactory factory,
Application application,
+
OpenAPIConfiguration config) {
if (isRunAsFilter()) {
List providers = new ArrayList<>();
-providers.add(new SwaggerContainerRequestFilter(application));
+BaseOpenApiResource filter =
createOpenApiRequestFilter(application).openApiConfiguration(config)
+.configLocation(configLocation);
+providers.add(filter);
factory.setUserProviders(providers);
}
@@ -914,6 +917,11 @@ public class OpenApiFeature extends
DelegatingFeature
private BaseOpenApiResource createOpenApiResource() {
return (customizer == null) ? new OpenApiResource() : new
OpenApiCustomizedResource(customizer);
}
+
+private BaseOpenApiResource createOpenApiRequestFilter(Application
application) {
+return (customizer == null) ? new
SwaggerContainerRequestFilter(application)
+: new CustomizedSwaggerContainerRequestFilter(application,
customizer);
+}
}
@PreMatching
@@ -955,4 +963,46 @@ public class OpenApiFeature extends
DelegatingFeature
}
}
}
+
+@PreMatching
+protected static class CustomizedSwaggerContainerRequestFilter extends
OpenApiCustomizedResource
+implements ContainerRequestFilter {
+
+protected static final String APIDOCS_LISTING_PATH_JSON =
"openapi.json";
+protected static final String APIDOCS_LISTING_PATH_YAML =
"openapi.yaml";
+
+
+@Context
+protected MessageContext mc;
+
+private Application app;
+public CustomizedSwaggerContainerRequestFilter(Application app,
OpenApiCustomizer customizer) {
+super(customizer);
+this.app = app;
+}
+
+@Override
+public void filter(ContainerRequestContext requestContext) throws
IOException {
+UriInfo ui = mc.getUriInfo();
+
+Response response = null;
+if (ui.getPath().endsWith(APIDOCS_LISTING_PATH_JSON)) {
+try {
+response = super.getOpenApi(app, mc.getServletConfig(),
mc.getHttpHeaders(), ui, "json");
+} catch (Exception ex) {
+throw new IOException(ex);
+}
+} else if (ui.getPath().endsWith(APIDOCS_LISTING_PATH_YAML)) {
+try {
+response = super.getOpenApi(app, mc.getServletConfig(),
mc.getHttpHeaders(), ui, "yaml");
+} catch (Exception ex) {
+throw new IOException(ex);
+}
+}
+
+if (response != null) {
+requestContext.abortWith(response);
+}
+}
+}
}
[cxf] branch 3.3.x-fixes updated: [CXF-8603]ClassLoaderUtils.setThreadContextClassloader attempts to set null class loader
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.3.x-fixes by this push:
new d675adc [CXF-8603]ClassLoaderUtils.setThreadContextClassloader
attempts to set null class loader
d675adc is described below
commit d675adcc13796cf81a1489f4eac6a239ea6c9382
Author: Freeman Fang
AuthorDate: Fri Oct 8 12:56:54 2021 -0400
[CXF-8603]ClassLoaderUtils.setThreadContextClassloader attempts to set null
class loader
(cherry picked from commit b1753fa70a86292e0965cf570fae5d81e280080a)
(cherry picked from commit c949fb0977ebde946fb5d0c942f1cca6ef7af186)
---
core/src/main/java/org/apache/cxf/helpers/XPathUtils.java | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/helpers/XPathUtils.java
b/core/src/main/java/org/apache/cxf/helpers/XPathUtils.java
index 7475434..77d3f41 100644
--- a/core/src/main/java/org/apache/cxf/helpers/XPathUtils.java
+++ b/core/src/main/java/org/apache/cxf/helpers/XPathUtils.java
@@ -69,8 +69,10 @@ public class XPathUtils {
}
public Object getValue(String xpathExpression, Node node, QName type) {
-ClassLoaderHolder loader
-=
ClassLoaderUtils.setThreadContextClassloader(getClassLoader(xpath.getClass()));
+ClassLoaderHolder loader = null;
+if (getClassLoader(xpath.getClass()) != null) {
+loader =
ClassLoaderUtils.setThreadContextClassloader(getClassLoader(xpath.getClass()));
+}
try {
return xpath.evaluate(xpathExpression, node, type);
} catch (Exception e) {
[cxf] branch 3.4.x-fixes updated: [CXF-8603]ClassLoaderUtils.setThreadContextClassloader attempts to set null class loader
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.4.x-fixes by this push:
new c949fb0 [CXF-8603]ClassLoaderUtils.setThreadContextClassloader
attempts to set null class loader
c949fb0 is described below
commit c949fb0977ebde946fb5d0c942f1cca6ef7af186
Author: Freeman Fang
AuthorDate: Fri Oct 8 12:56:54 2021 -0400
[CXF-8603]ClassLoaderUtils.setThreadContextClassloader attempts to set null
class loader
(cherry picked from commit b1753fa70a86292e0965cf570fae5d81e280080a)
---
core/src/main/java/org/apache/cxf/helpers/XPathUtils.java | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/helpers/XPathUtils.java
b/core/src/main/java/org/apache/cxf/helpers/XPathUtils.java
index 7475434..77d3f41 100644
--- a/core/src/main/java/org/apache/cxf/helpers/XPathUtils.java
+++ b/core/src/main/java/org/apache/cxf/helpers/XPathUtils.java
@@ -69,8 +69,10 @@ public class XPathUtils {
}
public Object getValue(String xpathExpression, Node node, QName type) {
-ClassLoaderHolder loader
-=
ClassLoaderUtils.setThreadContextClassloader(getClassLoader(xpath.getClass()));
+ClassLoaderHolder loader = null;
+if (getClassLoader(xpath.getClass()) != null) {
+loader =
ClassLoaderUtils.setThreadContextClassloader(getClassLoader(xpath.getClass()));
+}
try {
return xpath.evaluate(xpathExpression, node, type);
} catch (Exception e) {
[cxf] branch master updated: [CXF-8603]ClassLoaderUtils.setThreadContextClassloader attempts to set null class loader
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new b1753fa [CXF-8603]ClassLoaderUtils.setThreadContextClassloader
attempts to set null class loader
b1753fa is described below
commit b1753fa70a86292e0965cf570fae5d81e280080a
Author: Freeman Fang
AuthorDate: Fri Oct 8 12:56:54 2021 -0400
[CXF-8603]ClassLoaderUtils.setThreadContextClassloader attempts to set null
class loader
---
core/src/main/java/org/apache/cxf/helpers/XPathUtils.java | 6 --
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/core/src/main/java/org/apache/cxf/helpers/XPathUtils.java
b/core/src/main/java/org/apache/cxf/helpers/XPathUtils.java
index 7475434..77d3f41 100644
--- a/core/src/main/java/org/apache/cxf/helpers/XPathUtils.java
+++ b/core/src/main/java/org/apache/cxf/helpers/XPathUtils.java
@@ -69,8 +69,10 @@ public class XPathUtils {
}
public Object getValue(String xpathExpression, Node node, QName type) {
-ClassLoaderHolder loader
-=
ClassLoaderUtils.setThreadContextClassloader(getClassLoader(xpath.getClass()));
+ClassLoaderHolder loader = null;
+if (getClassLoader(xpath.getClass()) != null) {
+loader =
ClassLoaderUtils.setThreadContextClassloader(getClassLoader(xpath.getClass()));
+}
try {
return xpath.evaluate(xpathExpression, node, type);
} catch (Exception e) {
[cxf] 01/02: [CXF-8590] Add synchronization to UnknownExtensibilityElement.getElement() call sites. The Element returned from getElement may not be thread safe, so we have to take precautions when acc
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit c7cb26832cc8cb8e9cd04b600101c22459883c0f
Author: Kim Johan Andersson
AuthorDate: Thu Sep 2 11:42:43 2021 +0200
[CXF-8590]
Add synchronization to UnknownExtensibilityElement.getElement() call sites.
The Element returned from getElement may not be thread safe, so we have to
take precautions when accessing the Element.
Also synchronize on the DescriptionInfo parameter in
Wsdl11AttachmentPolicyProvider.getElementPolicy to avoid a race condition when
registeredPolicy is not yet set.
(cherry picked from commit 73b65172322a046c36199dda289e3da6b75c001b)
---
.../apache/cxf/jaxws/EndpointReferenceBuilder.java | 26
.../cxf/jaxws/support/JaxWsEndpointImpl.java | 15 +++--
.../cxf/ws/policy/PolicyAnnotationListener.java| 18 --
.../LocalServiceModelReferenceResolver.java| 15 +++--
.../wsdl11/Wsdl11AttachmentPolicyProvider.java | 72 --
.../java/org/apache/cxf/wsdl11/SchemaUtil.java | 6 +-
.../org/apache/cxf/wsdl11/ServiceWSDLBuilder.java | 6 +-
7 files changed, 95 insertions(+), 63 deletions(-)
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointReferenceBuilder.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointReferenceBuilder.java
index 311974d..852705e 100644
---
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointReferenceBuilder.java
+++
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/EndpointReferenceBuilder.java
@@ -59,19 +59,21 @@ public class EndpointReferenceBuilder {
while (extensionElements.hasNext()) {
ExtensibilityElement ext = extensionElements.next();
if (ext instanceof UnknownExtensibilityElement &&
wsaEpr.equals(ext.getElementType())) {
-Element eprEle =
((UnknownExtensibilityElement)ext).getElement();
-List addressElements =
DOMUtils.getChildrenWithName(eprEle,
-
Names.WSA_NAMESPACE_NAME,
-
Names.WSA_ADDRESS_NAME);
-if (!addressElements.isEmpty()) {
-/*
- * [WSA-WSDL Binding] : in a SOAP 1.1 port described
using WSDL 1.1, the location
- * attribute of a soap11:address element (if present)
would have the same value as the
- * wsa:Address child element of the
wsa:EndpointReference element.
- */
-
addressElements.get(0).setTextContent(this.endpoint.getEndpointInfo().getAddress());
+final Element eprEle =
((UnknownExtensibilityElement)ext).getElement();
+synchronized (eprEle.getOwnerDocument()) {
+List addressElements =
DOMUtils.getChildrenWithName(eprEle,
+
Names.WSA_NAMESPACE_NAME,
+
Names.WSA_ADDRESS_NAME);
+if (!addressElements.isEmpty()) {
+/*
+ * [WSA-WSDL Binding] : in a SOAP 1.1 port
described using WSDL 1.1, the location
+ * attribute of a soap11:address element (if
present) would have the same value as the
+ * wsa:Address child element of the
wsa:EndpointReference element.
+ */
+
addressElements.get(0).setTextContent(this.endpoint.getEndpointInfo().getAddress());
+}
+return EndpointReference.readFrom(new
DOMSource(eprEle));
}
-return EndpointReference.readFrom(new DOMSource(eprEle));
}
}
diff --git
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java
index 7ff806e..c2ef3f4 100644
---
a/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java
+++
b/rt/frontend/jaxws/src/main/java/org/apache/cxf/jaxws/support/JaxWsEndpointImpl.java
@@ -297,12 +297,15 @@ public class JaxWsEndpointImpl extends EndpointImpl {
while (extensionElements.hasNext()) {
ExtensibilityElement ext = extensionElements.next();
if (ext instanceof UnknownExtensibilityElement &&
wsaEpr.equals(ext.getElementType())) {
-DOMSource domSource = new
DOMSource(((UnknownExtensibilityElement
[cxf] branch 3.4.x-fixes updated (41cba7f -> 7400fd2)
This is an automated email from the ASF dual-hosted git repository. ffang pushed a change to branch 3.4.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git. from 41cba7f CXF-8578: Bridge methods for covariant return types cannot be invoked on client proxies (#842) new c7cb268 [CXF-8590] Add synchronization to UnknownExtensibilityElement.getElement() call sites. The Element returned from getElement may not be thread safe, so we have to take precautions when accessing the Element. Also synchronize on the DescriptionInfo parameter in Wsdl11AttachmentPolicyProvider.getElementPolicy to avoid a race condition when registeredPolicy is not yet set. new 7400fd2 [CXF-8590] Add synchronization to UnknownExtensibilityElement.getElement() call sites. The Element returned from getElement may not be thread safe, so we have to take precautions when accessing the Element. Also synchronize on the DescriptionInfo parameter in Wsdl11AttachmentPolicyProvider.getElementPolicy to avoid a race condition when registeredPolicy is not yet set. 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: .../apache/cxf/jaxws/EndpointReferenceBuilder.java | 26 .../cxf/jaxws/support/JaxWsEndpointImpl.java | 15 +++-- .../cxf/ws/policy/PolicyAnnotationListener.java| 18 -- .../LocalServiceModelReferenceResolver.java| 15 +++-- .../wsdl11/Wsdl11AttachmentPolicyProvider.java | 72 -- .../reference/ReferenceResolverTest.java | 5 +- .../java/org/apache/cxf/wsdl11/SchemaUtil.java | 6 +- .../org/apache/cxf/wsdl11/ServiceWSDLBuilder.java | 6 +- 8 files changed, 99 insertions(+), 64 deletions(-)
[cxf] 02/02: [CXF-8590] Add synchronization to UnknownExtensibilityElement.getElement() call sites. The Element returned from getElement may not be thread safe, so we have to take precautions when acc
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 7400fd2119f71a49b0f3ced6ea4718441141a732
Author: Kim Johan Andersson
AuthorDate: Thu Sep 2 15:13:21 2021 +0200
[CXF-8590]
Add synchronization to UnknownExtensibilityElement.getElement() call sites.
The Element returned from getElement may not be thread safe, so we have to
take precautions when accessing the Element.
Also synchronize on the DescriptionInfo parameter in
Wsdl11AttachmentPolicyProvider.getElementPolicy to avoid a race condition when
registeredPolicy is not yet set.
(cherry picked from commit 9a4b855876e7d8ff68ca96760ab3d2ce84443a8e)
---
.../cxf/ws/policy/attachment/reference/ReferenceResolverTest.java| 5 -
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git
a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java
b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java
index c130203..dfd84ff 100644
---
a/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java
+++
b/rt/ws/policy/src/test/java/org/apache/cxf/ws/policy/attachment/reference/ReferenceResolverTest.java
@@ -26,6 +26,7 @@ import java.util.List;
import javax.wsdl.extensions.UnknownExtensibilityElement;
import javax.xml.namespace.QName;
+import org.w3c.dom.Document;
import org.w3c.dom.Element;
import org.apache.cxf.service.model.DescriptionInfo;
@@ -73,10 +74,12 @@ public class ReferenceResolverTest {
extensions.add(extension);
EasyMock.expect(di.getExtensors(UnknownExtensibilityElement.class)).andReturn(extensions);
Element e = control.createMock(Element.class);
-EasyMock.expect(extension.getElement()).andReturn(e).times(2);
QName qn = new QName(Constants.URI_POLICY_NS,
Constants.ELEM_POLICY);
EasyMock.expect(extension.getElementType()).andReturn(qn).anyTimes();
+EasyMock.expect(extension.getElement()).andReturn(e).times(1);
+Document ownerDocument = control.createMock(Document.class);
+EasyMock.expect(e.getOwnerDocument()).andReturn(ownerDocument);
EasyMock.expect(e.getAttributeNS(PolicyConstants.WSU_NAMESPACE_URI,
PolicyConstants.WSU_ID_ATTR_NAME))
.andReturn("A");
[cxf] branch master updated (d40f53e -> 63fd560)
This is an automated email from the ASF dual-hosted git repository. ffang pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git. from d40f53e CXF-8591: Temporary queues are never deleted when the are used. Added a test case new 73b6517 [CXF-8590] Add synchronization to UnknownExtensibilityElement.getElement() call sites. The Element returned from getElement may not be thread safe, so we have to take precautions when accessing the Element. Also synchronize on the DescriptionInfo parameter in Wsdl11AttachmentPolicyProvider.getElementPolicy to avoid a race condition when registeredPolicy is not yet set. new 9a4b855 [CXF-8590] Add synchronization to UnknownExtensibilityElement.getElement() call sites. The Element returned from getElement may not be thread safe, so we have to take precautions when accessing the Element. Also synchronize on the DescriptionInfo parameter in Wsdl11AttachmentPolicyProvider.getElementPolicy to avoid a race condition when registeredPolicy is not yet set. new 63fd560 Merge pull request #845 from kimjand/CXF-8590 The 16474 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: .../apache/cxf/jaxws/EndpointReferenceBuilder.java | 26 .../cxf/jaxws/support/JaxWsEndpointImpl.java | 15 +++-- .../cxf/ws/policy/PolicyAnnotationListener.java| 18 -- .../LocalServiceModelReferenceResolver.java| 15 +++-- .../wsdl11/Wsdl11AttachmentPolicyProvider.java | 72 -- .../reference/ReferenceResolverTest.java | 5 +- .../java/org/apache/cxf/wsdl11/SchemaUtil.java | 6 +- .../org/apache/cxf/wsdl11/ServiceWSDLBuilder.java | 6 +- 8 files changed, 99 insertions(+), 64 deletions(-)
[cxf] branch 3.4.x-fixes updated: [CXF-8566] cxf-ws-rt-security & ehcache: OSGi classloading
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.4.x-fixes by this push:
new ec9e894 [CXF-8566] cxf-ws-rt-security & ehcache: OSGi classloading
ec9e894 is described below
commit ec9e894b86e06577e7797bad603c850822e9ddf3
Author: Julien Greffe <36693362+jgre...@users.noreply.github.com>
AuthorDate: Thu Aug 26 17:32:02 2021 +0200
[CXF-8566] cxf-ws-rt-security & ehcache: OSGi classloading
(cherry picked from commit 47db1b5843e92493b9619887588d41edb19acb84)
---
.../apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
index 66d77bd..cf43d28 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
@@ -22,7 +22,9 @@ package org.apache.cxf.ws.security.tokenstore;
import java.io.Closeable;
import java.net.URL;
import java.util.Collection;
+import java.util.HashMap;
import java.util.HashSet;
+import java.util.Map;
import java.util.Set;
import org.apache.cxf.Bus;
@@ -34,6 +36,7 @@ import org.ehcache.CacheManager;
import org.ehcache.Status;
import org.ehcache.config.builders.CacheConfigurationBuilder;
import org.ehcache.config.builders.CacheManagerBuilder;
+import org.ehcache.core.util.ClassLoading;
import org.ehcache.xml.XmlConfiguration;
/**
@@ -54,14 +57,18 @@ public class EHCacheTokenStore implements TokenStore,
Closeable, BusLifeCycleLis
this.key = key;
try {
-XmlConfiguration xmlConfig = new XmlConfiguration(configFileURL);
-
// Exclude the endpoint info bit added in TokenStoreUtils when
getting the template name
String template = key;
if (template.contains("-")) {
template = key.substring(0, key.lastIndexOf('-'));
}
+// Set class loader cache of template object to SecurityToken
classloader
+Map cacheClassLoaders = new HashMap<>();
+cacheClassLoaders.put(template,
SecurityToken.class.getClassLoader());
+XmlConfiguration xmlConfig = new XmlConfiguration(configFileURL,
ClassLoading.getDefaultClassLoader(),
+cacheClassLoaders);
+
CacheConfigurationBuilder
configurationBuilder =
xmlConfig.newCacheConfigurationBuilderFromTemplate(template,
String.class, SecurityToken.class);
[cxf] branch master updated: [CXF-8566] cxf-ws-rt-security & ehcache: OSGi classloading
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 47db1b5 [CXF-8566] cxf-ws-rt-security & ehcache: OSGi classloading
new 45f92e8 Merge pull request #837 from jgreffe/bugfix/master/CXF-8566
47db1b5 is described below
commit 47db1b5843e92493b9619887588d41edb19acb84
Author: Julien Greffe <36693362+jgre...@users.noreply.github.com>
AuthorDate: Thu Aug 26 17:32:02 2021 +0200
[CXF-8566] cxf-ws-rt-security & ehcache: OSGi classloading
---
.../apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java | 11 +--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
index 1ddac82..80b890f 100644
---
a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
+++
b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/tokenstore/EHCacheTokenStore.java
@@ -22,7 +22,9 @@ package org.apache.cxf.ws.security.tokenstore;
import java.io.Closeable;
import java.net.URL;
import java.util.Collection;
+import java.util.HashMap;
import java.util.HashSet;
+import java.util.Map;
import java.util.Set;
import org.apache.cxf.Bus;
@@ -34,6 +36,7 @@ import org.ehcache.CacheManager;
import org.ehcache.Status;
import org.ehcache.config.builders.CacheConfigurationBuilder;
import org.ehcache.config.builders.CacheManagerBuilder;
+import org.ehcache.core.util.ClassLoading;
import org.ehcache.xml.XmlConfiguration;
/**
@@ -54,14 +57,18 @@ public class EHCacheTokenStore implements TokenStore,
Closeable, BusLifeCycleLis
this.key = key;
try {
-XmlConfiguration xmlConfig = new XmlConfiguration(configFileURL);
-
// Exclude the endpoint info bit added in TokenStoreUtils when
getting the template name
String template = key;
if (template.contains("-")) {
template = key.substring(0, key.lastIndexOf('-'));
}
+// Set class loader cache of template object to SecurityToken
classloader
+Map cacheClassLoaders = new HashMap<>();
+cacheClassLoaders.put(template,
SecurityToken.class.getClassLoader());
+XmlConfiguration xmlConfig = new XmlConfiguration(configFileURL,
ClassLoading.getDefaultClassLoader(),
+cacheClassLoaders);
+
CacheConfigurationBuilder
configurationBuilder =
xmlConfig.newCacheConfigurationBuilderFromTemplate(template,
String.class, SecurityToken.class);
[cxf] branch 3.4.x-fixes updated: [CXF-8582]Add "CXF Additional Configuration" properties also as part of spring-configuration-metadata.json in cxf-spring-boot-autoconfigure.
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.4.x-fixes by this push:
new 56db0e2 [CXF-8582]Add "CXF Additional Configuration" properties also
as part of spring-configuration-metadata.json in cxf-spring-boot-autoconfigure.
56db0e2 is described below
commit 56db0e20295f6edc140adeb631903dc7d0c66690
Author: Freeman Fang
AuthorDate: Wed Aug 18 11:12:55 2021 -0400
[CXF-8582]Add "CXF Additional Configuration" properties also as part of
spring-configuration-metadata.json in cxf-spring-boot-autoconfigure.
(cherry picked from commit bfb59ed997a5218156cff1b98fd6325103ff9cb4)
---
.../spring/boot/autoconfigure/CxfProperties.java | 94 ++
1 file changed, 94 insertions(+)
diff --git
a/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfProperties.java
b/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfProperties.java
index 709ada5..0dd84c7 100644
---
a/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfProperties.java
+++
b/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfProperties.java
@@ -44,6 +44,8 @@ public class CxfProperties {
private final Servlet servlet = new Servlet();
private final Metrics metrics = new Metrics();
+
+private final JaxrsScan jaxrs = new JaxrsScan();
@NotNull
@Pattern(regexp = "/[^?#]*", message = "Path must start with /")
@@ -62,6 +64,10 @@ public class CxfProperties {
public Metrics getMetrics() {
return this.metrics;
}
+
+public JaxrsScan getJaxrs() {
+return this.jaxrs;
+}
public static class Servlet {
@@ -205,5 +211,93 @@ public class CxfProperties {
}
}
+
+public static class JaxrsScan {
+
+
+
+/**
+ * property to create a JAX-RS endpoint from the auto-discovered
JAX-RS
+ * root resources and provider classes. Such classes do not have to be
+ * annotated with Spring @Component. This property needs to be
accompanied
+ * by a "cxf.jaxrs.classes-scan-packages" property which sets a
comma-separated
+ * list of the packages to scan.
+ */
+private boolean classesScan;
+
+/**
+ * property to create a JAX-RS endpoint from the auto-discovered
+ * JAX-RS root resources and providers which are marked as Spring
+ * Components (annotated with Spring @Component or created and
+ * returned from @Bean methods).
+ */
+private boolean componentScan;
+
+/**
+ * property to restrict which of the auto-discovered Spring components
+ * are accepted as JAX-RS resource or provider classes. It sets a
+ * comma-separated list of the packages that a given bean instance's
+ * class must be in. Note, this property, if set, is only effective
+ * if a given bean is a singleton. It can be used alongside or as
+ * an alternative to the "cxf.jaxrs.component-scan-beans" property.
+ */
+private String componentScanPackages;
+
+/**
+ * property to restrict which of the auto-discovered Spring components
+ * are accepted as JAX-RS resource or provider classes. It sets a
+ * comma-separated list of the accepted bean names - the
auto-discovered
+ * component will only be accepted if its bean name is in this list.
+ * It can be used alongside or as an alternative to the
+ * "cxf.jaxrs.component-scan-packages" property.
+ */
+private String componentScanBeans;
+
+private String classesScanPackages;
+
+
+public boolean isComponentScan() {
+return componentScan;
+}
+
+public void setComponentScan(boolean componentScan) {
+this.componentScan = componentScan;
+}
+
+public String getComponentScanPackages() {
+return componentScanPackages;
+}
+
+public void setComponentScanPackages(String componentScanPackages) {
+this.componentScanPackages = componentScanPackages;
+}
+
+public String getComponentScanBeans() {
+return componentScanBeans;
+}
+
+public void setComponentScanBeans(String componentScanBeans) {
+this.componentScanBeans = componentScanBeans;
+}
+
+public boolean isClassesScan() {
+return classesScan;
+}
+
+public void setClassesScan(boolean classesScan) {
+this.classesScan = c
[cxf] branch master updated: [CXF-8582]Add "CXF Additional Configuration" properties also as part of spring-configuration-metadata.json in cxf-spring-boot-autoconfigure.
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new bfb59ed [CXF-8582]Add "CXF Additional Configuration" properties also
as part of spring-configuration-metadata.json in cxf-spring-boot-autoconfigure.
new d8e1317 Merge branch 'master' of github.com:apache/cxf
bfb59ed is described below
commit bfb59ed997a5218156cff1b98fd6325103ff9cb4
Author: Freeman Fang
AuthorDate: Wed Aug 18 11:12:55 2021 -0400
[CXF-8582]Add "CXF Additional Configuration" properties also as part of
spring-configuration-metadata.json in cxf-spring-boot-autoconfigure.
---
.../spring/boot/autoconfigure/CxfProperties.java | 94 ++
1 file changed, 94 insertions(+)
diff --git
a/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfProperties.java
b/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfProperties.java
index 709ada5..0dd84c7 100644
---
a/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfProperties.java
+++
b/integration/spring-boot/autoconfigure/src/main/java/org/apache/cxf/spring/boot/autoconfigure/CxfProperties.java
@@ -44,6 +44,8 @@ public class CxfProperties {
private final Servlet servlet = new Servlet();
private final Metrics metrics = new Metrics();
+
+private final JaxrsScan jaxrs = new JaxrsScan();
@NotNull
@Pattern(regexp = "/[^?#]*", message = "Path must start with /")
@@ -62,6 +64,10 @@ public class CxfProperties {
public Metrics getMetrics() {
return this.metrics;
}
+
+public JaxrsScan getJaxrs() {
+return this.jaxrs;
+}
public static class Servlet {
@@ -205,5 +211,93 @@ public class CxfProperties {
}
}
+
+public static class JaxrsScan {
+
+
+
+/**
+ * property to create a JAX-RS endpoint from the auto-discovered
JAX-RS
+ * root resources and provider classes. Such classes do not have to be
+ * annotated with Spring @Component. This property needs to be
accompanied
+ * by a "cxf.jaxrs.classes-scan-packages" property which sets a
comma-separated
+ * list of the packages to scan.
+ */
+private boolean classesScan;
+
+/**
+ * property to create a JAX-RS endpoint from the auto-discovered
+ * JAX-RS root resources and providers which are marked as Spring
+ * Components (annotated with Spring @Component or created and
+ * returned from @Bean methods).
+ */
+private boolean componentScan;
+
+/**
+ * property to restrict which of the auto-discovered Spring components
+ * are accepted as JAX-RS resource or provider classes. It sets a
+ * comma-separated list of the packages that a given bean instance's
+ * class must be in. Note, this property, if set, is only effective
+ * if a given bean is a singleton. It can be used alongside or as
+ * an alternative to the "cxf.jaxrs.component-scan-beans" property.
+ */
+private String componentScanPackages;
+
+/**
+ * property to restrict which of the auto-discovered Spring components
+ * are accepted as JAX-RS resource or provider classes. It sets a
+ * comma-separated list of the accepted bean names - the
auto-discovered
+ * component will only be accepted if its bean name is in this list.
+ * It can be used alongside or as an alternative to the
+ * "cxf.jaxrs.component-scan-packages" property.
+ */
+private String componentScanBeans;
+
+private String classesScanPackages;
+
+
+public boolean isComponentScan() {
+return componentScan;
+}
+
+public void setComponentScan(boolean componentScan) {
+this.componentScan = componentScan;
+}
+
+public String getComponentScanPackages() {
+return componentScanPackages;
+}
+
+public void setComponentScanPackages(String componentScanPackages) {
+this.componentScanPackages = componentScanPackages;
+}
+
+public String getComponentScanBeans() {
+return componentScanBeans;
+}
+
+public void setComponentScanBeans(String componentScanBeans) {
+this.componentScanBeans = componentScanBeans;
+}
+
+public boolean isClassesScan() {
+return classesScan;
+}
+
+public void setClassesScan(boolean classesScan) {
+this.classesScan = classesScan;
+}
+
[cxf] branch 3.3.x-fixes updated: [CXF-8570]a test to demonstrate how to configure JAXRSClientFactoryBean with org.apache.cxf.feature.Feature to enable Client Cache
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.3.x-fixes by this push:
new 0bf9f01 [CXF-8570]a test to demonstrate how to configure
JAXRSClientFactoryBean with org.apache.cxf.feature.Feature to enable Client
Cache
0bf9f01 is described below
commit 0bf9f01c94cf9a73525f24545473419ac3a03c38
Author: Freeman Fang
AuthorDate: Thu Jul 29 11:54:16 2021 -0400
[CXF-8570]a test to demonstrate how to configure JAXRSClientFactoryBean
with org.apache.cxf.feature.Feature to enable Client Cache
(cherry picked from commit 15619e15e95a42164e146fad11a9fedf0d982a05)
(cherry picked from commit 2ef7652ea9374c85e12fea7d8beca8d114694f1a)
---
.../jaxrs/client/cache/CXFCacheControlFeature.java | 163 +
.../cxf/jaxrs/client/cache/ClientCacheTest.java| 38 +
2 files changed, 201 insertions(+)
diff --git
a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/CXFCacheControlFeature.java
b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/CXFCacheControlFeature.java
new file mode 100644
index 000..75cd17a
--- /dev/null
+++
b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/CXFCacheControlFeature.java
@@ -0,0 +1,163 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.jaxrs.client.cache;
+
+import java.io.Closeable;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.annotation.PreDestroy;
+import javax.cache.Cache;
+import javax.cache.CacheManager;
+import javax.cache.Caching;
+import javax.cache.configuration.Factory;
+import javax.cache.configuration.MutableConfiguration;
+import javax.cache.expiry.ExpiryPolicy;
+import javax.cache.integration.CacheLoader;
+import javax.cache.integration.CacheWriter;
+import javax.cache.spi.CachingProvider;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.feature.AbstractFeature;
+import org.apache.cxf.interceptor.InterceptorProvider;
+
+
+public class CXFCacheControlFeature extends AbstractFeature {
+
+private static final String BUS_PROVIDERS =
"org.apache.cxf.jaxrs.bus.providers";
+private CachingProvider provider;
+private CacheManager manager;
+private Cache cache;
+private boolean cacheResponseInputStream;
+
+public CXFCacheControlFeature(boolean cacheStream) {
+this.cacheResponseInputStream = cacheStream;
+}
+
+public CXFCacheControlFeature() {
+}
+
+protected void initializeProvider(InterceptorProvider interceptorProvider,
Bus bus) {
+if (bus != null) {
+List providerList = new ArrayList();
+providerList.add(this.createCacheControlClientReaderInterceptor());
+providerList.add(this.createCacheControlClientRequestFilter());
+bus.setProperty(BUS_PROVIDERS, providerList);
+}
+}
+
+
+public CacheControlClientRequestFilter
createCacheControlClientRequestFilter() {
+if (cache == null) {
+cache = createCache(new HashMap());
+}
+return new CacheControlClientRequestFilter(cache);
+}
+
+public CacheControlClientReaderInterceptor
createCacheControlClientReaderInterceptor() {
+if (cache == null) {
+cache = createCache(new HashMap());
+}
+CacheControlClientReaderInterceptor reader = new
CacheControlClientReaderInterceptor(cache);
+reader.setCacheResponseInputStream(cacheResponseInputStream);
+return reader;
+}
+
+@PreDestroy // TODO: check it is called
+public void close() {
+for (final Closeable c : Arrays.asList(cache, manager, provider)) {
+try {
+if (c != null) {
+c.close();
+}
+} catch (final Exception e) {
+// no-op
+}
+}
+
+}
+
+private Cache cre
[cxf] branch 3.4.x-fixes updated: [CXF-8570]a test to demonstrate how to configure JAXRSClientFactoryBean with org.apache.cxf.feature.Feature to enable Client Cache
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.4.x-fixes by this push:
new 2ef7652 [CXF-8570]a test to demonstrate how to configure
JAXRSClientFactoryBean with org.apache.cxf.feature.Feature to enable Client
Cache
2ef7652 is described below
commit 2ef7652ea9374c85e12fea7d8beca8d114694f1a
Author: Freeman Fang
AuthorDate: Thu Jul 29 11:54:16 2021 -0400
[CXF-8570]a test to demonstrate how to configure JAXRSClientFactoryBean
with org.apache.cxf.feature.Feature to enable Client Cache
(cherry picked from commit 15619e15e95a42164e146fad11a9fedf0d982a05)
---
.../jaxrs/client/cache/CXFCacheControlFeature.java | 163 +
.../cxf/jaxrs/client/cache/ClientCacheTest.java| 38 +
2 files changed, 201 insertions(+)
diff --git
a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/CXFCacheControlFeature.java
b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/CXFCacheControlFeature.java
new file mode 100644
index 000..75cd17a
--- /dev/null
+++
b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/CXFCacheControlFeature.java
@@ -0,0 +1,163 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.jaxrs.client.cache;
+
+import java.io.Closeable;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.annotation.PreDestroy;
+import javax.cache.Cache;
+import javax.cache.CacheManager;
+import javax.cache.Caching;
+import javax.cache.configuration.Factory;
+import javax.cache.configuration.MutableConfiguration;
+import javax.cache.expiry.ExpiryPolicy;
+import javax.cache.integration.CacheLoader;
+import javax.cache.integration.CacheWriter;
+import javax.cache.spi.CachingProvider;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.feature.AbstractFeature;
+import org.apache.cxf.interceptor.InterceptorProvider;
+
+
+public class CXFCacheControlFeature extends AbstractFeature {
+
+private static final String BUS_PROVIDERS =
"org.apache.cxf.jaxrs.bus.providers";
+private CachingProvider provider;
+private CacheManager manager;
+private Cache cache;
+private boolean cacheResponseInputStream;
+
+public CXFCacheControlFeature(boolean cacheStream) {
+this.cacheResponseInputStream = cacheStream;
+}
+
+public CXFCacheControlFeature() {
+}
+
+protected void initializeProvider(InterceptorProvider interceptorProvider,
Bus bus) {
+if (bus != null) {
+List providerList = new ArrayList();
+providerList.add(this.createCacheControlClientReaderInterceptor());
+providerList.add(this.createCacheControlClientRequestFilter());
+bus.setProperty(BUS_PROVIDERS, providerList);
+}
+}
+
+
+public CacheControlClientRequestFilter
createCacheControlClientRequestFilter() {
+if (cache == null) {
+cache = createCache(new HashMap());
+}
+return new CacheControlClientRequestFilter(cache);
+}
+
+public CacheControlClientReaderInterceptor
createCacheControlClientReaderInterceptor() {
+if (cache == null) {
+cache = createCache(new HashMap());
+}
+CacheControlClientReaderInterceptor reader = new
CacheControlClientReaderInterceptor(cache);
+reader.setCacheResponseInputStream(cacheResponseInputStream);
+return reader;
+}
+
+@PreDestroy // TODO: check it is called
+public void close() {
+for (final Closeable c : Arrays.asList(cache, manager, provider)) {
+try {
+if (c != null) {
+c.close();
+}
+} catch (final Exception e) {
+// no-op
+}
+}
+
+}
+
+private Cache createCache(final Map
properties) {
+final Pro
[cxf] branch master updated: [CXF-8570]a test to demonstrate how to configure JAXRSClientFactoryBean with org.apache.cxf.feature.Feature to enable Client Cache
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new 15619e1 [CXF-8570]a test to demonstrate how to configure
JAXRSClientFactoryBean with org.apache.cxf.feature.Feature to enable Client
Cache
15619e1 is described below
commit 15619e15e95a42164e146fad11a9fedf0d982a05
Author: Freeman Fang
AuthorDate: Thu Jul 29 11:54:16 2021 -0400
[CXF-8570]a test to demonstrate how to configure JAXRSClientFactoryBean
with org.apache.cxf.feature.Feature to enable Client Cache
---
.../jaxrs/client/cache/CXFCacheControlFeature.java | 163 +
.../cxf/jaxrs/client/cache/ClientCacheTest.java| 38 +
2 files changed, 201 insertions(+)
diff --git
a/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/CXFCacheControlFeature.java
b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/CXFCacheControlFeature.java
new file mode 100644
index 000..75cd17a
--- /dev/null
+++
b/rt/rs/client/src/test/java/org/apache/cxf/jaxrs/client/cache/CXFCacheControlFeature.java
@@ -0,0 +1,163 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.cxf.jaxrs.client.cache;
+
+import java.io.Closeable;
+import java.net.URI;
+import java.net.URISyntaxException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+
+import javax.annotation.PreDestroy;
+import javax.cache.Cache;
+import javax.cache.CacheManager;
+import javax.cache.Caching;
+import javax.cache.configuration.Factory;
+import javax.cache.configuration.MutableConfiguration;
+import javax.cache.expiry.ExpiryPolicy;
+import javax.cache.integration.CacheLoader;
+import javax.cache.integration.CacheWriter;
+import javax.cache.spi.CachingProvider;
+
+import org.apache.cxf.Bus;
+import org.apache.cxf.feature.AbstractFeature;
+import org.apache.cxf.interceptor.InterceptorProvider;
+
+
+public class CXFCacheControlFeature extends AbstractFeature {
+
+private static final String BUS_PROVIDERS =
"org.apache.cxf.jaxrs.bus.providers";
+private CachingProvider provider;
+private CacheManager manager;
+private Cache cache;
+private boolean cacheResponseInputStream;
+
+public CXFCacheControlFeature(boolean cacheStream) {
+this.cacheResponseInputStream = cacheStream;
+}
+
+public CXFCacheControlFeature() {
+}
+
+protected void initializeProvider(InterceptorProvider interceptorProvider,
Bus bus) {
+if (bus != null) {
+List providerList = new ArrayList();
+providerList.add(this.createCacheControlClientReaderInterceptor());
+providerList.add(this.createCacheControlClientRequestFilter());
+bus.setProperty(BUS_PROVIDERS, providerList);
+}
+}
+
+
+public CacheControlClientRequestFilter
createCacheControlClientRequestFilter() {
+if (cache == null) {
+cache = createCache(new HashMap());
+}
+return new CacheControlClientRequestFilter(cache);
+}
+
+public CacheControlClientReaderInterceptor
createCacheControlClientReaderInterceptor() {
+if (cache == null) {
+cache = createCache(new HashMap());
+}
+CacheControlClientReaderInterceptor reader = new
CacheControlClientReaderInterceptor(cache);
+reader.setCacheResponseInputStream(cacheResponseInputStream);
+return reader;
+}
+
+@PreDestroy // TODO: check it is called
+public void close() {
+for (final Closeable c : Arrays.asList(cache, manager, provider)) {
+try {
+if (c != null) {
+c.close();
+}
+} catch (final Exception e) {
+// no-op
+}
+}
+
+}
+
+private Cache createCache(final Map
properties) {
+final Properties props = new Properties();
+props.putAll(properties);
+
+final String pr
[cxf] branch 3.3.x-fixes updated: [CXF-8569]http-undertow: ensure clear registered paths until destory an undertow server(Port)
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.3.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.3.x-fixes by this push:
new 798a02c [CXF-8569]http-undertow: ensure clear registered paths until
destory an undertow server(Port)
798a02c is described below
commit 798a02cab5e163257478dbb2b961c4f600c4e175
Author: Freeman Fang
AuthorDate: Tue Jul 27 13:37:20 2021 -0400
[CXF-8569]http-undertow: ensure clear registered paths until destory an
undertow server(Port)
(cherry picked from commit d54da7e3c6af4e6c19d712fed2f57c4cf2c54d64)
(cherry picked from commit 00108efc2643f7acb985bdb2b3fd3436ca74723b)
---
.../apache/cxf/transport/http_undertow/UndertowHTTPServerEngine.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngine.java
b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngine.java
index 787e9c3..75b6314 100644
---
a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngine.java
+++
b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngine.java
@@ -463,10 +463,10 @@ public class UndertowHTTPServerEngine implements
ServerEngine {
* remove it from the factory's cache.
*/
public void shutdown() {
-registedPaths.clear();
if (shouldDestroyPort()) {
if (servantCount == 0) {
UndertowHTTPServerEngineFactory.destroyForPort(port);
+registedPaths.clear();
} else {
LOG.log(Level.WARNING, "FAILED_TO_SHUTDOWN_ENGINE_MSG", port);
}
[cxf] branch 3.4.x-fixes updated: [CXF-8569]http-undertow: ensure clear registered paths until destory an undertow server(Port)
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.4.x-fixes by this push:
new 00108ef [CXF-8569]http-undertow: ensure clear registered paths until
destory an undertow server(Port)
00108ef is described below
commit 00108efc2643f7acb985bdb2b3fd3436ca74723b
Author: Freeman Fang
AuthorDate: Tue Jul 27 13:37:20 2021 -0400
[CXF-8569]http-undertow: ensure clear registered paths until destory an
undertow server(Port)
(cherry picked from commit d54da7e3c6af4e6c19d712fed2f57c4cf2c54d64)
---
.../apache/cxf/transport/http_undertow/UndertowHTTPServerEngine.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngine.java
b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngine.java
index 3f3b561..e684f6f 100644
---
a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngine.java
+++
b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngine.java
@@ -461,10 +461,10 @@ public class UndertowHTTPServerEngine implements
ServerEngine {
* remove it from the factory's cache.
*/
public void shutdown() {
-registedPaths.clear();
if (shouldDestroyPort()) {
if (servantCount == 0) {
UndertowHTTPServerEngineFactory.destroyForPort(port);
+registedPaths.clear();
} else {
LOG.log(Level.WARNING, "FAILED_TO_SHUTDOWN_ENGINE_MSG", port);
}
[cxf] branch master updated: [CXF-8569]http-undertow: ensure clear registered paths until destory an undertow server(Port)
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new d54da7e [CXF-8569]http-undertow: ensure clear registered paths until
destory an undertow server(Port)
d54da7e is described below
commit d54da7e3c6af4e6c19d712fed2f57c4cf2c54d64
Author: Freeman Fang
AuthorDate: Tue Jul 27 13:37:20 2021 -0400
[CXF-8569]http-undertow: ensure clear registered paths until destory an
undertow server(Port)
---
.../apache/cxf/transport/http_undertow/UndertowHTTPServerEngine.java| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngine.java
b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngine.java
index 3f3b561..e684f6f 100644
---
a/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngine.java
+++
b/rt/transports/http-undertow/src/main/java/org/apache/cxf/transport/http_undertow/UndertowHTTPServerEngine.java
@@ -461,10 +461,10 @@ public class UndertowHTTPServerEngine implements
ServerEngine {
* remove it from the factory's cache.
*/
public void shutdown() {
-registedPaths.clear();
if (shouldDestroyPort()) {
if (servantCount == 0) {
UndertowHTTPServerEngineFactory.destroyForPort(port);
+registedPaths.clear();
} else {
LOG.log(Level.WARNING, "FAILED_TO_SHUTDOWN_ENGINE_MSG", port);
}
[cxf] branch 3.4.x-fixes updated: [CXF-8568] Added overloaded map method, added null check for sensitiveProtocolHeaders in DefaultLogEventMapper
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.4.x-fixes by this push:
new ae4d1de [CXF-8568] Added overloaded map method, added null check for
sensitiveProtocolHeaders in DefaultLogEventMapper
ae4d1de is described below
commit ae4d1dec77f3432c85a4a6ddcacaf4540d1a528c
Author: nrickles3
AuthorDate: Fri Jul 23 13:37:29 2021 -0400
[CXF-8568] Added overloaded map method, added null check for
sensitiveProtocolHeaders in DefaultLogEventMapper
(cherry picked from commit ed1f43ed348698c9efd94f2e544f06bebf15787a)
---
.../ext/logging/event/DefaultLogEventMapper.java | 8 ++-
.../cxf/ext/logging/DefaultLogEventMapperTest.java | 28 ++
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
index 923f419..dc5b736 100644
---
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
+++
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
@@ -72,6 +72,10 @@ public class DefaultLogEventMapper {
}
}
+public LogEvent map(final Message message) {
+return this.map(message, Collections.emptySet());
+}
+
public LogEvent map(final Message message, final Set
sensitiveProtocolHeaders) {
final LogEvent event = new LogEvent();
event.setMessageId(getMessageId(message));
@@ -90,7 +94,9 @@ public class DefaultLogEventMapper {
event.setContentType(safeGet(message, Message.CONTENT_TYPE));
Map headerMap = getHeaders(message);
-maskSensitiveHelper.maskHeaders(headerMap, sensitiveProtocolHeaders);
+if (sensitiveProtocolHeaders != null &&
!sensitiveProtocolHeaders.isEmpty()) {
+maskSensitiveHelper.maskHeaders(headerMap,
sensitiveProtocolHeaders);
+}
event.setHeaders(headerMap);
event.setAddress(getAddress(message, event));
diff --git
a/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/DefaultLogEventMapperTest.java
b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/DefaultLogEventMapperTest.java
index 08358cf..9df839e 100644
---
a/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/DefaultLogEventMapperTest.java
+++
b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/DefaultLogEventMapperTest.java
@@ -119,4 +119,32 @@ public class DefaultLogEventMapperTest {
assertEquals(MASKED_HEADER_VALUE,
event.getHeaders().get(TEST_HEADER_NAME));
}
+@Test
+public void testMapNullSensitiveProtocolHeaders() {
+DefaultLogEventMapper mapper = new DefaultLogEventMapper();
+Message message = new MessageImpl();
+message.put(Message.HTTP_REQUEST_METHOD, "POST");
+message.put(Message.REQUEST_URI, "nullTest");
+Exchange exchange = new ExchangeImpl();
+message.setExchange(exchange);
+
+LogEvent event = mapper.map(message, null);
+
+assertEquals("POST[nullTest]", event.getOperationName());
+}
+
+@Test
+public void testMap() {
+DefaultLogEventMapper mapper = new DefaultLogEventMapper();
+Message message = new MessageImpl();
+message.put(Message.HTTP_REQUEST_METHOD, "PUT");
+message.put(Message.REQUEST_URI, "test");
+Exchange exchange = new ExchangeImpl();
+message.setExchange(exchange);
+
+LogEvent event = mapper.map(message);
+
+assertEquals("PUT[test]", event.getOperationName());
+}
+
}
[cxf] branch master updated: [CXF-8568] Added overloaded map method, added null check for sensitiveProtocolHeaders in DefaultLogEventMapper
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/master by this push:
new ed1f43e [CXF-8568] Added overloaded map method, added null check for
sensitiveProtocolHeaders in DefaultLogEventMapper
new a7f190a Merge pull request #829 from nrickles3/CXF-8568
ed1f43e is described below
commit ed1f43ed348698c9efd94f2e544f06bebf15787a
Author: nrickles3
AuthorDate: Fri Jul 23 13:37:29 2021 -0400
[CXF-8568] Added overloaded map method, added null check for
sensitiveProtocolHeaders in DefaultLogEventMapper
---
.../ext/logging/event/DefaultLogEventMapper.java | 8 ++-
.../cxf/ext/logging/DefaultLogEventMapperTest.java | 28 ++
2 files changed, 35 insertions(+), 1 deletion(-)
diff --git
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
index d6a939f..c084e5f 100644
---
a/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
+++
b/rt/features/logging/src/main/java/org/apache/cxf/ext/logging/event/DefaultLogEventMapper.java
@@ -72,6 +72,10 @@ public class DefaultLogEventMapper {
}
}
+public LogEvent map(final Message message) {
+return this.map(message, Collections.emptySet());
+}
+
public LogEvent map(final Message message, final Set
sensitiveProtocolHeaders) {
final LogEvent event = new LogEvent();
event.setMessageId(getMessageId(message));
@@ -90,7 +94,9 @@ public class DefaultLogEventMapper {
event.setContentType(safeGet(message, Message.CONTENT_TYPE));
Map headerMap = getHeaders(message);
-maskSensitiveHelper.maskHeaders(headerMap, sensitiveProtocolHeaders);
+if (sensitiveProtocolHeaders != null &&
!sensitiveProtocolHeaders.isEmpty()) {
+maskSensitiveHelper.maskHeaders(headerMap,
sensitiveProtocolHeaders);
+}
event.setHeaders(headerMap);
event.setAddress(getAddress(message, event));
diff --git
a/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/DefaultLogEventMapperTest.java
b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/DefaultLogEventMapperTest.java
index 08358cf..9df839e 100644
---
a/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/DefaultLogEventMapperTest.java
+++
b/rt/features/logging/src/test/java/org/apache/cxf/ext/logging/DefaultLogEventMapperTest.java
@@ -119,4 +119,32 @@ public class DefaultLogEventMapperTest {
assertEquals(MASKED_HEADER_VALUE,
event.getHeaders().get(TEST_HEADER_NAME));
}
+@Test
+public void testMapNullSensitiveProtocolHeaders() {
+DefaultLogEventMapper mapper = new DefaultLogEventMapper();
+Message message = new MessageImpl();
+message.put(Message.HTTP_REQUEST_METHOD, "POST");
+message.put(Message.REQUEST_URI, "nullTest");
+Exchange exchange = new ExchangeImpl();
+message.setExchange(exchange);
+
+LogEvent event = mapper.map(message, null);
+
+assertEquals("POST[nullTest]", event.getOperationName());
+}
+
+@Test
+public void testMap() {
+DefaultLogEventMapper mapper = new DefaultLogEventMapper();
+Message message = new MessageImpl();
+message.put(Message.HTTP_REQUEST_METHOD, "PUT");
+message.put(Message.REQUEST_URI, "test");
+Exchange exchange = new ExchangeImpl();
+message.setExchange(exchange);
+
+LogEvent event = mapper.map(message);
+
+assertEquals("PUT[test]", event.getOperationName());
+}
+
}
[cxf] 02/02: [CXF-8565] Add support for requests with no body to the netty client transport There were several issues with the netty client transport:
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit bb7754baeb5e839061249ba32a48ba5f83bcb5e3
Author: Tim Ward
AuthorDate: Wed Jul 21 14:47:59 2021 +0100
[CXF-8565] Add support for requests with no body to the netty client
transport
There were several issues with the netty client transport:
* Several NPE locations due to setting or removing null headers
* No call to connect when there is no OutputStream to write a body
* No call to write the request when there is no OutputStream to close
Signed-off-by: Tim Ward
(cherry picked from commit fc5b8fd8689815ee3bff284b89ac8d9cb897e83b)
---
.../http/netty/client/NettyHttpConduit.java| 62 +++---
1 file changed, 54 insertions(+), 8 deletions(-)
diff --git
a/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java
b/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java
index f5d4e7a..cd358d4 100644
---
a/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java
+++
b/rt/transports/http-netty/netty-client/src/main/java/org/apache/cxf/transport/http/netty/client/NettyHttpConduit.java
@@ -32,6 +32,8 @@ import java.net.URI;
import java.net.URISyntaxException;
import java.security.Principal;
import java.security.cert.Certificate;
+import java.util.Arrays;
+import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Set;
@@ -78,6 +80,9 @@ public class NettyHttpConduit extends
URLConnectionHTTPConduit implements BusLif
public static final String MAX_RESPONSE_CONTENT_LENGTH =
"org.apache.cxf.transport.http.netty.maxResponseContentLength";
static final Integer DEFAULT_MAX_RESPONSE_CONTENT_LENGTH = 1048576;
+private static final Set KNOWN_HTTP_VERBS_WITH_NO_CONTENT =
+new HashSet<>(Arrays.asList(new String[]{"GET", "HEAD", "OPTIONS",
"TRACE"}));
+
final NettyHttpConduitFactory factory;
private Bootstrap bootstrap;
@@ -197,7 +202,10 @@ public class NettyHttpConduit extends
URLConnectionHTTPConduit implements BusLif
entity.createRequest(out.getOutBuffer());
// TODO need to check how to set the Chunked feature
//request.getRequest().setChunked(true);
-entity.getRequest().headers().set(Message.CONTENT_TYPE,
message.get(Message.CONTENT_TYPE));
+Object contentType = message.get(Message.CONTENT_TYPE);
+if (contentType != null) {
+entity.getRequest().headers().set(Message.CONTENT_TYPE,
contentType);
+}
return out;
}
return super.createOutputStream(message, needToCacheRequest,
isChunking, chunkThreshold);
@@ -314,7 +322,7 @@ public class NettyHttpConduit extends
URLConnectionHTTPConduit implements BusLif
synchronized (entity) {
Channel syncChannel = getChannel();
-ChannelFuture channelFuture =
syncChannel.write(entity);
+ChannelFuture channelFuture =
syncChannel.writeAndFlush(entity);
channelFuture.addListener(listener);
outputStream.close();
}
@@ -328,6 +336,11 @@ public class NettyHttpConduit extends
URLConnectionHTTPConduit implements BusLif
wrappedStream = cachedStream;
}
}
+
+@Override
+protected void handleNoOutput() throws IOException {
+connect(false);
+}
protected TLSClientParameters findTLSClientParameters() {
TLSClientParameters clientParameters =
outMessage.get(TLSClientParameters.class);
@@ -378,11 +391,6 @@ public class NettyHttpConduit extends
URLConnectionHTTPConduit implements BusLif
connFuture.addListener(listener);
-if (!output) {
-entity.getRequest().headers().remove("Transfer-Encoding");
-entity.getRequest().headers().remove("Content-Type");
-entity.getRequest().headers().remove(null);
-}
// setup the CxfResponseCallBack
CxfResponseCallBack callBack = new CxfResponseCallBack() {
@@ -398,6 +406,29 @@ public class NettyHttpConduit extends
URLConnectionHTTPConduit implements BusLif
};
entity.setCxfResponseCallback(callBack);
+if (!output) {
+entity.getRequest().headers().remove("Transfer-Encoding");
+entity.getRequest().headers().remove("Content-Type");
+
[cxf] branch 3.4.x-fixes updated (f0c87b6 -> bb7754b)
This is an automated email from the ASF dual-hosted git repository. ffang pushed a change to branch 3.4.x-fixes in repository https://gitbox.apache.org/repos/asf/cxf.git. from f0c87b6 Update Dropwizard Metrics to 4.1.25 new 817b10b [CXF-8565] A failing test demonstrating the Netty Transport NPE A simple GET request with no body triggers an NPE because there is no content type for the request, and CXF tries to set a null Content-Type in the Netty Request Also add a test with a body, to ensure that Netty works reliably there as well new bb7754b [CXF-8565] Add support for requests with no body to the netty client transport There were several issues with the netty client transport: 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: .../http/netty/client/NettyHttpConduit.java| 62 +++--- systests/jaxrs/pom.xml | 6 +++ .../cxf/systest/jaxrs/JAXRSAsyncClientTest.java| 47 3 files changed, 107 insertions(+), 8 deletions(-)
[cxf] 01/02: [CXF-8565] A failing test demonstrating the Netty Transport NPE A simple GET request with no body triggers an NPE because there is no content type for the request, and CXF tries to set a
This is an automated email from the ASF dual-hosted git repository.
ffang pushed a commit to branch 3.4.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 817b10b9089f29785e5f74f33e53a49f16dde320
Author: Tim Ward
AuthorDate: Wed Jul 21 13:52:22 2021 +0100
[CXF-8565] A failing test demonstrating the Netty Transport NPE
A simple GET request with no body triggers an NPE because there is no
content type for the request, and CXF tries to set a null Content-Type in the
Netty Request
Also add a test with a body, to ensure that Netty works reliably there as
well
Signed-off-by: Tim Ward
(cherry picked from commit e5f1c65f3bb2f0f043fb5572402a3932390b82c6)
---
systests/jaxrs/pom.xml | 6 +++
.../cxf/systest/jaxrs/JAXRSAsyncClientTest.java| 47 ++
2 files changed, 53 insertions(+)
diff --git a/systests/jaxrs/pom.xml b/systests/jaxrs/pom.xml
index 6208ffb..e686094 100644
--- a/systests/jaxrs/pom.xml
+++ b/systests/jaxrs/pom.xml
@@ -259,6 +259,12 @@
org.apache.cxf
+cxf-rt-transports-http-netty-client
+${project.version}
+test
+
+
+org.apache.cxf
cxf-rt-features-logging
${project.version}
test
diff --git
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
index 3cbf337..15e4c04 100644
---
a/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
+++
b/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/JAXRSAsyncClientTest.java
@@ -57,9 +57,11 @@ import javax.xml.ws.Holder;
import org.apache.cxf.jaxrs.client.ClientConfiguration;
import org.apache.cxf.jaxrs.client.JAXRSClientFactory;
+import org.apache.cxf.jaxrs.client.JAXRSClientFactoryBean;
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.model.AbstractResourceInfo;
import org.apache.cxf.testutil.common.AbstractBusClientServerTestBase;
+import org.apache.cxf.transport.http.netty.client.NettyHttpTransportFactory;
import org.apache.cxf.transports.http.configuration.HTTPClientPolicy;
import org.junit.Before;
@@ -478,6 +480,51 @@ public class JAXRSAsyncClientTest extends
AbstractBusClientServerTestBase {
assertThat(response.getStatus(), equalTo(404));
}
}
+
+@Test
+public void testNettyClientGet() throws Exception {
+final String address = "http://localhost:; + PORT +
"/bookstore/books/wildcard";
+
+JAXRSClientFactoryBean bean = new JAXRSClientFactoryBean();
+
bean.setTransportId(NettyHttpTransportFactory.DEFAULT_NAMESPACES.get(0));
+bean.setAddress(address);
+
+WebClient webClient = bean.createWebClient();
+
+try (Response response = webClient
+.to(address, false)
+.accept("text/plain")
+.async()
+.get()
+.get(10, TimeUnit.SECONDS)) {
+assertThat(response.getStatus(), equalTo(200));
+} finally {
+webClient.close();
+}
+}
+
+@Test
+public void testNettyClientDeleteWithBody() throws Exception {
+final String address = "http://localhost:; + PORT +
"/bookstore/deletebody";
+
+JAXRSClientFactoryBean bean = new JAXRSClientFactoryBean();
+
bean.setTransportId(NettyHttpTransportFactory.DEFAULT_NAMESPACES.get(0));
+bean.setAddress(address);
+
+WebClient webClient = bean.createWebClient();
+
+try {
+Book book = webClient
+.to(address, false)
+.accept("application/xml")
+.async()
+.method("DELETE", Entity.entity(new Book("Delete", 123L),
"application/xml"), Book.class)
+.get(20, TimeUnit.SECONDS);
+assertEquals("Delete", book.getName());
+} finally {
+webClient.close();
+}
+}
private WebClient createWebClient(String address) {
return WebClient.create(address);
[cxf] branch master updated (2d2b644 -> 248c7da)
This is an automated email from the ASF dual-hosted git repository. ffang pushed a change to branch master in repository https://gitbox.apache.org/repos/asf/cxf.git. from 2d2b644 [CXF-8564]upgrade to KARAF 4.3.3 to support JDK17-EA new e5f1c65 [CXF-8565] A failing test demonstrating the Netty Transport NPE A simple GET request with no body triggers an NPE because there is no content type for the request, and CXF tries to set a null Content-Type in the Netty Request Also add a test with a body, to ensure that Netty works reliably there as well new fc5b8fd [CXF-8565] Add support for requests with no body to the netty client transport There were several issues with the netty client transport: new 248c7da Merge pull request #828 from timothyjward/fix/netty-client The 16434 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: .../http/netty/client/NettyHttpConduit.java| 62 +++--- systests/jaxrs/pom.xml | 6 +++ .../cxf/systest/jaxrs/JAXRSAsyncClientTest.java| 47 3 files changed, 107 insertions(+), 8 deletions(-)
