Refactor to use simpler URI based code

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