Changed to type EJB for packaging into ear.
Small corrections of deprecated APIs.