Resolve the base URI.
Refactor and reformat.

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