add infrastructure for servlet 3.1