You are viewing a plain text version of this content. The canonical link for it is here.

Posted to commits@cxf.apache.org by bi...@apache.org on 2015/12/17 20:27:58 UTC

[2/3] 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/7264f54a
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/7264f54a
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/7264f54a

Branch: refs/heads/master
Commit: 7264f54ab647e0315962bb189a79087bb87c0232
Parents: 22bc851 9c00297
Author: Benson Margulies <be...@basistech.com>
Authored: Thu Dec 17 21:27:27 2015 +0200
Committer: Benson Margulies <be...@basistech.com>
Committed: Thu Dec 17 21:27:27 2015 +0200

----------------------------------------------------------------------
 .../java/demo/jaxrs/server/IdTokenService.java  | 10 ++---
 .../src/main/webapp/forms/idToken.jsp           |  8 ++--
 .../java/demo/jaxrs/server/BigQueryService.java | 12 +++--
 .../javatowadl/ParseJavaDocMojo.java            | 12 +++++
 parent/pom.xml                                  |  2 +-
 .../apache/cxf/aegis/type/basic/ObjectType.java | 46 --------------------
 .../cxf/aegis/type/encoded/TrailingBlocks.java  |  1 -
 .../support/JaxWsServiceConfiguration.java      | 17 +++++++-
 .../cxf/rs/security/jose/jws/JwsUtils.java      |  2 +
 .../oidc/rp/OidcRpAuthenticationService.java    |  5 +--
 .../factory/AbstractServiceConfiguration.java   |  4 ++
 .../wsdl/service/factory/Messages.properties    |  3 ++
 .../factory/ReflectionServiceFactoryBean.java   | 22 ++++++++--
 .../cxf/systest/ws/addressing/spring/spring.xml |  2 +-
 14 files changed, 73 insertions(+), 73 deletions(-)
----------------------------------------------------------------------