Partial refactoring of DB building (to avoid svn issues)

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