[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f8a3ab80 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f8a3ab80 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f8a3ab80 Branch: refs/heads/master Commit: f8a3ab807c60ef7b7dc3047ff61410a5b76645ec Parents: 8d48532 0a4e296 Author: Sergey BeryozkinAuthored: Tue Sep 5 16:32:17 2017 +0100 Committer: Sergey Beryozkin Committed: Tue Sep 5 16:32:17 2017 +0100 -- distribution/src/main/release/release_notes.txt | 4 1 file changed, 4 insertions(+) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/472c37bc Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/472c37bc Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/472c37bc Branch: refs/heads/master Commit: 472c37bcab01a476d283608a593484f308c39fc5 Parents: 923ffe7 12df8ab Author: Sergey BeryozkinAuthored: Tue Aug 29 17:40:48 2017 +0100 Committer: Sergey Beryozkin Committed: Tue Aug 29 17:40:48 2017 +0100 -- .../http/netty/server/NettyHttpServerEngine.java | 5 + .../netty/server/NettyHttpServerEngineTest.java| 17 + 2 files changed, 22 insertions(+) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/cc3565f3 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/cc3565f3 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/cc3565f3 Branch: refs/heads/master Commit: cc3565f3e7737d6e4b048de5a14374afe1e8db54 Parents: 9ef150d 233faae Author: Sergey BeryozkinAuthored: Thu Aug 17 09:50:08 2017 +0100 Committer: Sergey Beryozkin Committed: Thu Aug 17 09:50:08 2017 +0100 -- .../apache/cxf/common/util/Base64Utility.java | 3 +- .../cxf/common/xmlschema/XmlSchemaUtils.java| 1 - .../AbstractOutDatabindingInterceptor.java | 4 +- .../interceptor/AttachmentOutInterceptor.java | 2 +- .../interceptor/OneWayProcessorInterceptor.java | 5 +- .../security/DefaultSecurityContext.java| 2 - .../org/apache/cxf/message/MessageUtils.java| 5 +- .../staxutils/transform/InTransformReader.java | 1 - .../ws/addressing/EndpointReferenceUtils.java | 5 - .../samples/jax_rs/description_swagger2/pom.xml | 2 +- .../jax_rs/spring_boot_scan/application/pom.xml | 2 +- .../rs/service/SampleRestApplication.java | 14 + .../src/main/resources/application.yml | 4 +- .../apache/cxf/binding/corba/CorbaConduit.java | 2 +- .../cxf/binding/corba/CorbaDestination.java | 1 - .../apache/cxf/binding/corba/CorbaMessage.java | 2 - .../CorbaStreamFaultInInterceptor.java | 2 - .../corba/runtime/CorbaObjectReader.java| 3 +- .../corba/runtime/CorbaObjectWriter.java| 3 +- .../corba/types/CorbaExceptionHandler.java | 2 - .../binding/corba/types/CorbaHandlerUtils.java | 2 +- .../cxf/binding/corba/utils/CorbaUtils.java | 2 - .../apache/cxf/jaxrs/impl/HttpHeadersImpl.java | 4 +- .../cxf/jaxrs/impl/MediaTypeHeaderProvider.java | 2 +- .../org/apache/cxf/jaxrs/impl/ResponseImpl.java | 2 +- .../org/apache/cxf/jaxrs/impl/UriInfoImpl.java | 4 +- .../jaxrs/interceptor/JAXRSInInterceptor.java | 4 +- .../jaxrs/interceptor/JAXRSOutInterceptor.java | 5 +- .../cxf/jaxrs/provider/BinaryDataProvider.java | 4 +- .../cxf/jaxrs/provider/MultipartProvider.java | 8 +- .../cxf/jaxrs/provider/ProviderFactory.java | 2 +- .../security/KerberosAuthenticationFilter.java | 4 +- .../jaxrs/servlet/CXFNonSpringJaxrsServlet.java | 4 +- .../apache/cxf/jaxrs/utils/ExceptionUtils.java | 8 +- .../apache/cxf/jaxrs/utils/InjectionUtils.java | 3 +- .../org/apache/cxf/jaxrs/utils/JAXRSUtils.java | 5 +- .../apache/cxf/jaxrs/client/AbstractClient.java | 7 +- .../cxf/jaxrs/provider/json/JSONProvider.java | 6 +- .../search/AbstractSearchConditionParser.java | 3 +- .../cxf/jaxrs/ext/search/SearchContextImpl.java | 4 +- .../cxf/jaxrs/ext/search/fiql/FiqlParser.java | 4 +- .../oauth/filters/OAuthServletFilter.java | 4 +- .../cxf/rs/security/oauth/utils/OAuthUtils.java | 6 +- .../oauth2/filters/OAuthRequestFilter.java | 4 +- .../http/asyncclient/AsyncHTTPConduit.java | 5 +- .../http/netty/client/NettyHttpConduit.java | 5 +- .../transport/http/AbstractHTTPDestination.java | 2 +- .../apache/cxf/transport/http/HTTPConduit.java | 9 +- .../http/URLConnectionHTTPConduit.java | 16 +- .../http/auth/AbstractSpnegoAuthSupplier.java | 6 +- .../apache/cxf/transport/jms/JMSConduit.java| 3 +- .../cxf/transport/jms/JMSDestination.java | 3 +- .../cxf/transport/jms/JMSMessageUtils.java | 6 +- .../cxf/transport/local/LocalConduit.java | 4 +- .../addressing/impl/InternalContextUtils.java | 7 +- .../ws/addressing/impl/MAPAggregatorImpl.java | 3 +- .../java/org/apache/cxf/ws/rm/Destination.java | 4 +- .../apache/cxf/ws/rm/DestinationSequence.java | 7 +- .../apache/cxf/ws/rm/InternalContextUtils.java | 3 +- .../cxf/ws/rm/RMCaptureInInterceptor.java | 4 +- .../apache/cxf/ws/rm/RMDeliveryInterceptor.java | 2 +- .../org/apache/cxf/ws/rm/RMInInterceptor.java | 9 +- .../KerberosTokenInterceptorProvider.java | 4 +- .../wss4j/AbstractTokenInterceptor.java | 2 +- .../wss4j/PolicyBasedWSS4JInInterceptor.java| 2 +- .../wss4j/PolicyBasedWSS4JOutInterceptor.java | 2 +- .../PolicyBasedWSS4JStaxInInterceptor.java | 2 +- .../PolicyBasedWSS4JStaxOutInterceptor.java | 2 +- .../security/wss4j/WSS4JStaxInInterceptor.java | 3 +- .../cxf/ws/security/wss4j/WSS4JUtils.java | 3 +- .../wss4j/AbstractPolicySecurityTest.java | 122 ++-- .../wss4j/example-sts-issued-saml-assertion.xml | 58 +--- .../java2js/processor/JavaToJSProcessor.java| 2 - .../generator/wsdl11/BeanGenerator.java | 7 +-
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4a663dba Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4a663dba Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4a663dba Branch: refs/heads/master Commit: 4a663dbab187172d809045c715c935349e4a110c Parents: d48820b 13bcc23 Author: Sergey BeryozkinAuthored: Fri Aug 4 17:36:09 2017 +0100 Committer: Sergey Beryozkin Committed: Fri Aug 4 17:36:09 2017 +0100 -- .../cxf/bus/extension/ExtensionManagerBus.java | 3 +- .../apache/cxf/common/logging/Log4jLogger.java | 14 +- .../org/apache/cxf/endpoint/ClientImpl.java | 4 +- .../cxf/staxutils/DepthXMLStreamReader.java | 2 +- .../cxf/staxutils/FragmentStreamReader.java | 13 +- .../org/apache/cxf/staxutils/StaxUtils.java | 52 +++ .../cxf/staxutils/DepthXMLStreamReaderTest.java | 3 +- .../cxf/staxutils/FragmentStreamReaderTest.java | 7 +- .../org/apache/cxf/staxutils/StaxUtilsTest.java | 9 +- .../java/org/apache/cxf/cdi/CdiBusBean.java | 4 +- .../cxf/cdi/JAXRSCdiResourceExtension.java | 2 +- .../cxf/connector/CXFConnectionParam.java | 6 +- .../cxf/jca/core/classloader/Handler.java | 3 +- .../jca/core/classloader/PlugInClassLoader.java | 14 +- .../classloader/PlugInClassLoaderHelper.java| 58 .../AbstractManagedConnectionFactoryImpl.java | 9 +- .../cxf/jca/cxf/ConnectionFactoryImpl.java | 3 +- .../org/apache/cxf/jca/cxf/JCABusFactory.java | 7 +- .../org/apache/cxf/jca/jarloader/JarLoader.java | 3 +- .../outbound/ManagedConnectionFactoryImpl.java | 3 +- .../ManagedConnectionFactoryImplTest.java | 1 + .../cxf/jca/cxf/ConnectionFactoryImplTest.java | 2 + .../cxf/ManagedConnectionFactoryImplTest.java | 1 + .../cxf/jca/cxf/ManagedConnectionImplTest.java | 1 + .../cxf/jca/cxf/ResourceAdapterImplTest.java| 2 + .../tracing/brave/AbstractBraveInterceptor.java | 6 +- .../cxf/tracing/brave/BraveTracerContext.java | 3 +- .../cxf/tracing/brave/HttpClientSpanParser.java | 3 +- .../cxf/tracing/brave/HttpServerSpanParser.java | 3 +- .../cxf/maven_plugin/AbstractCodegenMoho.java | 43 +++--- .../wsdl2java/WsdlOptionLoader.java | 3 +- .../maven_plugin/javatowadl/DumpJavaDoc.java| 3 +- .../maven_plugin/javatowadl/Java2WADLMojo.java | 5 +- .../apache/cxf/osgi/itests/jaxrs/BookStore.java | 17 +-- .../org/apache/cxf/binding/coloc/ColocUtil.java | 3 +- .../interceptors/CorbaStreamInInterceptor.java | 3 +- .../CorbaStreamOutEndingInterceptor.java| 3 +- .../corba/runtime/CorbaStreamReader.java| 14 +- .../types/AbstractStartEndEventProducer.java| 4 +- .../corba/types/CorbaAnyEventProducer.java | 7 +- .../corba/types/CorbaEnumEventProducer.java | 4 +- .../corba/types/CorbaFixedEventProducer.java| 4 +- .../CorbaObjectReferenceEventProducer.java | 23 ++- .../types/CorbaOctetSequenceEventProducer.java | 8 +- .../types/CorbaPrimitiveTypeEventProducer.java | 4 +- .../corba/types/CorbaStructListener.java| 17 +-- .../corba/utils/CorbaObjectReferenceHelper.java | 9 +- .../cxf/binding/corba/utils/CorbaUtils.java | 147 +-- .../binding/soap/SoapBindingConfiguration.java | 3 +- .../interceptor/AbstractSoapInterceptor.java| 6 +- .../soap/interceptor/CheckFaultInterceptor.java | 5 +- .../soap/interceptor/RPCInInterceptor.java | 6 +- .../soap/interceptor/RPCOutInterceptor.java | 2 +- .../interceptor/ReadHeadersInterceptor.java | 8 +- .../interceptor/Soap11FaultInInterceptor.java | 3 +- .../interceptor/Soap12FaultOutInterceptor.java | 3 +- .../soap/interceptor/StartBodyInterceptor.java | 5 +- .../cxf/binding/soap/model/SoapBindingInfo.java | 3 +- .../binding/soap/saaj/SAAJOutInterceptor.java | 5 +- .../cxf/binding/soap/saaj/SAAJStreamWriter.java | 5 +- .../binding/soap/SoapOutInterceptorTest.java| 9 +- .../cxf/binding/soap/saaj/ParseBodyTest.java| 3 +- .../interceptor/XMLMessageInInterceptor.java| 13 +- .../java/org/apache/cxf/aegis/AegisContext.java | 6 +- .../apache/cxf/aegis/DatabindingException.java | 7 +- .../cxf/aegis/databinding/AegisDatabinding.java | 3 +- .../aegis/databinding/XMLStreamDataReader.java | 5 +- .../org/apache/cxf/aegis/type/TypeUtil.java | 21 ++- .../apache/cxf/aegis/type/XMLTypeCreator.java | 12 +- .../apache/cxf/aegis/type/basic/BeanType.java | 3 +- .../cxf/aegis/type/basic/BeanTypeInfo.java | 3 +- .../type/basic/InterfaceInvocationHandler.java | 8 +- .../apache/cxf/aegis/type/basic/ObjectType.java | 5 +- .../cxf/aegis/type/java5/AnnotatedTypeInfo.java | 6 +-
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/d86a5597 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d86a5597 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d86a5597 Branch: refs/heads/master Commit: d86a5597ae16fcf3df70e90982c762d6728a26f1 Parents: a2aad4f 21197c8 Author: Sergey BeryozkinAuthored: Fri Aug 4 12:51:13 2017 +0100 Committer: Sergey Beryozkin Committed: Fri Aug 4 12:51:13 2017 +0100 -- .../apache/cxf/maven_plugin/java2swagger/Java2SwaggerMojo.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/da07e675 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/da07e675 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/da07e675 Branch: refs/heads/master Commit: da07e67588333ce6793f5f008400f74c0c94c582 Parents: ef8dda9 b936eda Author: Sergey BeryozkinAuthored: Wed Jul 12 12:40:17 2017 +0100 Committer: Sergey Beryozkin Committed: Wed Jul 12 12:40:17 2017 +0100 -- .../src/main/java/org/apache/cxf/jaxrs/utils/JAXBUtils.java | 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/4be70446 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4be70446 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4be70446 Branch: refs/heads/master Commit: 4be7044693681d6263658821ff620ba1cd8ec62b Parents: 85e7521 e0bbfe4 Author: Sergey BeryozkinAuthored: Tue Jul 11 17:38:20 2017 +0100 Committer: Sergey Beryozkin Committed: Tue Jul 11 17:38:20 2017 +0100 -- .../sts/rest/RESTSecurityTokenServiceImpl.java | 1 + .../provider/jwt/DefaultJWTClaimsProvider.java | 23 +- .../cxf/sts/token/provider/JWTClaimsTest.java | 75 .../cxf/systest/sts/rest/STSRESTTest.java | 7 +- .../cxf/systest/sts/rest/cxf-rest-sts.xml | 7 ++ 5 files changed, 108 insertions(+), 5 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/daf48cac Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/daf48cac Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/daf48cac Branch: refs/heads/master Commit: daf48cacd16f1e20f5fb1b4658a3ba916c43b6a4 Parents: 26feb75 da59b25 Author: Sergey BeryozkinAuthored: Mon May 29 13:39:53 2017 +0100 Committer: Sergey Beryozkin Committed: Mon May 29 13:39:53 2017 +0100 -- services/xkms/xkms-itests/pom.xml | 6 ++ .../apache/cxf/xkms/itests/BasicIntegrationTest.java | 13 - 2 files changed, 14 insertions(+), 5 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c0efcafe Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c0efcafe Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c0efcafe Branch: refs/heads/master Commit: c0efcafeaccad55ef3c2326e7147468edf9dbdd8 Parents: ae18422 a983459 Author: Sergey BeryozkinAuthored: Thu Apr 20 15:25:08 2017 +0100 Committer: Sergey Beryozkin Committed: Thu Apr 20 15:25:08 2017 +0100 -- .../apache/cxf/transport/jms/JMSConduit.java| 22 .../cxf/transport/jms/JMSDestination.java | 4 +--- 2 files changed, 23 insertions(+), 3 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3da56642 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3da56642 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3da56642 Branch: refs/heads/master Commit: 3da566423f8a02305612959018412306769ad94d Parents: 726c0aa ee248ce Author: Sergey BeryozkinAuthored: Thu Mar 23 13:22:01 2017 + Committer: Sergey Beryozkin Committed: Thu Mar 23 13:22:01 2017 + -- .../org/apache/cxf/common/util/ClassHelper.java | 5 .../cxf/staxutils/W3CDOMStreamReader.java | 7 -- .../cxf/transport/TransportURIResolver.java | 9 ++- .../cxf/maven_plugin/AbstractCodegenMoho.java | 13 ++ .../cxf/transport/jms/JMSMessageUtils.java | 26 +++- .../cxf/transport/jms/JMSPropertyType.java | 19 +++--- 6 files changed, 55 insertions(+), 24 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a776fbd6 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a776fbd6 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a776fbd6 Branch: refs/heads/master Commit: a776fbd6c5905d93aaacd8e02f34dfafa5e774d3 Parents: c63096e f17784b Author: Sergey BeryozkinAuthored: Tue Mar 7 16:52:48 2017 + Committer: Sergey Beryozkin Committed: Tue Mar 7 16:52:48 2017 + -- .../org/apache/cxf/https/ssl3/sslv3-server.xml | 16 .../ciphersuites/ciphersuites-explicit-client.xml | 2 +- .../https/ciphersuites/ciphersuites-server.xml | 5 +++-- 3 files changed, 20 insertions(+), 3 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f8cec430 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f8cec430 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f8cec430 Branch: refs/heads/master Commit: f8cec430eadf4eebbde85622cfe0964310dd07a0 Parents: c87613b 57fcf8d Author: Freeman FangAuthored: Tue Jan 24 13:19:43 2017 +0800 Committer: Freeman Fang Committed: Tue Jan 24 13:19:43 2017 +0800 -- .../cxf/interceptor/LoggingInInterceptor.java | 2 +- .../cxf/interceptor/LoggingOutInterceptor.java | 2 +- .../tracing/brave/AbstractBraveProvider.java| 2 +- .../impl/WebApplicationExceptionMapper.java | 10 +- .../validation/ValidationExceptionMapper.java | 25 ++- .../wss4j/UsernameTokenInterceptor.java | 11 +- .../cxf/systest/sts/claims/ClaimsTest.java | 2 + .../systest/sts/custom/CustomParameterTest.java | 101 + .../systest/sts/custom/CustomUTValidator.java | 216 +++ .../cxf/systest/sts/custom/STSServer.java | 50 + .../apache/cxf/systest/sts/custom/Server.java | 46 .../apache/cxf/systest/sts/custom/DoubleIt.wsdl | 153 + .../cxf/systest/sts/custom/cxf-client.xml | 57 + .../cxf/systest/sts/custom/cxf-service.xml | 41 .../apache/cxf/systest/sts/custom/cxf-sts.xml | 43 .../sts/deployment/ws-trust-1.4-service.wsdl| 41 16 files changed, 786 insertions(+), 16 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/33c76713 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/33c76713 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/33c76713 Branch: refs/heads/master Commit: 33c76713660c1939d17298f2f21aa7b01a126eb7 Parents: 89ae972 0d797ec Author: Andrei ShakirinAuthored: Wed Jan 4 22:10:33 2017 +0100 Committer: Andrei Shakirin Committed: Wed Jan 4 22:10:33 2017 +0100 -- .../org/apache/cxf/wsn/jms/JmsPullPoint.java| 44 ++-- 1 file changed, 31 insertions(+), 13 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b6b98721 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b6b98721 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b6b98721 Branch: refs/heads/master Commit: b6b9872181c119b2dfb6516400ad02eb897ee33f Parents: 74d7990 04720d5 Author: Sergey BeryozkinAuthored: Thu Dec 29 15:43:15 2016 + Committer: Sergey Beryozkin Committed: Thu Dec 29 15:43:15 2016 + -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/6d3afd7d Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/6d3afd7d Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/6d3afd7d Branch: refs/heads/master Commit: 6d3afd7d39e3e0f9f7ab4de7827fc5b8953f902a Parents: dc072a6 7c191d4 Author: Freeman FangAuthored: Thu Dec 29 10:19:07 2016 +0800 Committer: Freeman Fang Committed: Thu Dec 29 10:19:07 2016 +0800 -- .../samples/jax_rs/description_swagger2/pom.xml | 4 + .../jax_rs/description_swagger2_spring/pom.xml | 4 + .../jax_rs/description_swagger2_web/README.txt | 2 +- .../jax_rs/description_swagger2_web/pom.xml | 33 ++-- integration/tracing/tracing-brave/pom.xml | 12 ++ .../tracing/brave/AbstractBraveInterceptor.java | 179 +++ .../tracing/brave/BraveStartInterceptor.java| 49 + .../cxf/tracing/brave/BraveStopInterceptor.java | 48 + .../cxf/tracing/brave/jaxrs/BraveFeature.java | 6 +- .../cxf/tracing/brave/jaxws/BraveFeature.java | 53 ++ .../cxf/tracing/brave/BraveTraceTest.java | 99 ++ .../tracing/brave/LoggingSpanNameProvider.java | 31 .../org/apache/cxf/tracing/brave/MyService.java | 26 +++ .../apache/cxf/tracing/brave/MyServiceImpl.java | 28 +++ parent/pom.xml | 2 +- rt/features/pom.xml | 1 - rt/features/tracing-brave/pom.xml | 87 - .../cxf/tracing/brave/CxfClientRequest.java | 49 - .../cxf/tracing/brave/CxfServerRequest.java | 48 - .../cxf/tracing/brave/HttpResponse200.java | 28 --- .../apache/cxf/tracing/brave/ParsedMessage.java | 121 - .../apache/cxf/tracing/brave/TraceFeature.java | 50 -- .../cxf/tracing/brave/TraceInInterceptor.java | 58 -- .../cxf/tracing/brave/TraceOutInterceptor.java | 57 -- .../cxf/tracing/brave/BraveTraceTest.java | 99 -- .../tracing/brave/LoggingSpanNameProvider.java | 31 .../org/apache/cxf/tracing/brave/MyService.java | 26 --- .../apache/cxf/tracing/brave/MyServiceImpl.java | 28 --- .../cxf/jaxrs/swagger/JaxRs2Extension.java | 13 +- 29 files changed, 562 insertions(+), 710 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/08911629 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/08911629 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/08911629 Branch: refs/heads/master Commit: 08911629ee02b12b1d7b14ef4d1c6de6d292e947 Parents: d99c9ad 7a98960 Author: Sergey BeryozkinAuthored: Fri Dec 2 16:50:39 2016 + Committer: Sergey Beryozkin Committed: Fri Dec 2 16:50:39 2016 + -- .../apache/cxf/maven_plugin/Java2WSMojo.java| 22 +++- 1 file changed, 17 insertions(+), 5 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c208c9f1 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c208c9f1 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c208c9f1 Branch: refs/heads/master Commit: c208c9f16b2ca56166c91222fa6517999e40b9a2 Parents: 58e2e47 57bb94e Author: Sergey BeryozkinAuthored: Thu Oct 20 12:21:27 2016 +0100 Committer: Sergey Beryozkin Committed: Thu Oct 20 12:21:27 2016 +0100 -- .../token/provider/SAMLProviderActAsTest.java | 63 1 file changed, 52 insertions(+), 11 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a4e4b8f9 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a4e4b8f9 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a4e4b8f9 Branch: refs/heads/master Commit: a4e4b8f9b7b3e92a57f3b80b59cdc21a2676182c Parents: ea23ff8 c2dc0e3 Author: Sergey BeryozkinAuthored: Thu Sep 22 17:42:50 2016 +0100 Committer: Sergey Beryozkin Committed: Thu Sep 22 17:42:50 2016 +0100 -- .../features/src/main/resources/features.xml| 12 +- rt/transports/http-jetty/pom.xml| 1 + .../osgi/HTTPJettyTransportActivator.java | 22 ++-- rt/transports/http-undertow/pom.xml | 1 + .../osgi/HTTPUndertowTransportActivator.java| 22 ++-- .../org/apache/cxf/sts/SignatureProperties.java | 1 + .../cxf/systest/ws/x509/SHA512PolicyLoader.java | 117 +++ .../cxf/systest/ws/x509/X509TokenTest.java | 28 - .../cxf/systest/ws/x509/DoubleItX509.wsdl | 63 ++ .../org/apache/cxf/systest/ws/x509/client.xml | 14 +++ .../org/apache/cxf/systest/ws/x509/server.xml | 13 +++ .../apache/cxf/systest/ws/x509/stax-server.xml | 14 +++ 12 files changed, 282 insertions(+), 26 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/922152c2 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/922152c2 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/922152c2 Branch: refs/heads/master Commit: 922152c214f36f2753a0a685bb974f5c66c374fa Parents: d6a70f5 9e8765a Author: Sergey BeryozkinAuthored: Fri Sep 16 11:28:39 2016 +0100 Committer: Sergey Beryozkin Committed: Fri Sep 16 11:28:39 2016 +0100 -- .../src/main/java/org/apache/cxf/jaxrs/client/spec/ClientImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7c594df6 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7c594df6 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7c594df6 Branch: refs/heads/master Commit: 7c594df67a7a15be3dff65b189981353c3d908ea Parents: f18d412 9b2bda5 Author: Sergey BeryozkinAuthored: Mon Jul 25 13:39:10 2016 +0300 Committer: Sergey Beryozkin Committed: Mon Jul 25 13:39:10 2016 +0300 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/7c594df6/parent/pom.xml --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/39754b7d Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/39754b7d Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/39754b7d Branch: refs/heads/master Commit: 39754b7da916e2a601c2d8fdc13167573a2beae5 Parents: d5d9c6c 5b740cc Author: Sergey BeryozkinAuthored: Thu Apr 21 13:10:15 2016 +0100 Committer: Sergey Beryozkin Committed: Thu Apr 21 13:10:15 2016 +0100 -- .../https/clientauth/ClientAuthTest.java| 54 1 file changed, 54 insertions(+) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/55976e14 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/55976e14 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/55976e14 Branch: refs/heads/master Commit: 55976e149cb082d6b0fc1e35dc13f10406204b94 Parents: ade81e3 53d7ad0 Author: Sergey BeryozkinAuthored: Thu Apr 7 18:14:00 2016 +0100 Committer: Sergey Beryozkin Committed: Thu Apr 7 18:14:00 2016 +0100 -- .../oauth2/filters/OAuthRequestFilter.java | 2 +- .../jaxrs/JAXRSClientServerSpringBookTest.java | 35 ++-- 2 files changed, 19 insertions(+), 18 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e9fa213b Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e9fa213b Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e9fa213b Branch: refs/heads/master Commit: e9fa213b9b6a4df35daaa77a7eaaf74f639e7e13 Parents: b66bb19 b2e5fb6 Author: Sergey BeryozkinAuthored: Tue Apr 5 16:51:21 2016 +0100 Committer: Sergey Beryozkin Committed: Tue Apr 5 16:51:21 2016 +0100 -- .gitignore | 1 + .../samples/jax_rs/websocket_osgi/README.txt| 94 +++ .../samples/jax_rs/websocket_osgi/pom.xml | 96 +++ .../main/java/demo/jaxrs/server/Customer.java | 43 +++ .../java/demo/jaxrs/server/CustomerService.java | 271 +++ .../src/main/java/demo/jaxrs/server/Order.java | 69 + .../main/java/demo/jaxrs/server/Product.java| 43 +++ .../resources/OSGI-INF/blueprint/context.xml| 47 .../websocket_osgi/src/test/resources/client.js | 234 .../AsymmetricBindingHandler.java | 1 + .../StaxAsymmetricBindingHandler.java | 4 + .../StaxSymmetricBindingHandler.java| 4 + .../policyhandlers/SymmetricBindingHandler.java | 1 + .../https/ciphersuites/CipherSuitesTest.java| 31 +++ .../src/test/resources/keys/wss40exp.jks| Bin 0 -> 3941 bytes .../src/test/resources/keys/wss40expCA.jks | Bin 0 -> 858 bytes .../ciphersuites-client-expired-cert.xml| 37 +++ .../https/ciphersuites/ciphersuites-server.xml | 28 ++ .../org/apache/cxf/systest/ws/gcm/GCMTest.java | 48 .../ws/gcm/MGF256AlgorithmSuiteLoader.java | 18 ++ .../apache/cxf/systest/ws/gcm/DoubleItGCM.wsdl | 61 + .../apache/cxf/systest/ws/gcm/mgf-client.xml| 10 + .../apache/cxf/systest/ws/gcm/mgf-server.xml| 9 + .../cxf/systest/ws/gcm/mgf-stax-server.xml | 10 + 24 files changed, 1160 insertions(+) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/527cd1c8 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/527cd1c8 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/527cd1c8 Branch: refs/heads/master Commit: 527cd1c811876f980fb23712af04437a02d9dc92 Parents: 0d29a38 d26570e Author: Sergey BeryozkinAuthored: Tue Mar 1 12:10:10 2016 + Committer: Sergey Beryozkin Committed: Tue Mar 1 12:10:10 2016 + -- .../org/apache/cxf/sts/operation/IssueEncryptedUnitTest.java | 4 ++-- .../java/org/apache/cxf/sts/operation/IssueSamlUnitTest.java | 2 +- .../apache/cxf/systest/ws/gcm/MGF256AlgorithmSuiteLoader.java| 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3132adfe Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3132adfe Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3132adfe Branch: refs/heads/master Commit: 3132adfe2b59d0cc5d82bed24c75d4cad08b9593 Parents: 7d5a70b 66fc0d9 Author: Freeman FangAuthored: Mon Feb 29 08:25:40 2016 +0800 Committer: Freeman Fang Committed: Mon Feb 29 08:25:40 2016 +0800 -- .../cxf/attachment/ContentDisposition.java | 20 .../cxf/attachment/AttachmentUtilTest.java | 7 +++ .../WebFaultOutInterceptorTestCase.java | 14 ++ .../cxf/rs/security/jose/jws/JwsHeaders.java| 13 + .../jose/jws/JwsCompactReaderWriterTest.java| 2 +- .../security/jose/jws/JwsJsonConsumerTest.java | 5 + .../security/jose/jws/JwsJsonProducerTest.java | 4 ++-- 7 files changed, 54 insertions(+), 11 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c6fb2db0 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c6fb2db0 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c6fb2db0 Branch: refs/heads/master Commit: c6fb2db07a7ebc2bebe2220d6211f6fac357e603 Parents: e6f0722 c857aa3 Author: Sergey BeryozkinAuthored: Wed Feb 10 22:37:26 2016 + Committer: Sergey Beryozkin Committed: Wed Feb 10 22:37:26 2016 + -- .../cxf/sts/operation/TokenIssueOperation.java | 20 +- .../cxf/sts/rest/RESTSecurityTokenService.java | 11 +- .../sts/rest/RESTSecurityTokenServiceImpl.java | 29 +- .../sts/operation/IssueJWTRealmUnitTest.java| 34 +- .../cxf/sts/operation/IssueJWTUnitTest.java | 10 + .../cxf/systest/sts/rest/RESTUnitTest.java | 758 .../cxf/systest/sts/rest/STSRESTTest.java | 1079 ++ .../cxf/systest/sts/rest/cxf-rest-sts.xml |1 + 8 files changed, 1136 insertions(+), 806 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/f17f9231 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/f17f9231 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/f17f9231 Branch: refs/heads/master Commit: f17f923192cee7d734b872aa69fc7332bff0aa25 Parents: 543644a bc948f0 Author: irisdingAuthored: Thu Jan 14 10:16:37 2016 +0800 Committer: irisding Committed: Thu Jan 14 10:16:37 2016 +0800 -- parent/pom.xml| 7 ++- .../main/java/org/apache/cxf/jaxrs/JAXRSInvoker.java | 2 +- .../grants/code/DefaultEHCacheCodeDataProvider.java | 2 +- .../provider/DefaultEHCacheOAuthDataProvider.java | 4 ++-- .../KerberosTokenInterceptorProvider.java | 2 +- .../policy/interceptors/NegotiationUtils.java | 2 +- .../ws/security/wss4j/StaxActionInInterceptor.java| 12 ++-- .../ws/security/wss4j/StaxCryptoCoverageChecker.java | 8 .../wss4j/StaxSecurityContextInInterceptor.java | 14 +++--- .../cxf/ws/security/wss4j/WSS4JStaxInInterceptor.java | 2 +- .../ws/security/wss4j/WSS4JStaxOutInterceptor.java| 2 +- .../policyhandlers/StaxSymmetricBindingHandler.java | 12 ++-- .../apache/cxf/sts/operation/TokenIssueOperation.java | 2 +- .../apache/cxf/sts/token/canceller/SCTCanceller.java | 2 +- .../cxf/sts/token/provider/TokenProviderUtils.java| 2 +- systests/jaxrs/pom.xml| 4 .../systest/jaxrs/JAXRSContinuationsServlet3Test.java | 1 - 17 files changed, 44 insertions(+), 36 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/af717517 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/af717517 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/af717517 Branch: refs/heads/master Commit: af7175171ade0017e77a8deb17ee90849b9ace1b Parents: 4bb552c 08068c8 Author: Benson MarguliesAuthored: Fri Dec 11 11:14:27 2015 -0500 Committer: Benson Margulies Committed: Fri Dec 11 11:14:27 2015 -0500 -- .../oauth2/client/OAuthClientUtils.java | 11 +-- .../oauth2/common/ServerAccessToken.java| 9 +++ .../oauth2/grants/AbstractGrantHandler.java | 66 .../grants/code/AbstractCodeDataProvider.java | 1 + .../code/AuthorizationCodeGrantHandler.java | 38 +++-- .../code/ServerAuthorizationCodeGrant.java | 9 +++ .../provider/AbstractOAuthDataProvider.java | 1 + .../oauth2/services/AbstractOAuthService.java | 9 ++- .../oauth2/services/AbstractTokenService.java | 81 .../oauth2/services/AccessTokenService.java | 3 +- .../services/DirectAuthorizationService.java| 41 ++ .../services/RedirectionBasedGrantService.java | 79 ++- .../oauth2/services/TokenRevocationService.java | 3 +- .../oidc/idp/IdTokenResponseFilter.java | 3 + 14 files changed, 222 insertions(+), 132 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c32ebfa5 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c32ebfa5 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c32ebfa5 Branch: refs/heads/master Commit: c32ebfa59a67c8d34e1ffdd64e8821a28a04b752 Parents: 07c676d 304c62a Author: Sergey BeryozkinAuthored: Thu Dec 10 14:36:42 2015 + Committer: Sergey Beryozkin Committed: Thu Dec 10 14:36:42 2015 + -- .../cxf/transport/jms/BackChannelConduit.java | 106 ++- 1 file changed, 56 insertions(+), 50 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8006d4c4 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8006d4c4 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8006d4c4 Branch: refs/heads/master Commit: 8006d4c4a7fc709993ab66cc2656f1cb6094281d Parents: f37b8fc 70298ef Author: Sergey BeryozkinAuthored: Thu Dec 3 13:49:58 2015 + Committer: Sergey Beryozkin Committed: Thu Dec 3 13:49:58 2015 + -- .../cxf/jaxrs/swagger/JaxRs2Extension.java | 89 +++- .../cxf/tools/fortest/headers/SomeHeaders.java | 39 + .../internal/jaxws/JaxwsServiceBuilderTest.java | 15 .../jaxws/expected/expected_someheaders.wsdl| 63 ++ 4 files changed, 204 insertions(+), 2 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/ac7c1114 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/ac7c1114 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/ac7c1114 Branch: refs/heads/master Commit: ac7c1114a0637933d7b7f9dfd1fa2bea7dadd79f Parents: ad0903a fe39afe Author: Sergey BeryozkinAuthored: Thu Nov 26 09:42:36 2015 + Committer: Sergey Beryozkin Committed: Thu Nov 26 09:42:36 2015 + -- .../cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java | 2 +- .../java/org/apache/cxf/rs/security/oauth2/utils/OAuthUtils.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cxf/blob/ac7c1114/rt/rs/security/oauth-parent/oauth2/src/main/java/org/apache/cxf/rs/security/oauth2/provider/AbstractOAuthDataProvider.java --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/37ffe128 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/37ffe128 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/37ffe128 Branch: refs/heads/master Commit: 37ffe1288c7e199e186fe4c2506fedf60bfa834f Parents: 1a58e61 5997344 Author: Sergey BeryozkinAuthored: Thu Nov 26 21:45:08 2015 + Committer: Sergey Beryozkin Committed: Thu Nov 26 21:45:08 2015 + -- .../systest/jms/security/JMSWSSecurityTest.java | 122 ++- 1 file changed, 121 insertions(+), 1 deletion(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fe39afe4 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fe39afe4 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fe39afe4 Branch: refs/heads/master Commit: fe39afe42bc46a6815f386d0ca67034aa944e5dd Parents: fb2429b c686b1a Author: Colm O hEigeartaighAuthored: Wed Nov 25 16:08:30 2015 + Committer: Colm O hEigeartaigh Committed: Wed Nov 25 16:08:30 2015 + -- .../rs/security/jose/common/JoseConstants.java | 6 + .../cxf/rs/security/jose/jwe/JweUtils.java | 26 +++- .../jose/jwk/DefaultJwkReaderWriter.java| 49 --- .../cxf/rs/security/jose/jwk/JsonWebKeys.java | 13 +- .../rs/security/jose/jwk/JwkReaderWriter.java | 27 +++- .../cxf/rs/security/jose/jwk/JwkUtils.java | 127 --- .../cxf/rs/security/jose/jws/JwsUtils.java | 13 +- .../rs/security/oidc/idp/OidcKeysService.java | 46 +++ .../oidc/rp/AbstractTokenValidator.java | 2 + 9 files changed, 179 insertions(+), 130 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/cfd0b515 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/cfd0b515 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/cfd0b515 Branch: refs/heads/master Commit: cfd0b515bcda170d1c8c0af9de7fbcde74d296bb Parents: 66f3656 5d23a4f Author: Sergey BeryozkinAuthored: Mon Nov 23 10:54:15 2015 + Committer: Sergey Beryozkin Committed: Mon Nov 23 10:54:15 2015 + -- osgi/karaf/features/src/main/resources/features.xml | 3 ++- parent/pom.xml | 5 +++-- 2 files changed, 5 insertions(+), 3 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/955d69b3 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/955d69b3 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/955d69b3 Branch: refs/heads/master Commit: 955d69b349051685bc6c0c22ac1b0108a174a4eb Parents: 8eea5c1 5e5a4ed Author: Sergey BeryozkinAuthored: Fri Nov 20 14:44:03 2015 + Committer: Sergey Beryozkin Committed: Fri Nov 20 14:44:03 2015 + -- --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e492a222 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e492a222 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e492a222 Branch: refs/heads/master Commit: e492a22278ef9bbb1c6bb3ea34cfae45fe6c0de7 Parents: 2653e88 08f2cfc Author: Sergey BeryozkinAuthored: Tue Nov 17 16:11:29 2015 + Committer: Sergey Beryozkin Committed: Tue Nov 17 16:11:29 2015 + -- .../ws/security/trust/AbstractSTSClient.java| 4 +- .../cxf/sts/operation/TokenIssueOperation.java | 10 +- .../apache/cxf/sts/request/ReceivedToken.java | 5 - .../cxf/sts/token/realm/JWTRealmCodec.java | 36 +++ .../token/validator/jwt/JWTTokenValidator.java | 56 ++-- .../sts/operation/IssueJWTClaimsUnitTest.java | 61 ++-- .../operation/IssueJWTOnbehalfofUnitTest.java | 46 +-- .../sts/operation/IssueJWTRealmUnitTest.java| 63 +++-- .../cxf/sts/operation/IssueJWTUnitTest.java | 16 +- .../validator/JWTTokenValidatorRealmTest.java | 280 +++ .../token/validator/JWTTokenValidatorTest.java | 23 +- .../apache/cxf/systest/sts/jwt/JWTUnitTest.java | 41 ++- .../cxf/systest/sts/deployment/cxf-sts.xml | 3 + 13 files changed, 514 insertions(+), 130 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/b2517012 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/b2517012 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/b2517012 Branch: refs/heads/master Commit: b251701217e0a4c5d658a4f1411d5237bb32204b Parents: aa77058 f2daa2f Author: Sergey BeryozkinAuthored: Fri Oct 9 17:44:57 2015 +0100 Committer: Sergey Beryozkin Committed: Fri Oct 9 17:44:57 2015 +0100 -- core/src/main/java/org/apache/cxf/io/CachedWriter.java | 1 + 1 file changed, 1 insertion(+) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/dbc4de18 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/dbc4de18 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/dbc4de18 Branch: refs/heads/master Commit: dbc4de1836f14aee5d30c39fd5b625e7634508c7 Parents: ae4f03a 0642440 Author: Sergey Beryozkin sberyoz...@talend.com Authored: Tue Aug 11 13:45:57 2015 +0100 Committer: Sergey Beryozkin sberyoz...@talend.com Committed: Tue Aug 11 13:45:57 2015 +0100 -- .../org/apache/cxf/systest/ws/gcm/MGF256AlgorithmSuiteLoader.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/1bbb368a Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/1bbb368a Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/1bbb368a Branch: refs/heads/master Commit: 1bbb368a25d51811ca4854d20c3f66c00d58ef3d Parents: 2b5c847 77c9f15 Author: Sergey Beryozkin sberyoz...@gmail.com Authored: Thu Aug 6 23:00:21 2015 +0100 Committer: Sergey Beryozkin sberyoz...@gmail.com Committed: Thu Aug 6 23:00:21 2015 +0100 -- .../org/apache/cxf/ws/rm/RMInInterceptor.java | 4 +- .../org/apache/cxf/ws/rm/SourceSequence.java| 4 + .../java/org/apache/cxf/ws/rm/ServantTest.java | 77 .../systest/ws/rm/ProtocolVariationsTest.java | 53 -- 4 files changed, 112 insertions(+), 26 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/903c81fe Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/903c81fe Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/903c81fe Branch: refs/heads/master Commit: 903c81fec8c8eb50116d1d9d85739860e0ddf24b Parents: 408f5e3 b0b51cf Author: Sergey Beryozkin sberyoz...@talend.com Authored: Fri Jul 17 20:56:55 2015 +0300 Committer: Sergey Beryozkin sberyoz...@talend.com Committed: Fri Jul 17 20:56:55 2015 +0300 -- parent/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/5d5f5e34 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/5d5f5e34 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/5d5f5e34 Branch: refs/heads/master Commit: 5d5f5e34be147bc8f74286ee8e161c42abb2c372 Parents: d58606e b1c7e0e Author: Sergey Beryozkin sberyoz...@talend.com Authored: Wed Jul 1 17:52:54 2015 +0100 Committer: Sergey Beryozkin sberyoz...@talend.com Committed: Wed Jul 1 17:52:54 2015 +0100 -- .../apache/cxf/common/security/SimpleGroup.java | 1 + .../org/apache/cxf/jaxrs/ext/xml/XMLSource.java | 31 .../cxf/jaxrs/provider/XSLTJaxbProvider.java| 2 ++ .../security/KerberosAuthenticationFilter.java | 1 + .../bootstrapping/SimpleXMLSettingsStorage.java | 9 - .../jose/jaxrs/JwtAuthenticationFilter.java | 1 + .../saml/authorization/SubjectPrincipal.java| 2 ++ .../JettyHTTPServerEngineFactoryHolder.java | 13 +++ .../NettyHttpServerEngineFactoryHolder.java | 13 +++ .../ws/security/wss4j/WSS4JOutInterceptor.java | 38 .../org/apache/cxf/systest/ws/mtom/client.xml | 4 --- 11 files changed, 62 insertions(+), 53 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8bbdb86f Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8bbdb86f Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8bbdb86f Branch: refs/heads/master Commit: 8bbdb86fca7a6cd88088242a0a74f8becc1ba73f Parents: d869f80 d4de0ce Author: Sergey Beryozkin sberyoz...@talend.com Authored: Tue Jun 9 12:31:52 2015 +0100 Committer: Sergey Beryozkin sberyoz...@talend.com Committed: Tue Jun 9 12:31:52 2015 +0100 -- .../logging/event/DefaultLogEventMapper.java| 78 +- .../ext/logging/DefaultLogEventMapperTest.java | 85 2 files changed, 123 insertions(+), 40 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/580366cc Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/580366cc Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/580366cc Branch: refs/heads/master Commit: 580366ccfbee2690fd9e9ac82f4552d0e214b04a Parents: 988caad 67f1656 Author: Andrei Shakirin andrei.shaki...@gmail.com Authored: Thu May 21 23:29:38 2015 +0200 Committer: Andrei Shakirin andrei.shaki...@gmail.com Committed: Thu May 21 23:29:38 2015 +0200 -- .../cxf/internal/CXFAPINamespaceHandler.java| 15 ++--- parent/pom.xml | 2 +- .../blueprint/ClusteringBPNamespaceHandler.java | 3 +-- .../blueprint/JAXRSBPNamespaceHandler.java | 3 +-- .../cxf/jaxrs/ext/MessageContextImpl.java | 4 .../blueprint/JAXWSBPNamespaceHandler.java | 3 +-- .../blueprint/SimpleBPNamespaceHandler.java | 3 +-- .../blueprint/JAXRSBPNamespaceHandler.java | 3 +-- .../HTTPJettyTransportNamespaceHandler.java | 4 ++-- .../HttpNettyTransportNamespaceHandler.java | 4 ++-- .../transport/http/blueprint/HttpBPHandler.java | 3 +-- .../org/apache/cxf/systest/jaxrs/BookStore.java | 23 .../jaxrs/JAXRSClientServerBookTest.java| 13 +++ .../jaxrs/JAXRSSoapRestBlueprintTest.java | 18 +++ 14 files changed, 66 insertions(+), 35 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/91d11a01 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/91d11a01 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/91d11a01 Branch: refs/heads/master Commit: 91d11a01247e781beef13d61d9b72bc840d90fd2 Parents: de88ed1 96f7367 Author: Sergey Beryozkin sberyoz...@talend.com Authored: Tue May 19 16:49:16 2015 +0100 Committer: Sergey Beryozkin sberyoz...@talend.com Committed: Tue May 19 16:49:16 2015 +0100 -- .../configuration/jsse/TLSServerParameters.java | 18 .../jsse/TLSServerParametersConfig.java | 3 ++ .../schemas/configuration/security.xsd | 20 + .../http_jetty/JettyHTTPServerEngine.java | 11 +++-- ...ttyHTTPServerEngineBeanDefinitionParser.java | 4 ++ .../cxf/ws/rm/persistence/jdbc/RMTxStore.java | 1 + .../org/apache/cxf/https/ssl3/SSLv3Test.java| 47 .../org/apache/cxf/https/ssl3/sslv3-server.xml | 27 +++ 8 files changed, 125 insertions(+), 6 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/c0f175a1 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/c0f175a1 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/c0f175a1 Branch: refs/heads/master Commit: c0f175a1382513f4a93f5016ebdea1e00a51d95b Parents: bd1d31f 24b4ed2 Author: Alessio Soldano asold...@redhat.com Authored: Thu Mar 26 22:37:10 2015 +0100 Committer: Alessio Soldano asold...@redhat.com Committed: Thu Mar 26 22:37:10 2015 +0100 -- .../ext/logging/AbstractLoggingInterceptor.java | 6 +- .../apache/cxf/ext/logging/LoggingFeature.java | 12 ++-- .../org/apache/cxf/ext/logging/WireTapIn.java | 16 -- .../ext/logging/event/PrettyLoggingFilter.java | 60 +--- .../apache/cxf/ext/logging/SOAPLoggingTest.java | 2 + 5 files changed, 62 insertions(+), 34 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/fe94c7fa Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/fe94c7fa Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/fe94c7fa Branch: refs/heads/master Commit: fe94c7fa10b7e0321a88f3fcb278fea856e9edac Parents: 29e1dd1 494ff76 Author: Sergey Beryozkin sberyoz...@talend.com Authored: Tue Mar 24 12:42:42 2015 + Committer: Sergey Beryozkin sberyoz...@talend.com Committed: Tue Mar 24 12:42:42 2015 + -- .../policy/interceptors/STSTokenHelper.java | 19 ++- .../SecureConversationInInterceptor.java| 6 +- .../ws/security/tokenstore/SecurityToken.java | 8 +- .../org/apache/cxf/sts/SignatureProperties.java | 4 +- .../org/apache/cxf/sts/StaticSTSProperties.java | 30 ++--- .../org/apache/cxf/sts/cache/CacheUtils.java| 12 +- .../cxf/sts/cache/EHCacheIdentityCache.java | 2 +- .../cxf/sts/cache/MemoryIdentityCache.java | 2 +- .../ClaimsAttributeStatementProvider.java | 2 +- .../apache/cxf/sts/claims/ClaimsManager.java| 2 +- .../cxf/sts/claims/LdapClaimsHandler.java | 7 +- .../cxf/sts/claims/LdapGroupClaimsHandler.java | 8 +- .../org/apache/cxf/sts/claims/LdapUtils.java| 2 +- .../cxf/sts/claims/StaticClaimsHandler.java | 2 +- .../cxf/sts/claims/mapper/ClaimUtils.java | 12 +- .../cxf/sts/claims/mapper/JexlClaimsMapper.java | 2 +- .../apache/cxf/sts/event/map/EventMapper.java | 6 +- .../cxf/sts/event/map/MapEventLogger.java | 2 +- .../cxf/sts/operation/AbstractOperation.java| 27 ++--- .../cxf/sts/operation/TokenCancelOperation.java | 8 +- .../cxf/sts/operation/TokenIssueOperation.java | 21 ++-- .../cxf/sts/operation/TokenRenewOperation.java | 14 +-- .../sts/operation/TokenValidateOperation.java | 8 +- .../DefaultSecurityTokenServiceProvider.java| 6 +- .../apache/cxf/sts/request/RequestParser.java | 33 +++--- .../cxf/sts/request/RequestRequirements.java| 44 +++ .../cxf/sts/service/EncryptionProperties.java | 4 +- .../apache/cxf/sts/service/StaticService.java | 2 +- .../token/delegation/SAMLDelegationHandler.java | 2 +- .../provider/AbstractSAMLTokenProvider.java | 118 +++ .../DefaultAttributeStatementProvider.java | 20 ++-- .../provider/DefaultConditionsProvider.java | 2 +- .../token/provider/DefaultSubjectProvider.java | 12 +- .../sts/token/provider/SAMLTokenProvider.java | 111 - .../cxf/sts/token/provider/SCTProvider.java | 13 +- .../sts/token/provider/SamlCallbackHandler.java | 32 ++--- .../sts/token/realm/CertConstraintsParser.java | 4 +- .../sts/token/realm/RelationshipResolver.java | 2 +- .../apache/cxf/sts/token/realm/SAMLRealm.java | 31 ++--- .../cxf/sts/token/renewer/SAMLTokenRenewer.java | 82 ++--- .../sts/token/validator/SAMLTokenValidator.java | 7 +- .../cxf/sts/token/validator/SCTValidator.java | 7 +- .../token/validator/UsernameTokenValidator.java | 8 +- .../cxf/sts/request/RequestParserUnitTest.java | 12 +- 44 files changed, 376 insertions(+), 382 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/3ae567d2 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/3ae567d2 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/3ae567d2 Branch: refs/heads/master Commit: 3ae567d26aa0165c41305e2d1e0cca4b65273dc8 Parents: 5450813 a79bb05 Author: Andrei Shakirin andrei.shaki...@gmail.com Authored: Tue Feb 24 20:42:03 2015 +0100 Committer: Andrei Shakirin andrei.shaki...@gmail.com Committed: Tue Feb 24 20:42:03 2015 +0100 -- .../org/apache/cxf/jaxrs/provider/SourceProvider.java | 5 + .../jaxws/interceptors/MessageModeInInterceptor.java | 7 ++- .../java/org/apache/cxf/js/rhino/ProviderFactory.java | 9 ++--- .../cxf/endpoint/dynamic/DynamicClientFactory.java | 8 +--- .../persistence/FilesystemExchangeDataDAO.java | 9 + .../https/httpclient/PublicSuffixMatcherLoader.java| 10 ++ .../apache/cxf/wsdl/service/factory/ClassReader.java | 13 + .../apache/cxf/wsdl/service/factory/ParamReader.java | 7 +-- 8 files changed, 15 insertions(+), 53 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/a8e3af6d Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/a8e3af6d Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/a8e3af6d Branch: refs/heads/master Commit: a8e3af6df6b2d286d0907ee379f4e13cb2fa5c4c Parents: 8f346e7 27b3b69 Author: Andrei Shakirin andrei.shaki...@gmail.com Authored: Tue Jan 27 14:47:38 2015 +0100 Committer: Andrei Shakirin andrei.shaki...@gmail.com Committed: Tue Jan 27 14:47:38 2015 +0100 -- .../jaxrs/servlet/CXFNonSpringJaxrsServlet.java | 2 +- .../security/wss4j/StaxActionInInterceptor.java | 38 ++--- .../security/wss4j/WSS4JStaxInInterceptor.java | 28 +-- .../security/wss4j/StaxRoundTripActionTest.java | 19 ++--- .../systest/ws/fault/ModifiedRequestTest.java | 81 .../ws/security/WSSecurityClientTest.java | 2 - .../cxf/systest/ws/fault/modified-server.xml| 10 +++ 7 files changed, 93 insertions(+), 87 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8cd3eb88 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8cd3eb88 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8cd3eb88 Branch: refs/heads/master Commit: 8cd3eb88f98b32b63d7eb4c956a67e4e27d57f72 Parents: c36d8d8 f429d8a Author: Sergey Beryozkin sberyoz...@talend.com Authored: Mon Jan 19 11:09:22 2015 + Committer: Sergey Beryozkin sberyoz...@talend.com Committed: Mon Jan 19 11:09:22 2015 + -- .../sts/token/validator/SAMLTokenValidator.java | 64 +++- 1 file changed, 35 insertions(+), 29 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Conflicts: distribution/src/main/release/samples/jax_rs/description_swagger/src/main/java/demo/jaxrs/swagger/server/Sample.java Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/7d3944d6 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7d3944d6 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7d3944d6 Branch: refs/heads/master Commit: 7d3944d6ecc09f01271658bb876c02e7b51e6f58 Parents: 8fd8c55 a2e1e40 Author: reta drr...@gmail.com Authored: Thu Jan 15 21:18:04 2015 -0500 Committer: reta drr...@gmail.com Committed: Thu Jan 15 21:18:04 2015 -0500 -- --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/83978f56 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/83978f56 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/83978f56 Branch: refs/heads/master Commit: 83978f56df7efde57426f077bc7e295d176535ea Parents: 2aa1e7b 187ace7 Author: Sergey Beryozkin sberyoz...@talend.com Authored: Thu Jan 15 14:27:17 2015 + Committer: Sergey Beryozkin sberyoz...@talend.com Committed: Thu Jan 15 14:27:17 2015 + -- .../saml/sso/SAMLResponseValidatorTest.java | 135 +++ 1 file changed, 135 insertions(+) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/8c128d12 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/8c128d12 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/8c128d12 Branch: refs/heads/master Commit: 8c128d12c31ccf8170530a0aaaf63674491040b0 Parents: 598f671 ee66bfc Author: Sergey Beryozkin sberyoz...@talend.com Authored: Fri Dec 12 13:57:26 2014 + Committer: Sergey Beryozkin sberyoz...@talend.com Committed: Fri Dec 12 13:57:26 2014 + -- .../java/org/apache/cxf/tools/validator/WSDLValidator.java | 6 -- 1 file changed, 6 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/2b2f97fe Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/2b2f97fe Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/2b2f97fe Branch: refs/heads/master Commit: 2b2f97fe176c0537b38081f35fb85f2fca415e04 Parents: cba91b8 ec98e18 Author: Sergey Beryozkin sberyoz...@talend.com Authored: Wed Dec 3 17:01:22 2014 + Committer: Sergey Beryozkin sberyoz...@talend.com Committed: Wed Dec 3 17:01:22 2014 + -- .../wssec/kerberos/KerberosTokenTest.java | 45 +++ .../kerberos/wssec/spnego/SpnegoTokenTest.java | 47 +++- 2 files changed, 53 insertions(+), 39 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0aa08eec Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0aa08eec Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0aa08eec Branch: refs/heads/master Commit: 0aa08eec65301d329efce12da8e98cf0c3d3112e Parents: 81d40aa df947cb Author: Sergey Beryozkin sberyoz...@talend.com Authored: Tue Nov 25 20:58:49 2014 + Committer: Sergey Beryozkin sberyoz...@talend.com Committed: Tue Nov 25 20:58:49 2014 + -- systests/ws-security/pom.xml | 6 -- 1 file changed, 6 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/0bc9bb32 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/0bc9bb32 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/0bc9bb32 Branch: refs/heads/master Commit: 0bc9bb32bb6f9485eb58ebf5a73db5d2937a69b9 Parents: bf6bba1 da6b2ee Author: Sergey Beryozkin sberyoz...@talend.com Authored: Mon Nov 17 22:04:46 2014 +0100 Committer: Sergey Beryozkin sberyoz...@talend.com Committed: Mon Nov 17 22:04:46 2014 +0100 -- .../spec/ClientResponseFilterInterceptor.java | 2 +- .../jose/jaxrs/JwsJwtMessageBodyReader.java | 54 -- .../jose/jaxrs/JwsJwtMessageBodyWriter.java | 60 3 files changed, 1 insertion(+), 115 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/855ab395 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/855ab395 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/855ab395 Branch: refs/heads/master Commit: 855ab395bd2916ee5d1d9cfeeea2a346a052179e Parents: a124380 2d13112 Author: Sergey Beryozkin sberyoz...@talend.com Authored: Fri Nov 14 16:23:21 2014 + Committer: Sergey Beryozkin sberyoz...@talend.com Committed: Fri Nov 14 16:23:21 2014 + -- .../websocket/src/main/resources/index.html | 8 +- .../samples/logbrowser-blueprint/README.txt | 7 + .../src/test/resources/index_plain.html | 211 +++ 3 files changed, 222 insertions(+), 4 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/e31cf1c5 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e31cf1c5 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e31cf1c5 Branch: refs/heads/master Commit: e31cf1c5dc29f5d11dc29e3c4a63b56ed8f960a0 Parents: 49c3593 4ff4d39 Author: reta drr...@gmail.com Authored: Wed Nov 12 13:37:18 2014 -0500 Committer: reta drr...@gmail.com Committed: Wed Nov 12 13:37:18 2014 -0500 -- .../cxf/bus/spring/BusDefinitionParser.java | 16 +- parent/pom.xml | 2 +- .../cxf/jaxrs/provider/json/JsonMapObject.java | 8 + .../cxf/rs/security/jose/jwt/JwtToken.java | 6 + .../oauth2/filters/OAuthRequestFilter.java | 26 ++- .../rs/security/oidc/common/UserAddress.java| 55 ++ .../rs/security/oidc/common/UserIdToken.java| 61 ++ .../rs/security/oidc/common/UserProfile.java| 71 ++- .../rs/security/oidc/rp/IdTokenValidator.java | 121 .../cxf/rs/security/oidc/rp/OidcUtils.java | 15 +- .../cxf/rs/security/oidc/rp/TokenValidator.java | 190 +++ 11 files changed, 432 insertions(+), 139 deletions(-) --
[2/2] cxf git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf Project: http://git-wip-us.apache.org/repos/asf/cxf/repo Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/cc27d5ba Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/cc27d5ba Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/cc27d5ba Branch: refs/heads/master Commit: cc27d5ba1c00adb4d9de7bf1333be41cf968a90b Parents: 8daf38e 4a292c0 Author: Sergey Beryozkin sberyoz...@talend.com Authored: Tue Nov 11 18:29:13 2014 + Committer: Sergey Beryozkin sberyoz...@talend.com Committed: Tue Nov 11 18:29:13 2014 + -- .../apache/cxf/jaxb/JAXBSchemaInitializer.java | 23 +--- 1 file changed, 1 insertion(+), 22 deletions(-) --