Fixing the CXF plugin to work with the last refactor