merge cxf_demo2 to cxf_demo