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/4aaafd7a Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/4aaafd7a Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/4aaafd7a Branch: refs/heads/master Commit: 4aaafd7a4ecc0ab02fa218f9e5681a364f964b19 Parents: ffd429b 4d6fd51 Author: reta <[email protected]> Authored: Mon Aug 25 09:38:50 2014 -0400 Committer: reta <[email protected]> Committed: Mon Aug 25 09:38:50 2014 -0400 ---------------------------------------------------------------------- .../cxf/jaxrs/JAXRSServerFactoryBean.java | 8 +- .../apache/cxf/jaxrs/model/ApplicationInfo.java | 54 ++++++++++ .../cxf/jaxrs/provider/ProviderFactory.java | 12 ++- .../jaxrs/provider/ServerProviderFactory.java | 103 ++++++++++++++++--- .../jaxrs/servlet/CXFNonSpringJaxrsServlet.java | 29 ++++-- .../org/apache/cxf/jaxrs/utils/JAXRSUtils.java | 2 +- .../cxf/jaxrs/client/spec/ClientImpl.java | 2 +- .../client/spec/ClientRequestContextImpl.java | 2 +- .../cxf/systest/jaxrs/BookApplication.java | 8 ++ .../org/apache/cxf/systest/jaxrs/BookStore.java | 6 +- .../JAXRSClientServerNonSpringBookTest.java | 2 +- 11 files changed, 194 insertions(+), 34 deletions(-) ----------------------------------------------------------------------
