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/d9a1164c Tree: http://git-wip-us.apache.org/repos/asf/cxf/tree/d9a1164c Diff: http://git-wip-us.apache.org/repos/asf/cxf/diff/d9a1164c Branch: refs/heads/master Commit: d9a1164c341c10db5d34cea3265eb8d5099f3edf Parents: 36b2623 e5f5657 Author: reta <[email protected]> Authored: Mon Mar 10 14:37:24 2014 -0400 Committer: reta <[email protected]> Committed: Mon Mar 10 14:38:29 2014 -0400 ---------------------------------------------------------------------- .../cxf/jaxrs/ext/multipart/Attachment.java | 5 ++ .../transport/servlet/CXFNonSpringServlet.java | 4 +- .../jetty/CXFJettyWebSocketServlet.java | 3 +- .../CXFNonSpringJettyWebSocketServlet.java | 3 +- .../cxf/systest/jaxrs/JAXRSMultipartTest.java | 51 ++++++++++++++++++++ .../JAXRSClientServerWebSocketSpringTest.java | 2 +- 6 files changed, 61 insertions(+), 7 deletions(-) ----------------------------------------------------------------------
