refactoring/prepping several classes for upcoming move to .beans git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@423 50f2f4bb-b051-0410-bef5-90022cba6387