Reformatted.
Updated with recent project additions.
Converted to spring java-based configuration.  Still yet to work out a better way to initially link the java-configuration from the web.xml.