cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject [2/2] git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/cxf
Date Thu, 30 Oct 2014 13:03:39 GMT
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/84de2c29
Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/84de2c29
Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/84de2c29

Branch: refs/heads/master
Commit: 84de2c29754bd9c9610124ef9b65032e519e2b19
Parents: 83ca30f d48057b
Author: Sergey Beryozkin <sberyozkin@talend.com>
Authored: Thu Oct 30 13:03:21 2014 +0000
Committer: Sergey Beryozkin <sberyozkin@talend.com>
Committed: Thu Oct 30 13:03:21 2014 +0000

----------------------------------------------------------------------
 .../org/apache/cxf/endpoint/ClientImpl.java     |   4 +-
 .../WebSocketVirtualServletRequest.java         |  14 ++-
 .../websocket/ahc/AhcWebSocketConduit.java      |  14 +--
 .../atmosphere/AtmosphereWebSocketHandler.java  |   4 +-
 .../websocket/jetty/JettyWebSocket.java         |   8 +-
 .../cxf/ws/security/trust/STSLoginModule.java   | 120 ++++++++++++++++++-
 .../trust/claims/RoleClaimsCallbackHandler.java |  67 +++++++++++
 .../systest/sts/jaas/ClaimsCallbackHandler.java |  68 -----------
 .../apache/cxf/systest/sts/jaas/JAASTest.java   |  32 +++++
 .../apache/cxf/systest/sts/jaas/DoubleIt.wsdl   |   3 +
 .../apache/cxf/systest/sts/jaas/cxf-service.xml |  24 +++-
 .../systests/basic/src/test/resources/sts.jaas  |  10 ++
 12 files changed, 272 insertions(+), 96 deletions(-)
----------------------------------------------------------------------



Mime
View raw message