cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject [3/3] cxf git commit: Merge branch '3.0.x-fixes' of https://git-wip-us.apache.org/repos/asf/cxf into 3.0.x-fixes
Date Wed, 13 Jan 2016 17:11:31 GMT
Merge branch '3.0.x-fixes' of https://git-wip-us.apache.org/repos/asf/cxf into 3.0.x-fixes


Project: http://git-wip-us.apache.org/repos/asf/cxf/repo
Commit: http://git-wip-us.apache.org/repos/asf/cxf/commit/dca64408
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/dca64408
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/dca64408

Branch: refs/heads/3.0.x-fixes
Commit: dca64408dd885d969944cbf84ba7a60beea69264
Parents: 8bb8a5f eb4d23a
Author: Sergey Beryozkin <sberyozkin@gmail.com>
Authored: Wed Jan 13 17:11:14 2016 +0000
Committer: Sergey Beryozkin <sberyozkin@gmail.com>
Committed: Wed Jan 13 17:11:14 2016 +0000

----------------------------------------------------------------------
 .gitmergeinfo                                   |  60 ++
 .../cxf/attachment/AttachmentDeserializer.java  |   6 +-
 .../apache/cxf/attachment/AttachmentUtil.java   |   4 +-
 .../apache/cxf/bus/blueprint/BlueprintBus.java  |   4 -
 .../org/apache/cxf/bus/spring/SpringBus.java    |   4 -
 .../cxf/common/injection/ResourceInjector.java  |   8 +-
 .../org/apache/cxf/common/util/CacheMap.java    |   2 +-
 .../configuration/ConfiguredBeanLocator.java    |   2 +-
 .../jsse/TLSParameterJaxBUtils.java             |  12 +-
 .../org/apache/cxf/endpoint/EndpointImpl.java   |  14 +-
 .../org/apache/cxf/helpers/ServiceUtils.java    |   6 +-
 .../AbstractAttributedInterceptorProvider.java  |   2 +-
 .../AbstractOutDatabindingInterceptor.java      |   3 +-
 .../cxf/interceptor/AnnotationInterceptors.java |   2 +-
 .../cxf/interceptor/FIStaxOutInterceptor.java   |   4 +-
 .../cxf/interceptor/StaxOutInterceptor.java     |   7 +-
 .../apache/cxf/service/ServiceModelVisitor.java |   4 +-
 .../factory/AnnotationsFactoryBeanListener.java |   4 +-
 .../invoker/spring/SpringBeanFactory.java       |   2 +-
 .../cxf/staxutils/W3CDOMStreamReader.java       |   5 -
 .../staxutils/transform/InTransformReader.java  |   4 +-
 .../apache/cxf/ws/addressing/ContextUtils.java  |   8 +-
 .../ws/addressing/EndpointReferenceUtils.java   |   2 +-
 .../cxf/ws/addressing/VersionTransformer.java   |   2 +-
 core/src/main/resources/META-INF/spring.schemas |  64 +-
 .../cxf/bus/extension/ExtensionManagerTest.java |   2 +-
 .../cxf/bus/osgi/OSGiBusListenerTest.java       |   8 +-
 .../common/injection/ResourceInjectorTest.java  |   2 -
 .../spring/ConfigurerImplTest.java              |  48 +-
 .../common/gzip/GZIPAcceptEncodingTest.java     |  14 +-
 .../javatowadl/ParseJavaDocMojo.java            |  12 +
 .../cxf/binding/soap/SoapBindingFactory.java    |   1 +
 .../SoapPreProtocolOutInterceptor.java          |   4 +-
 .../apache/cxf/aegis/type/basic/ObjectType.java |  46 --
 .../cxf/aegis/type/encoded/TrailingBlocks.java  |   1 -
 .../jaxrs/impl/HttpServletRequestFilter.java    |  51 ++
 .../cxf/jaxrs/spring/SpringResourceFactory.java |  29 +-
 .../org/apache/cxf/jaxrs/utils/JAXRSUtils.java  |   4 +-
 .../cxf/jaxrs/ext/MessageContextImplTest.java   |   8 +-
 .../jaxrs/resources/BookStoreConstructor.java   |  32 +
 .../jaxrs/spring/SpringResourceFactoryTest.java |  17 +-
 .../org/apache/cxf/jaxrs/spring/servers2.xml    |   4 +-
 .../apache/cxf/jaxrs/utils/JAXRSUtilsTest.java  |  21 +-
 .../support/JaxWsServiceConfiguration.java      |  17 +-
 .../cxf/jaxrs/client/ClientProxyImpl.java       |  13 +-
 .../cxf/jaxrs/swagger/JaxRs2Extension.java      |  85 +-
 .../search/AbstractSearchConditionParser.java   |  10 +
 .../jaxrs/ext/search/PropertyNameConverter.java |  25 +
 .../cxf/jaxrs/ext/search/SearchUtils.java       |   1 +
 .../jose/jaxrs/JwtAuthenticationFilter.java     |   3 +-
 .../jose/common/KeyManagementUtils.java         |   3 +
 .../cxf/rs/security/jose/jws/JwsUtils.java      |   2 +
 .../cxf/rs/security/jose/jwt/JwtClaims.java     |  35 +-
 .../jose/jws/JwsCompactReaderWriterTest.java    |   3 +-
 .../security/oauth2/common/OAuthPermission.java |  32 +
 .../rs/security/oauth2/common/Permission.java   |  54 ++
 .../oauth2/filters/OAuthRequestFilter.java      |   2 +-
 .../provider/AbstractOAuthDataProvider.java     |   4 +-
 .../oauth2/provider/OAuthDataProvider.java      |   4 +-
 .../services/AuthorizationCodeGrantService.java |   4 +-
 .../services/RedirectionBasedGrantService.java  |   2 +-
 .../rs/security/oauth2/utils/OAuthUtils.java    |  16 +-
 .../security/oidc/common/AbstractUserInfo.java  | 178 +++++
 .../cxf/rs/security/oidc/common/IdToken.java    |   2 +-
 .../cxf/rs/security/oidc/common/UserInfo.java   | 146 +---
 .../oidc/idp/IdTokenResponseFilter.java         |   9 +-
 .../rs/security/oidc/idp/UserInfoService.java   |   4 +-
 .../oidc/rp/AbstractTokenValidator.java         |   5 +-
 .../cxf/rs/security/oidc/rp/IdTokenReader.java  |   7 +-
 .../cxf/rs/security/oidc/rp/UserInfoClient.java |   6 +-
 .../cxf/rs/security/oidc/utils/OidcUtils.java   |   1 +
 .../saml/sso/SAMLProtocolResponseValidator.java | 116 +--
 .../saml/sso/SAMLSSOResponseValidator.java      |  18 +-
 .../src/main/resources/META-INF/spring.schemas  |  42 +-
 .../src/main/resources/META-INF/spring.schemas  |  42 +-
 .../transport/http/AbstractHTTPDestination.java |   8 +-
 .../transport/http/auth/DigestAuthSupplier.java |  16 +-
 .../httpclient/DefaultHostnameVerifier.java     |  71 +-
 .../transport/https/httpclient/DomainType.java  |  37 +
 .../https/httpclient/PublicSuffixList.java      |  11 +-
 .../httpclient/PublicSuffixListParser.java      | 101 ++-
 .../https/httpclient/PublicSuffixMatcher.java   |  99 ++-
 .../src/main/resources/META-INF/spring.schemas  |  44 +-
 .../httpclient/DefaultHostnameVerifierTest.java |  12 +-
 .../src/main/resources/META-INF/spring.schemas  |  42 +-
 .../src/main/resources/META-INF/spring.handlers |  48 +-
 .../src/main/resources/META-INF/spring.schemas  |  58 +-
 .../src/main/resources/META-INF/spring.schemas  |  44 +-
 .../cxf/ws/security/SecurityConstants.java      |   7 +
 .../wss4j/AttachmentCallbackHandler.java        |   5 +
 .../policyhandlers/AbstractBindingBuilder.java  |  49 +-
 .../factory/AbstractServiceConfiguration.java   |   4 +
 .../wsdl/service/factory/Messages.properties    |   3 +
 .../factory/ReflectionServiceFactoryBean.java   |  22 +-
 .../X509SymmetricBindingTest.java               |  67 ++
 .../systest/sts/x509_symmetric/DoubleIt.wsdl    |  94 +++
 .../systest/sts/x509_symmetric/cxf-client.xml   |   8 +
 .../systest/sts/x509_symmetric/cxf-service.xml  |   8 +
 .../sts/x509_symmetric/cxf-stax-service.xml     |   9 +
 .../org/apache/cxf/systest/jaxrs/BookStore.java |  24 +-
 .../cxf/systest/jaxrs/BookStoreSpring.java      |  23 +-
 .../jaxrs/JAXRSClientServerSpringBookTest.java  |  22 +
 .../src/test/resources/jaxrs/WEB-INF/beans.xml  |   7 +
 systests/rs-security/pom.xml                    |  10 -
 .../jose/jwt/BookServerJwtProperties.java       |  59 ++
 .../security/jose/jwt/JWTAlgorithmTest.java     | 153 +++-
 .../security/jose/jwt/JWTAuthnAuthzTest.java    |  15 +-
 .../security/jose/jwt/JWTPropertiesTest.java    | 418 ++++++++++
 .../jaxrs/security/oauth2/JAXRSOAuth2Test.java  | 209 ++++-
 .../security/oauth2/OAuthDataProviderImpl.java  |   1 +
 .../security/oauth2/SamlCallbackHandler.java    | 115 ++-
 .../grants/AuthorizationGrantNegativeTest.java  | 794 +++++++++++++++++++
 .../oauth2/grants/AuthorizationGrantTest.java   | 371 +++++++++
 .../security/oauth2/grants/BasicAuthFilter.java | 117 +++
 .../oauth2/grants/BookServerOAuth2Grants.java   |  48 ++
 .../grants/BookServerOAuth2GrantsNegative.java  |  48 ++
 .../oauth2/grants/CallbackHandlerImpl.java      |  52 ++
 .../grants/CallbackHandlerLoginHandler.java     |  83 ++
 .../oauth2/grants/OAuthDataProviderImpl.java    | 104 +++
 .../security/jose/jwt/algorithms-server.xml     |  16 +
 .../security/jose/jwt/properties-server.xml     |  72 ++
 .../jaxrs/security/oauth2/grants/client.xml     |  38 +
 .../oauth2/grants/grants-negative-server.xml    | 142 ++++
 .../security/oauth2/grants/grants-server.xml    | 142 ++++
 .../systest/jaxrs/security/oauth2/server.xml    |  29 +
 .../systest/jaxrs/security/smallkey.properties  |  21 +
 .../apache/cxf/systest/ws/fault/FaultTest.java  |  69 ++
 .../cxf/systest/ws/ut/UsernameTokenTest.java    |  27 +
 .../cxf/systest/ws/fault/DoubleItFault.wsdl     |  69 ++
 .../org/apache/cxf/systest/ws/fault/client.xml  |  16 +
 .../org/apache/cxf/systest/ws/fault/server.xml  |  13 +
 .../apache/cxf/systest/ws/ut/DoubleItUt.wsdl    |  34 +
 .../org/apache/cxf/systest/ws/ut/client.xml     |   6 +
 .../org/apache/cxf/systest/ws/ut/server.xml     |   5 +
 .../apache/cxf/systest/ws/ut/stax-server.xml    |   6 +
 .../cxf/systest/ws/addressing/spring/spring.xml |   2 +-
 .../ws/policy/AddressingPolicy0705Test.java     | 161 ++++
 .../systest/ws/policy/RM12PolicyWsdlTest.java   |   2 +-
 .../cxf/systest/ws/policy/addr-external0705.xml |  37 +
 .../apache/cxf/systest/ws/policy/addr0705.xml   |  31 +
 .../cxf/tools/common/VelocityGenerator.java     |   4 +-
 .../common/dom/ExtendedDocumentBuilder.java     |   4 +-
 .../cxf/tools/common/model/JavaMethod.java      |   2 +-
 .../common/toolspec/DummyToolContainer.java     |   6 +-
 144 files changed, 5090 insertions(+), 834 deletions(-)
----------------------------------------------------------------------



Mime
View raw message