Feature 4474

Migrating all  EJB 2.1 to EJB 3.1