Now we are mixing Java config with XML config. I just ran into an issue with this code, when you add mvc:annotation-driven elements it creates problems. 

I would recommend rewriting this into the XML config for consistency. A new developer may not find this class and scratch his head why his config is not working. Are we implying that we can't upgrade without mixing configuration styles?