You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by ay...@apache.org on 2014/02/25 18:25:32 UTC

[2/2] git commit: Merge branch 'master' into ws_take1

Merge branch 'master' into ws_take1


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

Branch: refs/heads/master
Commit: 99e152091933c23df698091ddbd74a4615fd6442
Parents: 8018b19 c92b639
Author: Akitoshi Yoshida <ay...@apache.org>
Authored: Tue Feb 25 18:23:27 2014 +0100
Committer: Akitoshi Yoshida <ay...@apache.org>
Committed: Tue Feb 25 18:23:27 2014 +0100

----------------------------------------------------------------------
 .gitignore                                      |   1 +
 .../DelegatingAuthenticationInterceptor.java    |  67 +++
 .../cxf/workqueue/AutomaticWorkQueueTest.java   |   3 +-
 .../main/release/samples/oauth/client/pom.xml   |   5 +
 .../main/release/samples/oauth/server/pom.xml   |   5 +
 .../src/main/webapp/WEB-INF/security-beans.xml  |  22 +-
 .../cxf/jaxrs/provider/JAXBElementProvider.java |   6 +
 rt/management-web/pom.xml                       |   6 +-
 .../bootstrapping/SimpleXMLSettingsStorage.java |   1 -
 .../cxf/rs/security/common/SecurityUtils.java   |   9 +-
 .../security/xml/AbstractXmlSigInHandler.java   |   2 +-
 .../rs/security/xml/XmlEncOutInterceptor.java   |   3 +-
 .../rs/security/xml/XmlSecInInterceptor.java    |  14 +-
 .../rs/security/xml/XmlSecOutInterceptor.java   |  29 +-
 .../rs/security/xml/XmlSigOutInterceptor.java   |  12 +-
 .../transport/servlet/AbstractHTTPServlet.java  |   4 +-
 .../cxf/transport/jms/JMSConfiguration.java     | 104 +----
 .../cxf/transport/jms/JMSOldConfigHolder.java   | 191 +++------
 .../cxf/transport/jms/uri/JMSEndpoint.java      |  49 ++-
 .../transport/jms/uri/JMSEndpointWSDLUtil.java  | 119 ++++++
 .../jms/util/MessageListenerContainer.java      |  51 ++-
 .../cxf/transport/jms/util/TestReceiver.java    |  18 +-
 .../cxf/transport/jms/AbstractJMSTester.java    |   3 +
 .../cxf/transport/jms/JMSDestinationTest.java   |  11 +-
 .../apache/cxf/transport/jms/OldConfigTest.java |  10 +-
 .../cxf/transport/jms/uri/MyBeanLocator.java    |  79 ++++
 .../jms/uri/URIConfiguredConduitTest.java       |  56 ++-
 .../jms/src/test/resources/jms_test_config.xml  |   5 +-
 .../selector/BaseAlternativeSelector.java       |  18 +-
 .../org/apache/cxf/ws/rm/MessageCallback.java   |  28 ++
 .../cxf/ws/rm/MessageCountingCallback.java      |  82 ++++
 .../java/org/apache/cxf/ws/rm/RMEndpoint.java   |  30 +-
 .../apache/cxf/ws/rm/RMMessageConstants.java    |   3 +
 .../apache/cxf/ws/rm/RetransmissionQueue.java   |   9 +-
 .../cxf/ws/rm/soap/RetransmissionQueueImpl.java |  20 +-
 .../cxf/ws/rm/MessageCountingCallbackTest.java  |  52 +++
 .../ws/rm/soap/RetransmissionQueueImplTest.java |  53 ++-
 ...ureConversationTokenInterceptorProvider.java |   9 +
 .../ws/security/trust/AbstractSTSClient.java    |  17 +-
 .../StaxAsymmetricBindingHandler.java           |  14 +
 .../StaxSymmetricBindingHandler.java            |  13 +
 .../AbstractSupportingTokenPolicyValidator.java |  30 +-
 .../sts/symmetric/SymmetricBindingTest.java     |  43 ++
 .../org/apache/cxf/systest/jaxrs/BookStore.java |   6 +
 .../jaxrs/JAXRSClientServerBookTest.java        |   9 +
 .../jaxrs/JAXRSClientServerSpringBookTest.java  |   8 +
 .../jaxrs/JAXRSSimpleRequestDispatcherTest.java |  59 +++
 .../jaxrs_dispatch_simple/WEB-INF/web.xml       |  51 +++
 .../resources/jaxrs_dispatch_simple/welcome.txt |   1 +
 .../testsuite/testcases/SoapJmsSpecTest.java    |   2 +-
 .../cxf/systest/jms/JMSClientServerTest.java    |   3 -
 .../jms/continuations/jms_test_config.xml       |   5 -
 .../jms/tx/JMSTransactionClientServerTest.java  |   1 -
 .../ws/rm/MessageCallbackOnewayTest.java        | 426 +++++++++++++++++++
 .../systest/ws/algsuite/AlgorithmSuiteTest.java |   2 -
 .../cxf/systest/ws/x509/X509TokenTest.java      |  16 +-
 56 files changed, 1493 insertions(+), 402 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cxf/blob/99e15209/systests/jaxrs/src/test/java/org/apache/cxf/systest/jaxrs/BookStore.java
----------------------------------------------------------------------