moving around some of the code in preparation for some extensions

git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@883733 13f79535-47bb-0310-9956-ffa450edef68
7 files changed