refactoring and scoping

git-svn-id: https://svn.apache.org/repos/asf/commons/proper/proxy/branches/version-2.0-work@1520917 13f79535-47bb-0310-9956-ffa450edef68