refactoring to ease maintenance

git-svn-id: https://svn.apache.org/repos/asf/maven/sandbox/trunk@1725402 13f79535-47bb-0310-9956-ffa450edef68
21 files changed