More work on port

git-svn-id: https://svn.apache.org/repos/asf/cxf/branches/wss4j2.0-port@1455556 13f79535-47bb-0310-9956-ffa450edef68