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/e06ac196 Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/e06ac196 Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/e06ac196 Branch: refs/heads/master Commit: e06ac1967a2058a4ab1af07bd367ae44917aa299 Parents: ff86dd4 939b542 Author: Sergey Beryozkin <[email protected]> Authored: Thu Mar 27 14:14:29 2014 +0000 Committer: Sergey Beryozkin <[email protected]> Committed: Thu Mar 27 14:14:29 2014 +0000 ---------------------------------------------------------------------- .../jaxb/SchemaCollectionContextProxy.java | 12 ++++++-- .../transform/DelegatingNamespaceContext.java | 6 ++-- .../cxf/javascript/fortest/package-info.java | 11 ++----- .../jaxrs/provider/json/utils/JSONUtils.java | 9 ++++++ .../jaxrs/provider/json/JSONProviderTest.java | 23 +++++++++++++-- .../assertions/WSAActionAssertingHandler.java | 2 +- .../apache/cxf/sts/request/RequestParser.java | 6 ++-- .../cxf/ws/discovery/WSDiscoveryClientTest.java | 5 ++-- .../type_test/AbstractTypeTestClient.java | 31 -------------------- .../main/resources/wsdl/type_test/type_test.xsd | 2 +- .../wsdl/type_test/type_test_impl_java.xsl | 9 ------ 11 files changed, 54 insertions(+), 62 deletions(-) ----------------------------------------------------------------------
