Adapting for cxf 3