Merged revisions 1556706 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1556706 | dkulp | 2014-01-08 22:09:34 -0500 (Wed, 08 Jan 2014) | 2 lines

  Update to work with spring4

........

git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes@1559174 13f79535-47bb-0310-9956-ffa450edef68
Merged revisions 1559156 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1559156 | dkulp | 2014-01-17 10:45:52 -0500 (Fri, 17 Jan 2014) | 2 lines

  Put a limit on the size of the output we record to limit memory usage for longer running tests that spit out a ton of info.

........

git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes@1559175 13f79535-47bb-0310-9956-ffa450edef68
Merged revisions 1559171 via  git cherry-pick from
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1559171 | dkulp | 2014-01-17 11:33:38 -0500 (Fri, 17 Jan 2014) | 2 lines

  [CXF-5500] Limit what get's logged from the conduit with FINE logging

........

git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/2.7.x-fixes@1559176 13f79535-47bb-0310-9956-ffa450edef68