javax ee annotations changes to Spring proprietary (due to conflict with deployment on Tomcat 7)