DOSGI-163 refactoring. Applying patch with thanks to Amichai

git-svn-id: https://svn.apache.org/repos/asf/cxf/dosgi/trunk@1467958 13f79535-47bb-0310-9956-ffa450edef68