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 Beryozkin <sberyoz...@gmail.com> Authored: Tue Apr 5 16:51:21 2016 +0100 Committer: Sergey Beryozkin <sberyoz...@gmail.com> 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(+) ----------------------------------------------------------------------