Upgraded to servlet api 3.0.1
Updated to Servlet 3 and Java based configuration