simplified config and moved to servlet 3.1