Feature 4474

Replacing EJB 2.1 with EJB 3.1